diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-06 23:39:05 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:50:24 +0200 |
commit | 0b0e56d67df802eaa6c503edf6777b5e89625608 (patch) | |
tree | 3eb1658d9ff45225f76864d2b79da2a3af527d32 /storageframework/src | |
parent | 777943d3194383ab5492b285ae83dc3e92328514 (diff) |
split log and bufferedlog
Diffstat (limited to 'storageframework/src')
4 files changed, 8 insertions, 15 deletions
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp index 125e01db179..a19851ae01f 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/memorystate.cpp @@ -1,13 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "memorystate.h" +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".memory.state"); -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { MemoryState::Entry::Entry() : _currentUsedSize(0), @@ -223,6 +222,4 @@ MemoryState::print(std::ostream& out, bool verbose, out << "\n" << indent << "}"; } -} // defaultimplementation -} // framework -} // storage +} diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp index 55723eec558..5d5d0b97541 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/memory/simplememorylogic.cpp @@ -1,15 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "simplememorylogic.h" - #include <vespa/vespalib/util/exceptions.h> -#include <vespa/log/log.h> +#include <vespa/log/bufferedlogger.h> LOG_SETUP(".memory.logic.simple"); -namespace storage { -namespace framework { -namespace defaultimplementation { +namespace storage::framework::defaultimplementation { SimpleMemoryLogic::SimpleMemoryLogic(Clock& c, uint64_t maxMemory) : _cacheThreshold(0.98), @@ -232,6 +229,4 @@ SimpleMemoryLogic::print(std::ostream& out, bool verbose, _state.print(out, verbose, indent + " "); } -} // defaultimplementation -} // framework -} // storage +} diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp index 3e3785f67b1..eaa66fedc88 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/thread/threadimpl.cpp @@ -4,7 +4,7 @@ #include "threadpoolimpl.h" #include <vespa/storageframework/generic/clock/clock.h> -#include <vespa/log/log.h> +#include <vespa/log/bufferedlogger.h> LOG_SETUP(".framework.thread.impl"); namespace storage::framework::defaultimplementation { diff --git a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h index f7229a1d297..2704f90d5f1 100644 --- a/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h +++ b/storageframework/src/vespa/storageframework/generic/status/httpurlpath.h @@ -9,6 +9,7 @@ #include <vespa/vespalib/util/printable.h> #include <vespa/vespalib/stllike/string.h> #include <map> +#include <sstream> namespace storage::framework { |