diff options
Diffstat (limited to 'vdslib')
-rw-r--r-- | vdslib/src/vespa/vdslib/container/mutabledocumentlist.cpp | 4 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/distribution/distribution.cpp | 2 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/thread/taskscheduler.cpp | 10 |
3 files changed, 4 insertions, 12 deletions
diff --git a/vdslib/src/vespa/vdslib/container/mutabledocumentlist.cpp b/vdslib/src/vespa/vdslib/container/mutabledocumentlist.cpp index 6654cbad87f..4541b32678b 100644 --- a/vdslib/src/vespa/vdslib/container/mutabledocumentlist.cpp +++ b/vdslib/src/vespa/vdslib/container/mutabledocumentlist.cpp @@ -1,14 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/fastos/fastos.h> #include <vespa/vdslib/container/mutabledocumentlist.h> - -#include <vespa/log/log.h> #include <vespa/vespalib/objects/nbostream.h> using vespalib::nbostream; -LOG_SETUP(".vdslib.container.mutabledocumentlist"); - namespace vdslib { MutableDocumentList::MutableDocumentList(const document::DocumentTypeRepo::SP & repo, char* buffer, uint32_t bufferSize, bool keepexisting) : DocumentList(repo, buffer, bufferSize, keepexisting) diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.cpp b/vdslib/src/vespa/vdslib/distribution/distribution.cpp index 187d1b4c947..f732dea1030 100644 --- a/vdslib/src/vespa/vdslib/distribution/distribution.cpp +++ b/vdslib/src/vespa/vdslib/distribution/distribution.cpp @@ -5,7 +5,6 @@ #include <cmath> #include <vespa/document/bucket/bucketid.h> -#include <vespa/log/log.h> #include <vespa/vespalib/text/stringtokenizer.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/vespalib/util/bobhash.h> @@ -17,6 +16,7 @@ #include <vespa/config/print/asciiconfigwriter.h> #include <vespa/config/print/asciiconfigreader.h> +#include <vespa/log/log.h> LOG_SETUP(".vdslib.distribution"); namespace storage { diff --git a/vdslib/src/vespa/vdslib/thread/taskscheduler.cpp b/vdslib/src/vespa/vdslib/thread/taskscheduler.cpp index ad37c4dd591..f66349e28ed 100644 --- a/vdslib/src/vespa/vdslib/thread/taskscheduler.cpp +++ b/vdslib/src/vespa/vdslib/thread/taskscheduler.cpp @@ -1,12 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/fastos/fastos.h> #include <vespa/vdslib/thread/taskscheduler.h> - -#include <iostream> -#include <vespa/log/log.h> #include <vespa/vespalib/util/exceptions.h> - -LOG_SETUP(".task.scheduler"); +#include <vespa/vespalib/stllike/asciistream.h> namespace vdslib { @@ -146,7 +142,7 @@ TaskScheduler::waitForTaskCounterOfAtLeast(uint64_t taskCounter, uint64_t endTime = currentTime + timeout; while (_taskCounter < taskCounter) { if (endTime <= currentTime) { - std::ostringstream ost; + vespalib::asciistream ost; ost << "Task scheduler not reached task counter of " << taskCounter << " within timeout of " << timeout << " ms. Current task" << " counter is " << _taskCounter; @@ -165,7 +161,7 @@ TaskScheduler::waitUntilNoTasksRemaining(uint64_t timeout) const uint64_t endTime = currentTime + timeout; while (_tasks.size() > 0 || _currentRunningTasks.size() > 0) { if (endTime <= currentTime) { - std::ostringstream ost; + vespalib::asciistream ost; ost << "Task scheduler still have tasks scheduled after timeout" << " of " << timeout << " ms. There are " << _tasks.size() << " entries in tasks map and " << _currentRunningTasks.size() |