diff options
114 files changed, 29 insertions, 321 deletions
diff --git a/document/src/vespa/document/base/documentid.cpp b/document/src/vespa/document/base/documentid.cpp index 534a9729b04..90ab5ff6c56 100644 --- a/document/src/vespa/document/base/documentid.cpp +++ b/document/src/vespa/document/base/documentid.cpp @@ -1,12 +1,9 @@ // 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/log/log.h> -LOG_SETUP(".document.document-id"); - #include "documentid.h" - #include <vespa/vespalib/util/md5.h> #include <vespa/vespalib/objects/nbostream.h> +#include <ostream> using vespalib::nbostream; diff --git a/document/src/vespa/document/base/globalid.cpp b/document/src/vespa/document/base/globalid.cpp index 440042bdbc0..514f2256c30 100644 --- a/document/src/vespa/document/base/globalid.cpp +++ b/document/src/vespa/document/base/globalid.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".globalid"); - #include <vespa/document/base/globalid.h> #include <vespa/document/bucket/bucketid.h> #include <vespa/vespalib/util/exceptions.h> @@ -29,8 +26,7 @@ getHexVal(char c) } else if (c >= 'A' && c <= 'F') { return (c - 'A' + 10); } - LOG_ASSERT(validateHex(c)); - abort(); + assert(validateHex(c)); abort(); } @@ -92,7 +88,7 @@ GlobalId::parse(const vespalib::stringref & source) + "'.", VESPA_STRLOC); } if (source.size() != 2 * LENGTH + 7) { - std::ostringstream ost; + vespalib::asciistream ost; ost << "A gid string representation must be exactly " << (2 * LENGTH + 7) << " bytes long. Invalid source: '" << source << "'."; diff --git a/document/src/vespa/document/base/testdocrepo.cpp b/document/src/vespa/document/base/testdocrepo.cpp index 3988cbe7441..4cc6e36ac43 100644 --- a/document/src/vespa/document/base/testdocrepo.cpp +++ b/document/src/vespa/document/base/testdocrepo.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".testdocrepo"); - #include "testdocrepo.h" #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/datatype/documenttype.h> diff --git a/document/src/vespa/document/datatype/annotationreferencedatatype.cpp b/document/src/vespa/document/datatype/annotationreferencedatatype.cpp index 3a989f0814b..0da571bc4ee 100644 --- a/document/src/vespa/document/datatype/annotationreferencedatatype.cpp +++ b/document/src/vespa/document/datatype/annotationreferencedatatype.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".annotationreferencedatatype"); - #include "annotationreferencedatatype.h" #include <vespa/document/fieldvalue/annotationreferencefieldvalue.h> diff --git a/document/src/vespa/document/datatype/datatype.cpp b/document/src/vespa/document/datatype/datatype.cpp index b53162f25ba..caaabf4935a 100644 --- a/document/src/vespa/document/datatype/datatype.cpp +++ b/document/src/vespa/document/datatype/datatype.cpp @@ -174,7 +174,6 @@ DataType::operator<(const DataType& other) const FieldPath::UP DataType::buildFieldPath(const vespalib::stringref & remainFieldName) const { -// LOG(debug, "remainFieldName = %s, dataType=%s", remainFieldName.c_str(), getClass().name()); if ( !remainFieldName.empty() ) { return onBuildFieldPath(remainFieldName); } diff --git a/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.cpp b/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.cpp index fb4b57b2cce..9493996b348 100644 --- a/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/annotationreferencefieldvalue.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".annotationreferencefieldvalue"); - #include "annotationreferencefieldvalue.h" using std::ostream; diff --git a/document/src/vespa/document/fieldvalue/document.cpp b/document/src/vespa/document/fieldvalue/document.cpp index 6681601ac52..d5210b4693c 100644 --- a/document/src/vespa/document/fieldvalue/document.cpp +++ b/document/src/vespa/document/fieldvalue/document.cpp @@ -8,12 +8,10 @@ #include <vespa/document/base/documentid.h> #include <vespa/document/base/field.h> #include <vespa/document/fieldvalue/fieldvalue.h> -#include <fstream> #include <vespa/document/repo/fixedtyperepo.h> #include <vespa/document/serialization/vespadocumentdeserializer.h> #include <vespa/document/serialization/vespadocumentserializer.h> -#include <vespa/log/log.h> #include <vespa/vespalib/objects/nbostream.h> using vespalib::nbostream; @@ -21,7 +19,6 @@ using vespalib::make_string; using vespalib::IllegalArgumentException; using vespalib::IllegalStateException; -LOG_SETUP(".document.fieldvalue.document"); namespace document { namespace { diff --git a/document/src/vespa/document/fieldvalue/predicatefieldvalue.cpp b/document/src/vespa/document/fieldvalue/predicatefieldvalue.cpp index 1d1d0b03b2f..b5c7bad703c 100644 --- a/document/src/vespa/document/fieldvalue/predicatefieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/predicatefieldvalue.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicatefieldvalue"); #include <vespa/fastos/fastos.h> #include "predicatefieldvalue.h" diff --git a/document/src/vespa/document/predicate/predicate.cpp b/document/src/vespa/document/predicate/predicate.cpp index b690a8e88d1..c3ae5fb8fb4 100644 --- a/document/src/vespa/document/predicate/predicate.cpp +++ b/document/src/vespa/document/predicate/predicate.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate"); #include <vespa/fastos/fastos.h> #include "predicate.h" diff --git a/document/src/vespa/document/predicate/predicate_builder.cpp b/document/src/vespa/document/predicate/predicate_builder.cpp index 98bc05eab29..55a6ce4b3ce 100644 --- a/document/src/vespa/document/predicate/predicate_builder.cpp +++ b/document/src/vespa/document/predicate/predicate_builder.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_builder"); #include <vespa/fastos/fastos.h> #include "predicate.h" diff --git a/document/src/vespa/document/predicate/predicate_printer.cpp b/document/src/vespa/document/predicate/predicate_printer.cpp index c8519866d11..72e4e0f5115 100644 --- a/document/src/vespa/document/predicate/predicate_printer.cpp +++ b/document/src/vespa/document/predicate/predicate_printer.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_printer"); #include <vespa/fastos/fastos.h> #include "predicate.h" diff --git a/document/src/vespa/document/predicate/predicate_slime_builder.cpp b/document/src/vespa/document/predicate/predicate_slime_builder.cpp index 18fa67d7342..e8740018679 100644 --- a/document/src/vespa/document/predicate/predicate_slime_builder.cpp +++ b/document/src/vespa/document/predicate/predicate_slime_builder.cpp @@ -1,9 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_slime_builder"); #include <vespa/fastos/fastos.h> - #include "predicate.h" #include "predicate_slime_builder.h" diff --git a/document/src/vespa/document/predicate/predicate_slime_visitor.cpp b/document/src/vespa/document/predicate/predicate_slime_visitor.cpp index cddd2a1c2c7..81cdd0606ad 100644 --- a/document/src/vespa/document/predicate/predicate_slime_visitor.cpp +++ b/document/src/vespa/document/predicate/predicate_slime_visitor.cpp @@ -1,9 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".predicate_slime_visitor"); #include <vespa/fastos/fastos.h> - #include "predicate.h" #include "predicate_slime_visitor.h" #include <vespa/vespalib/data/slime/inspector.h> diff --git a/document/src/vespa/document/repo/configbuilder.cpp b/document/src/vespa/document/repo/configbuilder.cpp index 9b1701b8f41..bbb03cd8ce3 100644 --- a/document/src/vespa/document/repo/configbuilder.cpp +++ b/document/src/vespa/document/repo/configbuilder.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".configbuilder"); - #include "configbuilder.h" namespace document { diff --git a/document/src/vespa/document/repo/fixedtyperepo.cpp b/document/src/vespa/document/repo/fixedtyperepo.cpp index e6914f6cc06..414dc366c61 100644 --- a/document/src/vespa/document/repo/fixedtyperepo.cpp +++ b/document/src/vespa/document/repo/fixedtyperepo.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".fixedtyperepo"); - #include "fixedtyperepo.h" namespace document { diff --git a/document/src/vespa/document/select/bodyfielddetector.cpp b/document/src/vespa/document/select/bodyfielddetector.cpp index 873d3a77808..4a749a64b93 100644 --- a/document/src/vespa/document/select/bodyfielddetector.cpp +++ b/document/src/vespa/document/select/bodyfielddetector.cpp @@ -1,23 +1,16 @@ // 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/log/log.h> -LOG_SETUP(".bodyfielddetector"); - #include "bodyfielddetector.h" - #include <vespa/document/base/exceptions.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/vespalib/util/closure.h> #include "valuenode.h" -namespace document -{ - -namespace select -{ +namespace document { +namespace select { void BodyFieldDetector::detectFieldType(const FieldValueNode *expr, diff --git a/document/src/vespa/document/select/compare.cpp b/document/src/vespa/document/select/compare.cpp index 473c7f2c810..47f9443a85a 100644 --- a/document/src/vespa/document/select/compare.cpp +++ b/document/src/vespa/document/select/compare.cpp @@ -2,9 +2,7 @@ #include <vespa/fastos/fastos.h> #include "compare.h" -#include <iomanip> -#include <vespa/log/log.h> -#include <sstream> +#include <ostream> #include <vespa/document/datatype/datatype.h> #include "valuenode.h" #include <vespa/document/fieldvalue/document.h> @@ -12,8 +10,6 @@ #include "compare.h" #include "visitor.h" -LOG_SETUP(".document.select.compare"); - namespace document { namespace select { diff --git a/document/src/vespa/document/serialization/annotationserializer.cpp b/document/src/vespa/document/serialization/annotationserializer.cpp index 16fc0ffe5df..e78cea83d00 100644 --- a/document/src/vespa/document/serialization/annotationserializer.cpp +++ b/document/src/vespa/document/serialization/annotationserializer.cpp @@ -1,11 +1,7 @@ // 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/log/log.h> -LOG_SETUP(".annotationserializer"); - #include "annotationserializer.h" - #include "util.h" #include "vespadocumentserializer.h" #include <vespa/document/annotation/alternatespanlist.h> diff --git a/document/src/vespa/document/update/addvalueupdate.cpp b/document/src/vespa/document/update/addvalueupdate.cpp index 10a0e76872f..090f4ea1eb6 100644 --- a/document/src/vespa/document/update/addvalueupdate.cpp +++ b/document/src/vespa/document/update/addvalueupdate.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".document.addvalueupdate"); - #include <vespa/document/base/field.h> #include <vespa/document/datatype/arraydatatype.h> #include <vespa/document/datatype/weightedsetdatatype.h> diff --git a/document/src/vespa/document/update/removefieldpathupdate.cpp b/document/src/vespa/document/update/removefieldpathupdate.cpp index 1cda533e414..6d75e0b4e45 100644 --- a/document/src/vespa/document/update/removefieldpathupdate.cpp +++ b/document/src/vespa/document/update/removefieldpathupdate.cpp @@ -3,10 +3,6 @@ #include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/document/select/parser.h> #include <vespa/document/update/removefieldpathupdate.h> -#include <vespa/log/log.h> - -LOG_SETUP(".document.update.fieldpathupdate"); - namespace document { diff --git a/document/src/vespa/document/util/compressor.cpp b/document/src/vespa/document/util/compressor.cpp index 003015d5212..1f4a8228032 100644 --- a/document/src/vespa/document/util/compressor.cpp +++ b/document/src/vespa/document/util/compressor.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".document.compressor"); #include <vespa/document/util/compressor.h> #include <vespa/vespalib/util/memory.h> #include <vespa/vespalib/util/linkedptr.h> diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.cpp index 1097beb8746..6d1356a2c08 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".documentmessage"); #include <vespa/documentapi/messagebus/messages/documentmessage.h> #include <vespa/documentapi/messagebus/documentprotocol.h> @@ -22,7 +20,7 @@ mbus::Reply::UP DocumentMessage::createReply() const { mbus::Reply::UP ret(doCreateReply().release()); - LOG_ASSERT(ret.get() != NULL); + assert(ret.get() != NULL); return ret; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp index ecdc190ba93..9287d8f62aa 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".visitor.messages"); - #include <vespa/document/bucket/bucketid.h> #include "visitor.h" diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.cpp index 79391315cd0..def23cd9d78 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.cpp @@ -1,6 +1,5 @@ // 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/log/log.h> #include <vespa/messagebus/error.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/emptyreply.h> @@ -8,8 +7,6 @@ #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/documentapi/messagebus/policies/andpolicy.h> -LOG_SETUP(".andpolicy"); - namespace documentapi { ANDPolicy::ANDPolicy(const string ¶m) diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.cpp index fccb2f2c3a6..24bdb9b9bbc 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".errorpolicy"); - #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/routing/routingcontext.h> @@ -25,7 +22,7 @@ ErrorPolicy::select(mbus::RoutingContext &ctx) void ErrorPolicy::merge(mbus::RoutingContext &) { - LOG_ASSERT(false); + abort(); } } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp index 3c566d0fca5..c1cad546cd6 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".roundrobinpolicy"); - #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp index f07c797fb0f..baa400e5100 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routablefactories"); - #include "routablefactories41.h" #include <vespa/document/document.h> #include <vespa/documentapi/documentapi.h> diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp index 358de79da8a..37d208c1f0c 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routablefactories42"); - #include "routablefactories42.h" #include <vespa/document/document.h> #include <vespa/documentapi/documentapi.h> diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp index 9a604160247..c1b518f0cfa 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routablefactories50"); - #include "routablefactories50.h" #include <vespa/documentapi/loadtypes/loadtypeset.h> #include <vespa/document/document.h> diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp index 32941b7acb9..35c4b5bd2d5 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routablefactories51"); - #include "routablefactories51.h" #include <vespa/document/document.h> #include <vespa/documentapi/documentapi.h> diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp index 491be5d30f2..f9224147453 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp @@ -1,9 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // @author Vegard Sjonfjell #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".routablefactories52"); - #include "routablefactories52.h" #include <vespa/document/document.h> #include <vespa/documentapi/documentapi.h> diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/urlencoder.cpp b/documentapi/src/vespa/documentapi/messagebus/systemstate/urlencoder.cpp index 94917cc5a1a..85bacbdb8db 100644 --- a/documentapi/src/vespa/documentapi/messagebus/systemstate/urlencoder.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/urlencoder.cpp @@ -1,13 +1,9 @@ // 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/log/log.h> - #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/stllike/asciistream.h> #include "urlencoder.h" -LOG_SETUP(".urlencoder"); - using namespace documentapi; const string diff --git a/fnet/src/vespa/fnet/fdselector.cpp b/fnet/src/vespa/fnet/fdselector.cpp index 23ca8e4dc79..3f050599643 100644 --- a/fnet/src/vespa/fnet/fdselector.cpp +++ b/fnet/src/vespa/fnet/fdselector.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".fnet"); #include <vespa/fnet/fnet.h> diff --git a/fnet/src/vespa/fnet/transport.cpp b/fnet/src/vespa/fnet/transport.cpp index ef72b7ede16..f82819a49de 100644 --- a/fnet/src/vespa/fnet/transport.cpp +++ b/fnet/src/vespa/fnet/transport.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".fnet"); #include <vespa/fnet/fnet.h> #include <vespa/vespalib/xxhash/xxhash.h> #include <chrono> diff --git a/juniper/src/test/SrcTestSuite.cpp b/juniper/src/test/SrcTestSuite.cpp index 1134192d085..689ed5b57bf 100644 --- a/juniper/src/test/SrcTestSuite.cpp +++ b/juniper/src/test/SrcTestSuite.cpp @@ -16,9 +16,7 @@ * </pre> ****************************************************************************/ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> #include <vespa/vespalib/testkit/testapp.h> -LOG_SETUP("SrcTestSuite"); #include <vespa/fastlib/testsuite/suite.h> #include "testenv.h" #include "mcandTest.h" diff --git a/juniper/src/test/appender_test.cpp b/juniper/src/test/appender_test.cpp index a8202bf7a91..7887247d9f2 100644 --- a/juniper/src/test/appender_test.cpp +++ b/juniper/src/test/appender_test.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP("appender_test"); #include <vespa/vespalib/testkit/testapp.h> #define _NEED_SUMMARY_CONFIG_IMPL diff --git a/juniper/src/test/auxTestApp.cpp b/juniper/src/test/auxTestApp.cpp index 63e9a0e6c5b..906a1c133dc 100644 --- a/juniper/src/test/auxTestApp.cpp +++ b/juniper/src/test/auxTestApp.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> #include <vespa/vespalib/testkit/testapp.h> -LOG_SETUP("auxTest"); #include "auxTest.h" class AuxTestApp : public vespalib::TestApp diff --git a/juniper/src/test/fakerewriter.cpp b/juniper/src/test/fakerewriter.cpp index 16e3bd0ee7a..c02fc29b119 100644 --- a/juniper/src/test/fakerewriter.cpp +++ b/juniper/src/test/fakerewriter.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(""); #include "fakerewriter.h" #include <vespa/vespalib/util/stringfmt.h> diff --git a/juniper/src/test/matchobjectTest.cpp b/juniper/src/test/matchobjectTest.cpp index 43335ee1d72..81b3f0e1a79 100644 --- a/juniper/src/test/matchobjectTest.cpp +++ b/juniper/src/test/matchobjectTest.cpp @@ -17,8 +17,6 @@ * </pre> ***************************************************************************/ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(""); #include "matchobjectTest.h" #include "fakerewriter.h" diff --git a/juniper/src/test/matchobjectTestApp.cpp b/juniper/src/test/matchobjectTestApp.cpp index 620d461372d..b83691ef338 100644 --- a/juniper/src/test/matchobjectTestApp.cpp +++ b/juniper/src/test/matchobjectTestApp.cpp @@ -17,9 +17,7 @@ * </pre> ****************************************************************************/ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> #include <vespa/vespalib/testkit/testapp.h> -LOG_SETUP("matchobjectTest"); #include "matchobjectTest.h" #include "testenv.h" diff --git a/juniper/src/test/mcandTestApp.cpp b/juniper/src/test/mcandTestApp.cpp index 268224ed195..28692a01c73 100644 --- a/juniper/src/test/mcandTestApp.cpp +++ b/juniper/src/test/mcandTestApp.cpp @@ -17,9 +17,7 @@ * </pre> ****************************************************************************/ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> #include <vespa/vespalib/testkit/testapp.h> -LOG_SETUP("mcandTest"); #include "mcandTest.h" #include "testenv.h" diff --git a/juniper/src/test/queryparserTest.cpp b/juniper/src/test/queryparserTest.cpp index 525e1a37189..c78af7a98c2 100644 --- a/juniper/src/test/queryparserTest.cpp +++ b/juniper/src/test/queryparserTest.cpp @@ -17,8 +17,6 @@ * </pre> ***************************************************************************/ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(""); #include "queryparserTest.h" #include "fakerewriter.h" diff --git a/juniper/src/test/queryparserTestApp.cpp b/juniper/src/test/queryparserTestApp.cpp index 20537028fb9..2c999247478 100644 --- a/juniper/src/test/queryparserTestApp.cpp +++ b/juniper/src/test/queryparserTestApp.cpp @@ -17,9 +17,7 @@ * </pre> ****************************************************************************/ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> #include <vespa/vespalib/testkit/testapp.h> -LOG_SETUP("queryparserTest"); #include "queryparserTest.h" #include "testenv.h" diff --git a/juniper/src/test/queryvisitor_test.cpp b/juniper/src/test/queryvisitor_test.cpp index cc2d224e7d0..18dda67f43f 100644 --- a/juniper/src/test/queryvisitor_test.cpp +++ b/juniper/src/test/queryvisitor_test.cpp @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <memory> #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("queryvisitor_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/juniper/queryhandle.h> diff --git a/juniper/src/test/testenv.cpp b/juniper/src/test/testenv.cpp index 40f35072948..17187e33a28 100644 --- a/juniper/src/test/testenv.cpp +++ b/juniper/src/test/testenv.cpp @@ -4,8 +4,6 @@ */ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(""); #include "testenv.h" #include <vespa/juniper/propreader.h> diff --git a/juniper/src/vespa/juniper/SummaryConfig.cpp b/juniper/src/vespa/juniper/SummaryConfig.cpp index 8f9eeef8ed2..58774cc6c5b 100644 --- a/juniper/src/vespa/juniper/SummaryConfig.cpp +++ b/juniper/src/vespa/juniper/SummaryConfig.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".juniper.summaryconfig"); #define _NEED_SUMMARY_CONFIG_IMPL 1 #include "SummaryConfig.h" #include <string> diff --git a/juniper/src/vespa/juniper/config.cpp b/juniper/src/vespa/juniper/config.cpp index d9ff99a0207..301e7ff0c3b 100644 --- a/juniper/src/vespa/juniper/config.cpp +++ b/juniper/src/vespa/juniper/config.cpp @@ -2,8 +2,6 @@ /* $Id$ */ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".juniper.config"); #include "config.h" #include "IJuniperProperties.h" #include "rpinterface.h" diff --git a/juniper/src/vespa/juniper/dpinterface.cpp b/juniper/src/vespa/juniper/dpinterface.cpp index 5d72774fc8a..874290b840e 100644 --- a/juniper/src/vespa/juniper/dpinterface.cpp +++ b/juniper/src/vespa/juniper/dpinterface.cpp @@ -2,6 +2,4 @@ /* $Id$ */ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".juniper.dpinterface"); #include "dpinterface.h" diff --git a/juniper/src/vespa/juniper/expcache.cpp b/juniper/src/vespa/juniper/expcache.cpp index 181a80b07a2..3e61add149a 100644 --- a/juniper/src/vespa/juniper/expcache.cpp +++ b/juniper/src/vespa/juniper/expcache.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".juniper.expcache"); #include "expcache.h" #include "matchobject.h" diff --git a/juniper/src/vespa/juniper/juniperparams.cpp b/juniper/src/vespa/juniper/juniperparams.cpp index 0973c8a20b6..0824b300d5c 100644 --- a/juniper/src/vespa/juniper/juniperparams.cpp +++ b/juniper/src/vespa/juniper/juniperparams.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".juniper.juniperparams"); #include "juniperdebug.h" #include "juniperparams.h" #include "Matcher.h" diff --git a/juniper/src/vespa/juniper/keyocc.cpp b/juniper/src/vespa/juniper/keyocc.cpp index f37816a231c..623a90311bc 100644 --- a/juniper/src/vespa/juniper/keyocc.cpp +++ b/juniper/src/vespa/juniper/keyocc.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".juniper.keyocc"); #include "keyocc.h" key_occ::key_occ(const char* term_, off_t spos, off_t stoken, int len) : diff --git a/juniper/src/vespa/juniper/matchelem.cpp b/juniper/src/vespa/juniper/matchelem.cpp index 2646cb94b0f..4abdb618507 100644 --- a/juniper/src/vespa/juniper/matchelem.cpp +++ b/juniper/src/vespa/juniper/matchelem.cpp @@ -2,8 +2,6 @@ /* $Id$ */ #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".juniper.matchelem"); #include "matchelem.h" MatchElement::MatchElement(off_t spos, off_t stoken) : diff --git a/juniper/src/vespa/juniper/specialtokenregistry.cpp b/juniper/src/vespa/juniper/specialtokenregistry.cpp index a042fae94be..0533c10efdf 100644 --- a/juniper/src/vespa/juniper/specialtokenregistry.cpp +++ b/juniper/src/vespa/juniper/specialtokenregistry.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".juniper.specialtokenregistry"); #include "specialtokenregistry.h" namespace { diff --git a/juniper/src/vespa/juniper/stringmap.cpp b/juniper/src/vespa/juniper/stringmap.cpp index 52a250f6b1a..5ee3f43abd1 100644 --- a/juniper/src/vespa/juniper/stringmap.cpp +++ b/juniper/src/vespa/juniper/stringmap.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".juniper.stringmap"); #include "stringmap.h" void Fast_StringMap::Insert(const char* key, const char* value) diff --git a/messagebus/src/vespa/messagebus/blob.cpp b/messagebus/src/vespa/messagebus/blob.cpp index ec5a8978b2e..7f22fbe0527 100644 --- a/messagebus/src/vespa/messagebus/blob.cpp +++ b/messagebus/src/vespa/messagebus/blob.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".blob"); #include "blob.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/blobref.cpp b/messagebus/src/vespa/messagebus/blobref.cpp index 24109b38109..ac7b7e9077d 100644 --- a/messagebus/src/vespa/messagebus/blobref.cpp +++ b/messagebus/src/vespa/messagebus/blobref.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".blobref"); #include "blobref.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/callstack.cpp b/messagebus/src/vespa/messagebus/callstack.cpp index 87cff3088bf..c9312e60e33 100644 --- a/messagebus/src/vespa/messagebus/callstack.cpp +++ b/messagebus/src/vespa/messagebus/callstack.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".callstack"); #include "callstack.h" #include "message.h" #include "reply.h" @@ -42,7 +40,7 @@ CallStack::push(IReplyHandler &replyHandler, Context ctx, IReplyHandler & CallStack::pop(Reply &reply) { - LOG_ASSERT(!_stack.empty()); + assert(!_stack.empty()); const Frame &frame = _stack.back(); IReplyHandler *handler = frame.replyHandler; reply.setContext(frame.ctx); diff --git a/messagebus/src/vespa/messagebus/configagent.cpp b/messagebus/src/vespa/messagebus/configagent.cpp index 34fb0849f43..ff6c503029a 100644 --- a/messagebus/src/vespa/messagebus/configagent.cpp +++ b/messagebus/src/vespa/messagebus/configagent.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".configagent"); #include <vespa/messagebus/routing/routingspec.h> #include "configagent.h" #include "iconfighandler.h" diff --git a/messagebus/src/vespa/messagebus/create-class-cpp.sh b/messagebus/src/vespa/messagebus/create-class-cpp.sh index f7c209427a8..17f7bf46fea 100755 --- a/messagebus/src/vespa/messagebus/create-class-cpp.sh +++ b/messagebus/src/vespa/messagebus/create-class-cpp.sh @@ -8,8 +8,6 @@ name=`echo $class | tr 'A-Z' 'a-z'` cat <<EOF // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".$name"); #include <vespa/fastos/fastos.h> #include "$name.h" diff --git a/messagebus/src/vespa/messagebus/destinationsession.cpp b/messagebus/src/vespa/messagebus/destinationsession.cpp index 2cf074ae3e2..10551c8ffb0 100644 --- a/messagebus/src/vespa/messagebus/destinationsession.cpp +++ b/messagebus/src/vespa/messagebus/destinationsession.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".destinationsession"); - #include <vespa/vespalib/util/vstringfmt.h> #include "destinationsession.h" #include "messagebus.h" diff --git a/messagebus/src/vespa/messagebus/emptyreply.cpp b/messagebus/src/vespa/messagebus/emptyreply.cpp index cf13c2bf857..6f73b1c9b73 100644 --- a/messagebus/src/vespa/messagebus/emptyreply.cpp +++ b/messagebus/src/vespa/messagebus/emptyreply.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".emptyreply"); - #include "emptyreply.h" namespace { diff --git a/messagebus/src/vespa/messagebus/error.cpp b/messagebus/src/vespa/messagebus/error.cpp index 736cda5e16b..7579e38ea10 100644 --- a/messagebus/src/vespa/messagebus/error.cpp +++ b/messagebus/src/vespa/messagebus/error.cpp @@ -1,8 +1,6 @@ // 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/vespalib/util/vstringfmt.h> -#include <vespa/log/log.h> -LOG_SETUP(".error"); #include "error.h" #include "errorcode.h" diff --git a/messagebus/src/vespa/messagebus/errorcode.cpp b/messagebus/src/vespa/messagebus/errorcode.cpp index 21d3c91544f..b1bea032674 100644 --- a/messagebus/src/vespa/messagebus/errorcode.cpp +++ b/messagebus/src/vespa/messagebus/errorcode.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".errorcode"); #include "errorcode.h" #include <vespa/vespalib/stllike/asciistream.h> diff --git a/messagebus/src/vespa/messagebus/intermediatesession.cpp b/messagebus/src/vespa/messagebus/intermediatesession.cpp index 88fd6069a81..e6e17dcb5eb 100644 --- a/messagebus/src/vespa/messagebus/intermediatesession.cpp +++ b/messagebus/src/vespa/messagebus/intermediatesession.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".intermediatesession"); - #include <vespa/vespalib/util/vstringfmt.h> #include "intermediatesession.h" #include "messagebus.h" diff --git a/messagebus/src/vespa/messagebus/network/identity.cpp b/messagebus/src/vespa/messagebus/network/identity.cpp index adddbc0c6ec..9a01d21c935 100644 --- a/messagebus/src/vespa/messagebus/network/identity.cpp +++ b/messagebus/src/vespa/messagebus/network/identity.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".identity"); #include "identity.h" #include <vespa/vespalib/util/host_name.h> diff --git a/messagebus/src/vespa/messagebus/network/oosclient.cpp b/messagebus/src/vespa/messagebus/network/oosclient.cpp index b25668c1481..2be0b549429 100644 --- a/messagebus/src/vespa/messagebus/network/oosclient.cpp +++ b/messagebus/src/vespa/messagebus/network/oosclient.cpp @@ -1,9 +1,9 @@ // 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 "oosclient.h" #include <vespa/log/log.h> LOG_SETUP(".oosclient"); -#include "oosclient.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/network/oosmanager.cpp b/messagebus/src/vespa/messagebus/network/oosmanager.cpp index 15f76c0668f..97d2fc9e960 100644 --- a/messagebus/src/vespa/messagebus/network/oosmanager.cpp +++ b/messagebus/src/vespa/messagebus/network/oosmanager.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".oosmanager"); - #include <algorithm> #include <vespa/fnet/frt/frt.h> #include "oosmanager.h" diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp index fe0327a5c6e..837d61bf034 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".rpcnetworkparams"); - #include "rpcnetworkparams.h" #include <vespa/slobrok/cfg.h> diff --git a/messagebus/src/vespa/messagebus/network/rpcsendv1.cpp b/messagebus/src/vespa/messagebus/network/rpcsendv1.cpp index ce41df12a7c..f3e175ba916 100644 --- a/messagebus/src/vespa/messagebus/network/rpcsendv1.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcsendv1.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".rpcsendv1"); - #include <vespa/messagebus/routing/routingnode.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/error.h> diff --git a/messagebus/src/vespa/messagebus/network/rpcservice.cpp b/messagebus/src/vespa/messagebus/network/rpcservice.cpp index c420f817726..64c60d0e01f 100644 --- a/messagebus/src/vespa/messagebus/network/rpcservice.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcservice.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".rpcservice"); - #include "rpcservice.h" #include "rpcserviceaddress.h" #include "rpcnetwork.h" diff --git a/messagebus/src/vespa/messagebus/network/rpcserviceaddress.cpp b/messagebus/src/vespa/messagebus/network/rpcserviceaddress.cpp index bae53313852..461f812c1ed 100644 --- a/messagebus/src/vespa/messagebus/network/rpcserviceaddress.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcserviceaddress.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".rpcserviceaddress"); - #include "rpcserviceaddress.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp b/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp index 9ea0b6fec6a..13b0da585fa 100644 --- a/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".rpcservicepool"); - #include <algorithm> #include "rpcservicepool.h" #include "rpcnetwork.h" @@ -15,7 +12,7 @@ RPCServicePool::RPCServicePool(RPCNetwork &net, uint32_t maxSize) : _lru(maxSize) { _lru.reserve(maxSize); - LOG_ASSERT(maxSize > 0); + assert(maxSize > 0); } RPCServicePool::~RPCServicePool() diff --git a/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp b/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp index 037e261ad7b..869afdfe056 100644 --- a/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp +++ b/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".rpctargetpool"); - #include <vespa/messagebus/systemtimer.h> #include "rpctargetpool.h" diff --git a/messagebus/src/vespa/messagebus/protocolset.cpp b/messagebus/src/vespa/messagebus/protocolset.cpp index c43e8366bb7..30089872d07 100644 --- a/messagebus/src/vespa/messagebus/protocolset.cpp +++ b/messagebus/src/vespa/messagebus/protocolset.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".protocolset"); #include "protocolset.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/replygate.cpp b/messagebus/src/vespa/messagebus/replygate.cpp index 8363d17fd89..556df803158 100644 --- a/messagebus/src/vespa/messagebus/replygate.cpp +++ b/messagebus/src/vespa/messagebus/replygate.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".replygate"); - #include "replygate.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/result.cpp b/messagebus/src/vespa/messagebus/result.cpp index 81a55da1276..3e17d87c9cf 100644 --- a/messagebus/src/vespa/messagebus/result.cpp +++ b/messagebus/src/vespa/messagebus/result.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".result"); #include "result.h" namespace mbus { @@ -11,36 +9,31 @@ Result::Handover::Handover(bool a, const Error &e, Message *m) : _accepted(a), _error(e), _msg(m) -{ -} +{ } Result::Result() : _accepted(true), _error(), _msg() -{ -} +{ } Result::Result(const Error &err, Message::UP msg) : _accepted(false), _error(err), _msg(std::move(msg)) -{ -} +{ } Result::Result(Result &&rhs) : _accepted(rhs._accepted), _error(rhs._error), _msg(std::move(rhs._msg)) -{ -} +{ } Result::Result(const Handover &rhs) : _accepted(rhs._accepted), _error(rhs._error), _msg(rhs._msg) -{ -} +{ } bool Result::isAccepted() const diff --git a/messagebus/src/vespa/messagebus/routable.cpp b/messagebus/src/vespa/messagebus/routable.cpp index 95d56e09696..94096516ca4 100644 --- a/messagebus/src/vespa/messagebus/routable.cpp +++ b/messagebus/src/vespa/messagebus/routable.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routable"); #include "emptyreply.h" #include "errorcode.h" #include "ireplyhandler.h" diff --git a/messagebus/src/vespa/messagebus/routablequeue.cpp b/messagebus/src/vespa/messagebus/routablequeue.cpp index 8e255f8b393..0b6f8ddbbee 100644 --- a/messagebus/src/vespa/messagebus/routablequeue.cpp +++ b/messagebus/src/vespa/messagebus/routablequeue.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".routablequeue"); #include "routablequeue.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routing/hopblueprint.cpp b/messagebus/src/vespa/messagebus/routing/hopblueprint.cpp index efcea51f58e..9062f0dcc4c 100644 --- a/messagebus/src/vespa/messagebus/routing/hopblueprint.cpp +++ b/messagebus/src/vespa/messagebus/routing/hopblueprint.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".hopblueprint"); - #include "hopblueprint.h" #include "hopspec.h" diff --git a/messagebus/src/vespa/messagebus/routing/hopspec.cpp b/messagebus/src/vespa/messagebus/routing/hopspec.cpp index 40c523ca1b6..da8a070949d 100644 --- a/messagebus/src/vespa/messagebus/routing/hopspec.cpp +++ b/messagebus/src/vespa/messagebus/routing/hopspec.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".hopspec"); - #include <vespa/vespalib/util/vstringfmt.h> #include "routingspec.h" diff --git a/messagebus/src/vespa/messagebus/routing/resender.cpp b/messagebus/src/vespa/messagebus/routing/resender.cpp index b767252f39f..27843a7eca0 100644 --- a/messagebus/src/vespa/messagebus/routing/resender.cpp +++ b/messagebus/src/vespa/messagebus/routing/resender.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".resender"); - #include <vespa/messagebus/error.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/tracelevel.h> diff --git a/messagebus/src/vespa/messagebus/routing/routeparser.cpp b/messagebus/src/vespa/messagebus/routing/routeparser.cpp index c1c0dba871e..aef49eb55d2 100644 --- a/messagebus/src/vespa/messagebus/routing/routeparser.cpp +++ b/messagebus/src/vespa/messagebus/routing/routeparser.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routeparser"); - #include <vespa/messagebus/common.h> #include <stdio.h> #include <vespa/vespalib/util/stringfmt.h> diff --git a/messagebus/src/vespa/messagebus/routing/routespec.cpp b/messagebus/src/vespa/messagebus/routing/routespec.cpp index 848b553bf98..7cd3d140114 100644 --- a/messagebus/src/vespa/messagebus/routing/routespec.cpp +++ b/messagebus/src/vespa/messagebus/routing/routespec.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routespec"); - #include <vespa/vespalib/util/vstringfmt.h> #include "routingspec.h" diff --git a/messagebus/src/vespa/messagebus/routing/routingcontext.cpp b/messagebus/src/vespa/messagebus/routing/routingcontext.cpp index 8e7f2739148..1bdcf6ce147 100644 --- a/messagebus/src/vespa/messagebus/routing/routingcontext.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingcontext.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routingcontext"); - #include "route.h" #include "routingnode.h" diff --git a/messagebus/src/vespa/messagebus/routing/routingnode.cpp b/messagebus/src/vespa/messagebus/routing/routingnode.cpp index 55b96837098..3e50ea12f3c 100644 --- a/messagebus/src/vespa/messagebus/routing/routingnode.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingnode.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routingnode"); - #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/tracelevel.h> @@ -83,7 +80,7 @@ RoutingNode::clearChildren() void RoutingNode::discard() { - LOG_ASSERT(_parent == NULL); + assert(_parent == NULL); if (_discardHandler != NULL) { _discardHandler->handleDiscard(Context()); } @@ -245,7 +242,7 @@ RoutingNode::notifyTransmit() if (node->hasReply()) { node->notifyParent(); } else { - LOG_ASSERT(node->_serviceAddress.get() != NULL); + assert(node->_serviceAddress.get() != NULL); sendTo.push_back(node); } } else { diff --git a/messagebus/src/vespa/messagebus/routing/routingspec.cpp b/messagebus/src/vespa/messagebus/routing/routingspec.cpp index 7f4f605d3ff..3dde29fa30d 100644 --- a/messagebus/src/vespa/messagebus/routing/routingspec.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingspec.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routingspec"); - #include <vespa/vespalib/util/vstringfmt.h> #include "routingspec.h" diff --git a/messagebus/src/vespa/messagebus/routing/routingtable.cpp b/messagebus/src/vespa/messagebus/routing/routingtable.cpp index fa58570d2a5..1cbe4c03800 100644 --- a/messagebus/src/vespa/messagebus/routing/routingtable.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingtable.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".routingtable"); #include <vespa/messagebus/iprotocol.h> #include <vespa/messagebus/message.h> #include <vector> diff --git a/messagebus/src/vespa/messagebus/routing/routingtablespec.cpp b/messagebus/src/vespa/messagebus/routing/routingtablespec.cpp index 9b3ec6634e2..b1833516f20 100644 --- a/messagebus/src/vespa/messagebus/routing/routingtablespec.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingtablespec.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".routingtablespec"); - #include <vespa/vespalib/util/vstringfmt.h> #include "routingspec.h" diff --git a/messagebus/src/vespa/messagebus/rpcmessagebus.cpp b/messagebus/src/vespa/messagebus/rpcmessagebus.cpp index fc966f896cb..99d193694f3 100644 --- a/messagebus/src/vespa/messagebus/rpcmessagebus.cpp +++ b/messagebus/src/vespa/messagebus/rpcmessagebus.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".mb"); #include "rpcmessagebus.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/sequencer.cpp b/messagebus/src/vespa/messagebus/sequencer.cpp index eca801d4b2e..039531c9b00 100644 --- a/messagebus/src/vespa/messagebus/sequencer.cpp +++ b/messagebus/src/vespa/messagebus/sequencer.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".sequencer"); - #include <vespa/vespalib/util/vstringfmt.h> #include "sequencer.h" #include "tracelevel.h" @@ -90,7 +87,7 @@ Sequencer::handleReply(Reply::UP reply) vespalib::LockGuard guard(_lock); QueueMap::iterator it = _seqMap.find(seq); MessageQueue *que = it->second; - LOG_ASSERT(it != _seqMap.end()); + assert(it != _seqMap.end()); if (que == NULL || que->size() == 0) { if (que != NULL) { delete que; diff --git a/messagebus/src/vespa/messagebus/sourcesession.cpp b/messagebus/src/vespa/messagebus/sourcesession.cpp index a2cea9ddc8a..591829be962 100644 --- a/messagebus/src/vespa/messagebus/sourcesession.cpp +++ b/messagebus/src/vespa/messagebus/sourcesession.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".sourcesession"); - #include <vespa/messagebus/routing/routingtable.h> #include <vespa/vespalib/util/vstringfmt.h> #include "error.h" @@ -13,7 +10,9 @@ LOG_SETUP(".sourcesession"); #include "sourcesessionparams.h" #include "tracelevel.h" #include <algorithm> -#include <iostream> +#include <vespa/log/log.h> +LOG_SETUP(".sourcesession"); + namespace mbus { diff --git a/messagebus/src/vespa/messagebus/sourcesessionparams.cpp b/messagebus/src/vespa/messagebus/sourcesessionparams.cpp index ae73b462660..b97b3ee194c 100644 --- a/messagebus/src/vespa/messagebus/sourcesessionparams.cpp +++ b/messagebus/src/vespa/messagebus/sourcesessionparams.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".sourcesessionparams"); - #include "dynamicthrottlepolicy.h" #include "sourcesessionparams.h" diff --git a/messagebus/src/vespa/messagebus/testlib/create-class-cpp.sh b/messagebus/src/vespa/messagebus/testlib/create-class-cpp.sh index f7c209427a8..17f7bf46fea 100755 --- a/messagebus/src/vespa/messagebus/testlib/create-class-cpp.sh +++ b/messagebus/src/vespa/messagebus/testlib/create-class-cpp.sh @@ -8,8 +8,6 @@ name=`echo $class | tr 'A-Z' 'a-z'` cat <<EOF // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".$name"); #include <vespa/fastos/fastos.h> #include "$name.h" diff --git a/messagebus/src/vespa/messagebus/testlib/oosserver.cpp b/messagebus/src/vespa/messagebus/testlib/oosserver.cpp index bf7eefbb84a..d78bacf6b06 100644 --- a/messagebus/src/vespa/messagebus/testlib/oosserver.cpp +++ b/messagebus/src/vespa/messagebus/testlib/oosserver.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".oosserver"); #include "oosserver.h" #include "slobrok.h" diff --git a/messagebus/src/vespa/messagebus/testlib/oosstate.cpp b/messagebus/src/vespa/messagebus/testlib/oosstate.cpp index c4ad1fcafcd..05cd98aec86 100644 --- a/messagebus/src/vespa/messagebus/testlib/oosstate.cpp +++ b/messagebus/src/vespa/messagebus/testlib/oosstate.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".oosstate"); #include "oosstate.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/testlib/receptor.cpp b/messagebus/src/vespa/messagebus/testlib/receptor.cpp index 2e45975cac6..ca1d742e1b1 100644 --- a/messagebus/src/vespa/messagebus/testlib/receptor.cpp +++ b/messagebus/src/vespa/messagebus/testlib/receptor.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".receptor"); #include "receptor.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/testlib/simplemessage.cpp b/messagebus/src/vespa/messagebus/testlib/simplemessage.cpp index 947df5100af..206473e0b32 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplemessage.cpp +++ b/messagebus/src/vespa/messagebus/testlib/simplemessage.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".simplemessage"); #include "simplemessage.h" #include "simpleprotocol.h" diff --git a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp index eeb06b042df..4e7c9b0b1de 100644 --- a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp +++ b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp @@ -1,9 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".simpleprotocol"); - #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/routing/routingcontext.h> #include <vespa/messagebus/routing/routingnodeiterator.h> diff --git a/messagebus/src/vespa/messagebus/testlib/simplereply.cpp b/messagebus/src/vespa/messagebus/testlib/simplereply.cpp index 1559a157860..65d6af67967 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplereply.cpp +++ b/messagebus/src/vespa/messagebus/testlib/simplereply.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".simplereply"); #include "simplereply.h" #include "simpleprotocol.h" diff --git a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp index 924391c0f8d..6872e9a66cc 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp @@ -1,13 +1,13 @@ // 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/log/log.h> -LOG_SETUP(".slobrok"); #include "slobrok.h" #include <vespa/slobrok/cfg.h> #include <vespa/slobrok/server/sbenv.h> #include <vespa/vespalib/util/sync.h> #include <vespa/vespalib/util/vstringfmt.h> +#include <vespa/log/log.h> +LOG_SETUP(".slobrok"); namespace { class WaitTask : public FNET_Task diff --git a/messagebus/src/vespa/messagebus/testlib/slobrokstate.cpp b/messagebus/src/vespa/messagebus/testlib/slobrokstate.cpp index 4f825f8dba1..9aefca7a70c 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrokstate.cpp +++ b/messagebus/src/vespa/messagebus/testlib/slobrokstate.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".slobrokstate"); #include "slobrokstate.h" namespace mbus { diff --git a/staging_vespalib/src/vespa/vespalib/data/databuffer.cpp b/staging_vespalib/src/vespa/vespalib/data/databuffer.cpp index e046415e8e8..54baf0e8b60 100644 --- a/staging_vespalib/src/vespa/vespalib/data/databuffer.cpp +++ b/staging_vespalib/src/vespa/vespalib/data/databuffer.cpp @@ -1,8 +1,6 @@ // 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 "databuffer.h" -#include <vespa/log/log.h> -LOG_SETUP(".databuffer"); namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp index 0fe6727a416..48ab6d879d1 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp @@ -1,10 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".search.util.jsonwriter"); - #include "jsonwriter.h" -#include <iostream> #include <cmath> namespace vespalib { 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() diff --git a/vespalib/src/vespa/vespalib/testkit/create-test.sh b/vespalib/src/vespa/vespalib/testkit/create-test.sh index 5ffc43c7020..4d02c184c98 100755 --- a/vespalib/src/vespa/vespalib/testkit/create-test.sh +++ b/vespalib/src/vespa/vespalib/testkit/create-test.sh @@ -22,8 +22,6 @@ gen_project_file() { gen_source() { echo "generating '$1' ..." - echo "#include <vespa/log/log.h>" > $1 - echo "LOG_SETUP(\"${test}_test\");" >> $1 echo "#include <vespa/fastos/fastos.h>" >> $1 echo "#include <vespa/vespalib/testkit/testapp.h>" >> $1 echo "" >> $1 diff --git a/vespalib/src/vespa/vespalib/testkit/testapp.h b/vespalib/src/vespa/vespalib/testkit/testapp.h index 644c85e4be7..5a06736c870 100644 --- a/vespalib/src/vespa/vespalib/testkit/testapp.h +++ b/vespalib/src/vespa/vespalib/testkit/testapp.h @@ -144,8 +144,6 @@ namespace vespalib { * * Simple test example: * <pre> - * \#include <vespa/log/log.h> - * LOG_SETUP("true_test"); * \#include <vespa/fastos/fastos.h> * \#include <vespa/vespalib/testkit/testapp.h> * diff --git a/vespalib/src/vespa/vespalib/text/lowercase.cpp b/vespalib/src/vespa/vespalib/text/lowercase.cpp index 62e2491005b..1e320c657b3 100644 --- a/vespalib/src/vespa/vespalib/text/lowercase.cpp +++ b/vespalib/src/vespa/vespalib/text/lowercase.cpp @@ -5,9 +5,6 @@ #include "lowercase.h" #include <vespa/vespalib/text/utf8.h> -#include <vespa/log/log.h> -LOG_SETUP(".vespalib.lowercase"); - namespace vespalib { vespalib::string diff --git a/vespalib/src/vespa/vespalib/trace/trace.cpp b/vespalib/src/vespa/vespalib/trace/trace.cpp index 02f4402def2..018fd11ddbc 100644 --- a/vespalib/src/vespa/vespalib/trace/trace.cpp +++ b/vespalib/src/vespa/vespalib/trace/trace.cpp @@ -4,11 +4,8 @@ #include <algorithm> #include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> #include <vespa/vespalib/util/vstringfmt.h> -LOG_SETUP(".trace"); - namespace vespalib { Trace::Trace() : diff --git a/vespalib/src/vespa/vespalib/util/gencnt.cpp b/vespalib/src/vespa/vespalib/util/gencnt.cpp index 5b51b8d2ebd..c2d5f3f6fde 100644 --- a/vespalib/src/vespa/vespalib/util/gencnt.cpp +++ b/vespalib/src/vespa/vespalib/util/gencnt.cpp @@ -1,8 +1,6 @@ // 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/log/log.h> -LOG_SETUP(".gencnt"); #include "gencnt.h" namespace vespalib { @@ -45,7 +43,7 @@ GenCnt::distance(const GenCnt &other) const { if (other._val == 0) { // special case - LOG_ASSERT(_val == 0); + assert(_val == 0); return 0; } if (_val <= other._val) { diff --git a/vespalib/src/vespa/vespalib/util/time_tracker.cpp b/vespalib/src/vespa/vespalib/util/time_tracker.cpp index 9a6db840ca2..43212626af4 100644 --- a/vespalib/src/vespa/vespalib/util/time_tracker.cpp +++ b/vespalib/src/vespa/vespalib/util/time_tracker.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".time_tracer"); #include <vespa/fastos/fastos.h> #include "time_tracker.h" #include "stringfmt.h" diff --git a/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp b/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp index be7fefd87d9..127f95ea985 100644 --- a/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp +++ b/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".vsm.docsumfieldspec"); - #include <vespa/vsm/vsm/docsumfieldspec.h> namespace vsm { diff --git a/vsm/src/vespa/vsm/vsm/flattendocsumwriter.cpp b/vsm/src/vespa/vsm/vsm/flattendocsumwriter.cpp index 09f0268893e..a2f8c6220e6 100644 --- a/vsm/src/vespa/vsm/vsm/flattendocsumwriter.cpp +++ b/vsm/src/vespa/vsm/vsm/flattendocsumwriter.cpp @@ -1,8 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".vsm.flattendocsumwriter"); - #include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/vsm/vsm/flattendocsumwriter.h> |