diff options
101 files changed, 180 insertions, 404 deletions
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 3baad5b0562..ea82c43a596 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -23,6 +23,7 @@ #include <vespa/messagebus/routing/routingcontext.h> #include <vespa/messagebus/testlib/testserver.h> #include <vespa/vdslib/container/mutabledocumentlist.h> +#include <vespa/vdslib/state/clusterstate.h> #include <vespa/vespalib/testkit/testapp.h> #include "testframe.h" #include <vespa/log/log.h> @@ -34,7 +35,7 @@ using document::DocumentId; using document::DocumentTypeRepo; using document::DocumentUpdate; using document::readDocumenttypesConfig; -using slobrok::api::MirrorAPI; +using slobrok::api::IMirrorAPI; using namespace documentapi; class Test : public vespalib::TestApp { @@ -53,8 +54,8 @@ private: StoragePolicy &setupStoragePolicy(TestFrame &frame, const string ¶m, const string &pattern = "", int32_t numEntries = -1); bool isErrorPolicy(const string &name, const string ¶m); - void assertMirrorReady(const slobrok::api::MirrorAPI &mirror); - void assertMirrorContains(const slobrok::api::MirrorAPI &mirror, const string &pattern, + void assertMirrorReady(const IMirrorAPI &mirror); + void assertMirrorContains(const IMirrorAPI &mirror, const string &pattern, uint32_t numEntries); mbus::Message::UP newPutDocumentMessage(const string &documentId); @@ -286,7 +287,7 @@ Test::setupExternPolicy(TestFrame &frame, mbus::Slobrok &slobrok, const string & } void -Test::assertMirrorReady(const slobrok::api::MirrorAPI &mirror) +Test::assertMirrorReady(const slobrok::api::IMirrorAPI &mirror) { for (uint32_t i = 0; i < 6000; ++i) { if (mirror.ready()) { @@ -298,7 +299,7 @@ Test::assertMirrorReady(const slobrok::api::MirrorAPI &mirror) } void -Test::assertMirrorContains(const slobrok::api::MirrorAPI &mirror, const string &pattern, +Test::assertMirrorContains(const slobrok::api::IMirrorAPI &mirror, const string &pattern, uint32_t numEntries) { for (uint32_t i = 0; i < 6000; ++i) { @@ -927,10 +928,10 @@ namespace { void Test::testLoadBalancer() { LoadBalancer lb("foo", ""); - MirrorAPI::SpecList entries; - entries.push_back(MirrorAPI::Spec("foo/0/default", "tcp/bar:1")); - entries.push_back(MirrorAPI::Spec("foo/1/default", "tcp/bar:2")); - entries.push_back(MirrorAPI::Spec("foo/2/default", "tcp/bar:3")); + IMirrorAPI::SpecList entries; + entries.push_back(IMirrorAPI::Spec("foo/0/default", "tcp/bar:1")); + entries.push_back(IMirrorAPI::Spec("foo/1/default", "tcp/bar:2")); + entries.push_back(IMirrorAPI::Spec("foo/2/default", "tcp/bar:3")); const std::vector<LoadBalancer::NodeInfo>& nodeInfo = lb.getNodeInfo(); diff --git a/fnet/src/vespa/fnet/task.h b/fnet/src/vespa/fnet/task.h index 321c94d6770..b27d1272b1f 100644 --- a/fnet/src/vespa/fnet/task.h +++ b/fnet/src/vespa/fnet/task.h @@ -2,6 +2,8 @@ #pragma once +#include <cstdint> + class FNET_Scheduler; /** diff --git a/messagebus/src/apps/printversion/printversion.cpp b/messagebus/src/apps/printversion/printversion.cpp index d616394ef80..f11c30712be 100644 --- a/messagebus/src/apps/printversion/printversion.cpp +++ b/messagebus/src/apps/printversion/printversion.cpp @@ -1,5 +1,4 @@ // 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/component/vtag.h> #include <stdio.h> diff --git a/messagebus/src/tests/advancedrouting/advancedrouting.cpp b/messagebus/src/tests/advancedrouting/advancedrouting.cpp index 976746b0738..384c9be667f 100644 --- a/messagebus/src/tests/advancedrouting/advancedrouting.cpp +++ b/messagebus/src/tests/advancedrouting/advancedrouting.cpp @@ -1,8 +1,4 @@ // 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("routing_test"); - #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/messagebus.h> @@ -75,22 +71,18 @@ TestData::start() { _srcSession = _srcServer.mb.createSourceSession(SourceSessionParams().setReplyHandler(_srcHandler)); if (_srcSession.get() == NULL) { - LOG(error, "Could not create source session."); return false; } _fooSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("foo").setMessageHandler(_fooHandler)); if (_fooSession.get() == NULL) { - LOG(error, "Could not create foo session."); return false; } _barSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("bar").setMessageHandler(_barHandler)); if (_barSession.get() == NULL) { - LOG(error, "Could not create bar session."); return false; } _bazSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("baz").setMessageHandler(_bazHandler)); if (_bazSession.get() == NULL) { - LOG(error, "Could not create baz session."); return false; } if (!_srcServer.waitSlobrok("dst/*", 3u)) { diff --git a/messagebus/src/tests/auto-reply/auto-reply.cpp b/messagebus/src/tests/auto-reply/auto-reply.cpp index 876755dfd0e..fba1d78eab5 100644 --- a/messagebus/src/tests/auto-reply/auto-reply.cpp +++ b/messagebus/src/tests/auto-reply/auto-reply.cpp @@ -1,7 +1,4 @@ // 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("auto-reply_test"); #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/routablequeue.h> diff --git a/messagebus/src/tests/blob/blob.cpp b/messagebus/src/tests/blob/blob.cpp index 9b0df1ae476..4b84bdfd9f2 100644 --- a/messagebus/src/tests/blob/blob.cpp +++ b/messagebus/src/tests/blob/blob.cpp @@ -1,7 +1,4 @@ // 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_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/messagebus/blob.h> #include <vespa/messagebus/blobref.h> diff --git a/messagebus/src/tests/bucketsequence/bucketsequence.cpp b/messagebus/src/tests/bucketsequence/bucketsequence.cpp index 6036c43f659..2661a0e86e1 100644 --- a/messagebus/src/tests/bucketsequence/bucketsequence.cpp +++ b/messagebus/src/tests/bucketsequence/bucketsequence.cpp @@ -1,7 +1,4 @@ // 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("bucketsequence_test"); #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/routing/retrytransienterrorspolicy.h> diff --git a/messagebus/src/tests/choke/choke.cpp b/messagebus/src/tests/choke/choke.cpp index 567ec52db79..023554250cc 100644 --- a/messagebus/src/tests/choke/choke.cpp +++ b/messagebus/src/tests/choke/choke.cpp @@ -1,7 +1,4 @@ // 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("choke_test"); #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> diff --git a/messagebus/src/tests/configagent/configagent.cpp b/messagebus/src/tests/configagent/configagent.cpp index ab1f4cdbe11..29b58494c8a 100644 --- a/messagebus/src/tests/configagent/configagent.cpp +++ b/messagebus/src/tests/configagent/configagent.cpp @@ -1,7 +1,4 @@ // 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_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/config/print/fileconfigreader.h> #include <vespa/messagebus/configagent.h> diff --git a/messagebus/src/tests/context/context.cpp b/messagebus/src/tests/context/context.cpp index ccb136e7b81..99d674c4997 100644 --- a/messagebus/src/tests/context/context.cpp +++ b/messagebus/src/tests/context/context.cpp @@ -1,7 +1,4 @@ // 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("context_test"); #include <vespa/messagebus/destinationsession.h> #include <vespa/messagebus/intermediatesession.h> diff --git a/messagebus/src/tests/emptyreply/emptyreply.cpp b/messagebus/src/tests/emptyreply/emptyreply.cpp index 711a21edd17..3313a27d405 100644 --- a/messagebus/src/tests/emptyreply/emptyreply.cpp +++ b/messagebus/src/tests/emptyreply/emptyreply.cpp @@ -1,7 +1,4 @@ // 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_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/messagebus/emptyreply.h> diff --git a/messagebus/src/tests/error/error.cpp b/messagebus/src/tests/error/error.cpp index d5779aadeeb..8828ce11f9c 100644 --- a/messagebus/src/tests/error/error.cpp +++ b/messagebus/src/tests/error/error.cpp @@ -1,7 +1,4 @@ // 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("error_test"); #include <vespa/messagebus/destinationsession.h> #include <vespa/messagebus/emptyreply.h> diff --git a/messagebus/src/tests/identity/identity.cpp b/messagebus/src/tests/identity/identity.cpp index 95c499e3ff2..99aa766138e 100644 --- a/messagebus/src/tests/identity/identity.cpp +++ b/messagebus/src/tests/identity/identity.cpp @@ -1,7 +1,4 @@ // 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_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/messagebus/network/identity.h> diff --git a/messagebus/src/tests/loadbalance/loadbalance.cpp b/messagebus/src/tests/loadbalance/loadbalance.cpp index f49ca13708c..7e917ee79c7 100644 --- a/messagebus/src/tests/loadbalance/loadbalance.cpp +++ b/messagebus/src/tests/loadbalance/loadbalance.cpp @@ -1,7 +1,4 @@ // 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("loadbalance_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/messagebus/destinationsession.h> diff --git a/messagebus/src/tests/messagebus/messagebus.cpp b/messagebus/src/tests/messagebus/messagebus.cpp index a887759ac02..ecfec5ac873 100644 --- a/messagebus/src/tests/messagebus/messagebus.cpp +++ b/messagebus/src/tests/messagebus/messagebus.cpp @@ -1,7 +1,4 @@ // 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("messagebus_test"); #include <vespa/messagebus/destinationsession.h> #include <vespa/messagebus/emptyreply.h> diff --git a/messagebus/src/tests/messageordering/messageordering.cpp b/messagebus/src/tests/messageordering/messageordering.cpp index 97daee80d99..a502769a9e8 100644 --- a/messagebus/src/tests/messageordering/messageordering.cpp +++ b/messagebus/src/tests/messageordering/messageordering.cpp @@ -1,7 +1,4 @@ // 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("messageordering_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/messagebus/messagebus.h> #include <vespa/messagebus/sourcesession.h> @@ -18,6 +15,9 @@ LOG_SETUP("messageordering_test"); #include <vespa/vespalib/util/vstringfmt.h> #include <stdexcept> +#include <vespa/log/log.h> +LOG_SETUP("messageordering_test"); + using namespace mbus; TEST_SETUP(Test); diff --git a/messagebus/src/vespa/messagebus/blob.cpp b/messagebus/src/vespa/messagebus/blob.cpp index 7f22fbe0527..fb48447d594 100644 --- a/messagebus/src/vespa/messagebus/blob.cpp +++ b/messagebus/src/vespa/messagebus/blob.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 "blob.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/blobref.cpp b/messagebus/src/vespa/messagebus/blobref.cpp index ac7b7e9077d..8ca70df5a1e 100644 --- a/messagebus/src/vespa/messagebus/blobref.cpp +++ b/messagebus/src/vespa/messagebus/blobref.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 "blobref.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/callstack.cpp b/messagebus/src/vespa/messagebus/callstack.cpp index d9c37c6e9ee..5311a75c3c5 100644 --- a/messagebus/src/vespa/messagebus/callstack.cpp +++ b/messagebus/src/vespa/messagebus/callstack.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 "callstack.h" #include "message.h" #include "reply.h" diff --git a/messagebus/src/vespa/messagebus/configagent.cpp b/messagebus/src/vespa/messagebus/configagent.cpp index ff6c503029a..abea2fb9a0e 100644 --- a/messagebus/src/vespa/messagebus/configagent.cpp +++ b/messagebus/src/vespa/messagebus/configagent.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/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 17f7bf46fea..5bc3c1327b6 100755 --- a/messagebus/src/vespa/messagebus/create-class-cpp.sh +++ b/messagebus/src/vespa/messagebus/create-class-cpp.sh @@ -8,7 +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/fastos/fastos.h> #include "$name.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/destinationsession.cpp b/messagebus/src/vespa/messagebus/destinationsession.cpp index 10551c8ffb0..02fa41a042b 100644 --- a/messagebus/src/vespa/messagebus/destinationsession.cpp +++ b/messagebus/src/vespa/messagebus/destinationsession.cpp @@ -1,6 +1,4 @@ // 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 "destinationsession.h" #include "messagebus.h" #include "emptyreply.h" @@ -11,46 +9,38 @@ DestinationSession::DestinationSession(MessageBus &mbus, const DestinationSessio _mbus(mbus), _name(params.getName()), _msgHandler(params.getMessageHandler()) -{ - // empty -} +{ } -DestinationSession::~DestinationSession() -{ +DestinationSession::~DestinationSession() { close(); } void -DestinationSession::close() -{ +DestinationSession::close() { _mbus.unregisterSession(_name); _mbus.sync(); } void -DestinationSession::acknowledge(Message::UP msg) -{ +DestinationSession::acknowledge(Message::UP msg) { Reply::UP ack(new EmptyReply()); ack->swapState(*msg); reply(std::move(ack)); } void -DestinationSession::reply(Reply::UP ret) -{ +DestinationSession::reply(Reply::UP ret) { IReplyHandler &handler = ret->getCallStack().pop(*ret); handler.handleReply(std::move(ret)); } void -DestinationSession::handleMessage(Message::UP msg) -{ +DestinationSession::handleMessage(Message::UP msg) { _msgHandler.handleMessage(std::move(msg)); } const string -DestinationSession::getConnectionSpec() const -{ +DestinationSession::getConnectionSpec() const { return _mbus.getConnectionSpec() + "/" + _name; } diff --git a/messagebus/src/vespa/messagebus/destinationsessionparams.cpp b/messagebus/src/vespa/messagebus/destinationsessionparams.cpp index 38e8e4c8a3e..8910825ecd4 100644 --- a/messagebus/src/vespa/messagebus/destinationsessionparams.cpp +++ b/messagebus/src/vespa/messagebus/destinationsessionparams.cpp @@ -1,5 +1,4 @@ // 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 "destinationsessionparams.h" namespace mbus { @@ -8,8 +7,6 @@ DestinationSessionParams::DestinationSessionParams() : _name("destination"), _broadcastName(true), _handler(NULL) -{ - // empty -} +{ } } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.cpp b/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.cpp index 7a16d1e7c90..074c8d4e936 100644 --- a/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.cpp +++ b/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.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 <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".dynamicthrottlepolicy"); - #include <vespa/vespalib/util/atomic.h> #include "dynamicthrottlepolicy.h" #include "systemtimer.h" #include <climits> +#include <vespa/log/log.h> +LOG_SETUP(".dynamicthrottlepolicy"); + namespace mbus { DynamicThrottlePolicy::DynamicThrottlePolicy() : @@ -26,9 +25,7 @@ DynamicThrottlePolicy::DynamicThrottlePolicy() : _windowSizeBackOff(0.9), _weight(1), _localMaxThroughput(0) -{ - // empty -} +{ } DynamicThrottlePolicy::DynamicThrottlePolicy(double windowSizeIncrement) : _timer(new SystemTimer()), @@ -46,9 +43,7 @@ DynamicThrottlePolicy::DynamicThrottlePolicy(double windowSizeIncrement) : _windowSizeBackOff(0.9), _weight(1), _localMaxThroughput(0) -{ - // empty -} +{ } DynamicThrottlePolicy::DynamicThrottlePolicy(ITimer::UP timer) : _timer(std::move(timer)), @@ -66,9 +61,7 @@ DynamicThrottlePolicy::DynamicThrottlePolicy(ITimer::UP timer) : _windowSizeBackOff(0.9), _weight(1), _localMaxThroughput(0) -{ - // empty -} +{ } DynamicThrottlePolicy & DynamicThrottlePolicy::setEfficiencyThreshold(double efficiencyThreshold) diff --git a/messagebus/src/vespa/messagebus/emptyreply.cpp b/messagebus/src/vespa/messagebus/emptyreply.cpp index 6f73b1c9b73..5e873da5605 100644 --- a/messagebus/src/vespa/messagebus/emptyreply.cpp +++ b/messagebus/src/vespa/messagebus/emptyreply.cpp @@ -1,5 +1,4 @@ // 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 "emptyreply.h" namespace { @@ -10,26 +9,20 @@ static mbus::string EmptyReplyProtocolName = ""; namespace mbus { -EmptyReply::EmptyReply() -{ - // empty -} +EmptyReply::EmptyReply() { } const string & -EmptyReply::getProtocol() const -{ +EmptyReply::getProtocol() const { return EmptyReplyProtocolName; } uint32_t -EmptyReply::getType() const -{ +EmptyReply::getType() const { return 0; } Blob -EmptyReply::encode() const -{ +EmptyReply::encode() const { return Blob(0); } diff --git a/messagebus/src/vespa/messagebus/error.cpp b/messagebus/src/vespa/messagebus/error.cpp index 7579e38ea10..7bbe47319f2 100644 --- a/messagebus/src/vespa/messagebus/error.cpp +++ b/messagebus/src/vespa/messagebus/error.cpp @@ -1,8 +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/vespalib/util/vstringfmt.h> #include "error.h" #include "errorcode.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { @@ -10,17 +9,13 @@ Error::Error() : _code(ErrorCode::NONE), _msg(), _service() -{ - // empty -} +{ } Error::Error(uint32_t c, const string &m, const string &s) : _code(c), _msg(m), _service(s) -{ - // empty -} +{ } string Error::toString() const diff --git a/messagebus/src/vespa/messagebus/errorcode.cpp b/messagebus/src/vespa/messagebus/errorcode.cpp index b1bea032674..d6ab5762c57 100644 --- a/messagebus/src/vespa/messagebus/errorcode.cpp +++ b/messagebus/src/vespa/messagebus/errorcode.cpp @@ -1,15 +1,11 @@ // 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 "errorcode.h" #include <vespa/vespalib/stllike/asciistream.h> namespace mbus { -ErrorCode::ErrorCode() -{ - // empty -} +ErrorCode::ErrorCode() { } string ErrorCode::getName(uint32_t errorCode) diff --git a/messagebus/src/vespa/messagebus/intermediatesession.cpp b/messagebus/src/vespa/messagebus/intermediatesession.cpp index e6e17dcb5eb..e1817121439 100644 --- a/messagebus/src/vespa/messagebus/intermediatesession.cpp +++ b/messagebus/src/vespa/messagebus/intermediatesession.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/vespalib/util/vstringfmt.h> #include "intermediatesession.h" #include "messagebus.h" #include "replygate.h" @@ -14,9 +12,7 @@ IntermediateSession::IntermediateSession(MessageBus &mbus, const IntermediateSes _msgHandler(params.getMessageHandler()), _replyHandler(params.getReplyHandler()), _gate(new ReplyGate(_mbus)) -{ - // empty -} +{ } IntermediateSession::~IntermediateSession() { diff --git a/messagebus/src/vespa/messagebus/intermediatesessionparams.cpp b/messagebus/src/vespa/messagebus/intermediatesessionparams.cpp index 2d8944b8f26..8c54c4454d4 100644 --- a/messagebus/src/vespa/messagebus/intermediatesessionparams.cpp +++ b/messagebus/src/vespa/messagebus/intermediatesessionparams.cpp @@ -1,5 +1,4 @@ // 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 "intermediatesessionparams.h" namespace mbus { @@ -7,10 +6,8 @@ namespace mbus { IntermediateSessionParams::IntermediateSessionParams() : _name("intermediate"), _broadcastName(true), - _msgHandler(NULL), - _replyHandler(NULL) -{ - // empty -} + _msgHandler(nullptr), + _replyHandler(nullptr) +{ } } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/message.cpp b/messagebus/src/vespa/messagebus/message.cpp index cdf290f2be1..599d1e31788 100644 --- a/messagebus/src/vespa/messagebus/message.cpp +++ b/messagebus/src/vespa/messagebus/message.cpp @@ -1,15 +1,15 @@ // 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(".message"); -#include <vespa/vespalib/util/backtrace.h> #include "message.h" #include "reply.h" #include "ireplyhandler.h" #include "emptyreply.h" #include "error.h" #include "errorcode.h" +#include <vespa/vespalib/util/backtrace.h> + +#include <vespa/log/log.h> +LOG_SETUP(".message"); namespace mbus { @@ -19,9 +19,7 @@ Message::Message() : _timeRemaining(0), _retryEnabled(true), _retry(0) -{ - // empty -} +{ } Message::~Message() { diff --git a/messagebus/src/vespa/messagebus/messagebus.cpp b/messagebus/src/vespa/messagebus/messagebus.cpp index 87247a90102..c9067ef0aa4 100644 --- a/messagebus/src/vespa/messagebus/messagebus.cpp +++ b/messagebus/src/vespa/messagebus/messagebus.cpp @@ -1,7 +1,4 @@ // 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(".messagebus"); #include <vespa/messagebus/routing/routingnode.h> #include <vespa/messagebus/routing/routingspec.h> @@ -13,6 +10,9 @@ LOG_SETUP(".messagebus"); #include "errorcode.h" #include "sendproxy.h" +#include <vespa/log/log.h> +LOG_SETUP(".messagebus"); + using vespalib::LockGuard; namespace { diff --git a/messagebus/src/vespa/messagebus/messagebusparams.cpp b/messagebus/src/vespa/messagebus/messagebusparams.cpp index f1a609086d6..c8efe9f97bd 100644 --- a/messagebus/src/vespa/messagebus/messagebusparams.cpp +++ b/messagebus/src/vespa/messagebus/messagebusparams.cpp @@ -1,7 +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/messagebus/routing/retrytransienterrorspolicy.h> #include "messagebus.h" +#include <vespa/messagebus/routing/retrytransienterrorspolicy.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/messenger.cpp b/messagebus/src/vespa/messagebus/messenger.cpp index 3727b258a89..33887ea5cf4 100644 --- a/messagebus/src/vespa/messagebus/messenger.cpp +++ b/messagebus/src/vespa/messagebus/messenger.cpp @@ -1,10 +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/log/log.h> -LOG_SETUP(".messenger"); -#include <vespa/vespalib/util/sync.h> #include "messenger.h" +#include <vespa/vespalib/util/sync.h> + +#include <vespa/log/log.h> +LOG_SETUP(".messenger"); namespace { diff --git a/messagebus/src/vespa/messagebus/network/identity.cpp b/messagebus/src/vespa/messagebus/network/identity.cpp index 9a01d21c935..ea2b3feb6cb 100644 --- a/messagebus/src/vespa/messagebus/network/identity.cpp +++ b/messagebus/src/vespa/messagebus/network/identity.cpp @@ -1,5 +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 "identity.h" #include <vespa/vespalib/util/host_name.h> diff --git a/messagebus/src/vespa/messagebus/network/iserviceaddress.h b/messagebus/src/vespa/messagebus/network/iserviceaddress.h index 78f487cc942..3374b1a1e70 100644 --- a/messagebus/src/vespa/messagebus/network/iserviceaddress.h +++ b/messagebus/src/vespa/messagebus/network/iserviceaddress.h @@ -1,6 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include <memory> + namespace mbus { /** diff --git a/messagebus/src/vespa/messagebus/network/oosclient.cpp b/messagebus/src/vespa/messagebus/network/oosclient.cpp index 2be0b549429..28e46483c50 100644 --- a/messagebus/src/vespa/messagebus/network/oosclient.cpp +++ b/messagebus/src/vespa/messagebus/network/oosclient.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 "oosclient.h" -#include <vespa/log/log.h> -LOG_SETUP(".oosclient"); namespace mbus { @@ -44,7 +41,7 @@ OOSClient::handleConnect() void OOSClient::handleInvoke() { - LOG_ASSERT(_target != 0); + assert(_target != 0); _req = _orb.AllocRPCRequest(_req); _req->SetMethodName("fleet.getOOSList"); _req->GetParams()->AddInt32(_reqGen); // gencnt @@ -67,7 +64,7 @@ OOSClient::PerformTask() void OOSClient::RequestDone(FRT_RPCRequest *req) { - LOG_ASSERT(req == _req && !_reqDone); + assert(req == _req && !_reqDone); (void) req; _reqDone = true; ScheduleNow(); diff --git a/messagebus/src/vespa/messagebus/network/oosmanager.cpp b/messagebus/src/vespa/messagebus/network/oosmanager.cpp index f48d457d401..27b6475456d 100644 --- a/messagebus/src/vespa/messagebus/network/oosmanager.cpp +++ b/messagebus/src/vespa/messagebus/network/oosmanager.cpp @@ -1,9 +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 <algorithm> -#include <vespa/fnet/frt/frt.h> #include "oosmanager.h" #include "rpcnetwork.h" +#include <algorithm> +#include <vespa/fnet/frt/frt.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp index 837d61bf034..d4bfe6324b9 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp @@ -1,5 +1,4 @@ // 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 "rpcnetworkparams.h" #include <vespa/slobrok/cfg.h> @@ -14,9 +13,7 @@ RPCNetworkParams::RPCNetworkParams() : _maxInputBufferSize(256*1024), _maxOutputBufferSize(256*1024), _connectionExpireSecs(30) -{ - // empty -} +{ } } diff --git a/messagebus/src/vespa/messagebus/network/rpcsendv1.cpp b/messagebus/src/vespa/messagebus/network/rpcsendv1.cpp index f3e175ba916..34f979c00be 100644 --- a/messagebus/src/vespa/messagebus/network/rpcsendv1.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcsendv1.cpp @@ -1,11 +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/messagebus/routing/routingnode.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/error.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/tracelevel.h> -#include <vespa/vespalib/util/vstringfmt.h> +#include <vespa/vespalib/util/stringfmt.h> #include "rpcnetwork.h" #include "rpcsendv1.h" #include "rpctarget.h" diff --git a/messagebus/src/vespa/messagebus/network/rpcservice.cpp b/messagebus/src/vespa/messagebus/network/rpcservice.cpp index 60b23f523c7..ae098da45fb 100644 --- a/messagebus/src/vespa/messagebus/network/rpcservice.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcservice.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 "rpcservice.h" #include "rpcserviceaddress.h" #include "rpcnetwork.h" @@ -14,9 +13,7 @@ RPCService::RPCService(const Mirror &mirror, _addressIdx(random()), _addressGen(0), _addressList() -{ - // empty -} +{ } RPCServiceAddress::UP RPCService::resolve() diff --git a/messagebus/src/vespa/messagebus/network/rpcserviceaddress.cpp b/messagebus/src/vespa/messagebus/network/rpcserviceaddress.cpp index 461f812c1ed..42fe3132703 100644 --- a/messagebus/src/vespa/messagebus/network/rpcserviceaddress.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcserviceaddress.cpp @@ -1,5 +1,4 @@ // 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 "rpcserviceaddress.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/network/rpctarget.cpp b/messagebus/src/vespa/messagebus/network/rpctarget.cpp index 4fce35c8d16..b50212cd1b4 100644 --- a/messagebus/src/vespa/messagebus/network/rpctarget.cpp +++ b/messagebus/src/vespa/messagebus/network/rpctarget.cpp @@ -1,7 +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/exceptions.h> #include "rpctarget.h" +#include <vespa/vespalib/util/exceptions.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp b/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp index 869afdfe056..337927cb8de 100644 --- a/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp +++ b/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp @@ -1,34 +1,27 @@ // 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/messagebus/systemtimer.h> #include "rpctargetpool.h" +#include <vespa/messagebus/systemtimer.h> namespace mbus { RPCTargetPool::Entry::Entry(RPCTarget::SP target, uint64_t lastUse) : _target(target), _lastUse(lastUse) -{ - // empty -} +{ } RPCTargetPool::RPCTargetPool(double expireSecs) : _lock(), _targets(), _timer(new SystemTimer()), _expireMillis(static_cast<uint64_t>(expireSecs * 1000)) -{ - // empty -} +{ } RPCTargetPool::RPCTargetPool(ITimer::UP timer, double expireSecs) : _lock(), _targets(), _timer(std::move(timer)), _expireMillis(static_cast<uint64_t>(expireSecs * 1000)) -{ - // empty -} +{ } RPCTargetPool::~RPCTargetPool() { diff --git a/messagebus/src/vespa/messagebus/protocolrepository.cpp b/messagebus/src/vespa/messagebus/protocolrepository.cpp index a8435c6a460..934705ba942 100644 --- a/messagebus/src/vespa/messagebus/protocolrepository.cpp +++ b/messagebus/src/vespa/messagebus/protocolrepository.cpp @@ -1,10 +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 "protocolrepository.h" + #include <vespa/log/log.h> LOG_SETUP(".protocolrepository"); -#include "protocolrepository.h" - namespace mbus { void diff --git a/messagebus/src/vespa/messagebus/protocolset.cpp b/messagebus/src/vespa/messagebus/protocolset.cpp index 30089872d07..24c7719b791 100644 --- a/messagebus/src/vespa/messagebus/protocolset.cpp +++ b/messagebus/src/vespa/messagebus/protocolset.cpp @@ -1,14 +1,12 @@ // 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 "protocolset.h" namespace mbus { ProtocolSet::ProtocolSet() : _vector() -{ -} +{ } ProtocolSet & ProtocolSet::add(IProtocol::SP protocol) diff --git a/messagebus/src/vespa/messagebus/queue.h b/messagebus/src/vespa/messagebus/queue.h index e65dcd2801a..e93b82508c8 100644 --- a/messagebus/src/vespa/messagebus/queue.h +++ b/messagebus/src/vespa/messagebus/queue.h @@ -3,6 +3,7 @@ #pragma once #include <queue> +#include <cstdint> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/reply.cpp b/messagebus/src/vespa/messagebus/reply.cpp index b911ab5f8e9..6a6cc417265 100644 --- a/messagebus/src/vespa/messagebus/reply.cpp +++ b/messagebus/src/vespa/messagebus/reply.cpp @@ -1,10 +1,4 @@ // 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(".reply"); - -#include <vespa/vespalib/util/vstringfmt.h> -#include <vespa/vespalib/util/backtrace.h> #include "emptyreply.h" #include "error.h" #include "errorcode.h" @@ -12,6 +6,11 @@ LOG_SETUP(".reply"); #include "message.h" #include "reply.h" #include "tracelevel.h" +#include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/util/backtrace.h> + +#include <vespa/log/log.h> +LOG_SETUP(".reply"); namespace mbus { diff --git a/messagebus/src/vespa/messagebus/replygate.cpp b/messagebus/src/vespa/messagebus/replygate.cpp index 556df803158..a32310f08c7 100644 --- a/messagebus/src/vespa/messagebus/replygate.cpp +++ b/messagebus/src/vespa/messagebus/replygate.cpp @@ -1,5 +1,4 @@ // 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 "replygate.h" namespace mbus { @@ -8,9 +7,7 @@ ReplyGate::ReplyGate(IMessageHandler &sender) : vespalib::ReferenceCounter(), _sender(sender), _open(true) -{ - // empty -} +{ } void ReplyGate::handleMessage(Message::UP msg) diff --git a/messagebus/src/vespa/messagebus/result.cpp b/messagebus/src/vespa/messagebus/result.cpp index 3e17d87c9cf..259fe25498f 100644 --- a/messagebus/src/vespa/messagebus/result.cpp +++ b/messagebus/src/vespa/messagebus/result.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 "result.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routable.cpp b/messagebus/src/vespa/messagebus/routable.cpp index 061b0ecefde..26874d1d795 100644 --- a/messagebus/src/vespa/messagebus/routable.cpp +++ b/messagebus/src/vespa/messagebus/routable.cpp @@ -1,5 +1,4 @@ // 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 "emptyreply.h" #include "errorcode.h" #include "ireplyhandler.h" @@ -10,9 +9,7 @@ Routable::Routable() : _context(), _stack(), _trace() -{ - // empty -} +{ } Routable::~Routable() { } diff --git a/messagebus/src/vespa/messagebus/routablequeue.cpp b/messagebus/src/vespa/messagebus/routablequeue.cpp index 0b6f8ddbbee..e0b8b376981 100644 --- a/messagebus/src/vespa/messagebus/routablequeue.cpp +++ b/messagebus/src/vespa/messagebus/routablequeue.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 "routablequeue.h" namespace mbus { @@ -8,8 +7,7 @@ namespace mbus { RoutableQueue::RoutableQueue() : _monitor("mbus::RoutableQueue::_monitor", true), _queue() -{ -} +{ } RoutableQueue::~RoutableQueue() { diff --git a/messagebus/src/vespa/messagebus/routing/errordirective.cpp b/messagebus/src/vespa/messagebus/routing/errordirective.cpp index f87698da1ba..2cc5d5da392 100644 --- a/messagebus/src/vespa/messagebus/routing/errordirective.cpp +++ b/messagebus/src/vespa/messagebus/routing/errordirective.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 <vespa/fastos/fastos.h> -#include <vespa/vespalib/util/vstringfmt.h> #include "errordirective.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { ErrorDirective::ErrorDirective(const vespalib::stringref &msg) : _msg(msg) -{ - // empty -} +{ } string ErrorDirective::toString() const diff --git a/messagebus/src/vespa/messagebus/routing/hop.cpp b/messagebus/src/vespa/messagebus/routing/hop.cpp index 08d6e949b3d..f2037855523 100644 --- a/messagebus/src/vespa/messagebus/routing/hop.cpp +++ b/messagebus/src/vespa/messagebus/routing/hop.cpp @@ -1,5 +1,4 @@ // 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 "hop.h" #include "routeparser.h" diff --git a/messagebus/src/vespa/messagebus/routing/hopblueprint.cpp b/messagebus/src/vespa/messagebus/routing/hopblueprint.cpp index 9062f0dcc4c..a0832c692c6 100644 --- a/messagebus/src/vespa/messagebus/routing/hopblueprint.cpp +++ b/messagebus/src/vespa/messagebus/routing/hopblueprint.cpp @@ -1,5 +1,4 @@ // 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 "hopblueprint.h" #include "hopspec.h" diff --git a/messagebus/src/vespa/messagebus/routing/hopspec.cpp b/messagebus/src/vespa/messagebus/routing/hopspec.cpp index da8a070949d..1f8e7937242 100644 --- a/messagebus/src/vespa/messagebus/routing/hopspec.cpp +++ b/messagebus/src/vespa/messagebus/routing/hopspec.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/vespalib/util/vstringfmt.h> +#include <vespa/vespalib/util/stringfmt.h> #include "routingspec.h" namespace mbus { @@ -10,9 +9,7 @@ HopSpec::HopSpec(const string &name, const string &selector) : _selector(selector), _recipients(), _ignoreResult(false) -{ - // empty -} +{ } HopSpec & HopSpec::addRecipients(const std::vector<string> &recipients) diff --git a/messagebus/src/vespa/messagebus/routing/policydirective.cpp b/messagebus/src/vespa/messagebus/routing/policydirective.cpp index da278315631..c14421e7424 100644 --- a/messagebus/src/vespa/messagebus/routing/policydirective.cpp +++ b/messagebus/src/vespa/messagebus/routing/policydirective.cpp @@ -1,16 +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/vespalib/util/vstringfmt.h> #include "policydirective.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { PolicyDirective::PolicyDirective(const vespalib::stringref &name, const vespalib::stringref ¶m) : _name(name), _param(param) -{ - // empty -} +{ } string PolicyDirective::toString() const diff --git a/messagebus/src/vespa/messagebus/routing/resender.cpp b/messagebus/src/vespa/messagebus/routing/resender.cpp index 27843a7eca0..a0bb30b6441 100644 --- a/messagebus/src/vespa/messagebus/routing/resender.cpp +++ b/messagebus/src/vespa/messagebus/routing/resender.cpp @@ -1,11 +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 "resender.h" +#include "routingnode.h" #include <vespa/messagebus/error.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/tracelevel.h> -#include <vespa/vespalib/util/vstringfmt.h> -#include "resender.h" -#include "routingnode.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.cpp b/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.cpp index d38a22c5893..6b8b0553898 100644 --- a/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.cpp +++ b/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.cpp @@ -1,5 +1,4 @@ // 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/messagebus/errorcode.h> #include "retrytransienterrorspolicy.h" @@ -8,9 +7,7 @@ namespace mbus { RetryTransientErrorsPolicy::RetryTransientErrorsPolicy() : _enabled(true), _baseDelay(1) -{ - // empty -} +{ } RetryTransientErrorsPolicy & RetryTransientErrorsPolicy::setEnabled(bool enabled) diff --git a/messagebus/src/vespa/messagebus/routing/route.cpp b/messagebus/src/vespa/messagebus/routing/route.cpp index ad9c2ca13d0..d5fbf5d5e8c 100644 --- a/messagebus/src/vespa/messagebus/routing/route.cpp +++ b/messagebus/src/vespa/messagebus/routing/route.cpp @@ -1,5 +1,4 @@ // 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 "route.h" #include "routeparser.h" diff --git a/messagebus/src/vespa/messagebus/routing/routedirective.cpp b/messagebus/src/vespa/messagebus/routing/routedirective.cpp index b0389904a9a..7fb671ef113 100644 --- a/messagebus/src/vespa/messagebus/routing/routedirective.cpp +++ b/messagebus/src/vespa/messagebus/routing/routedirective.cpp @@ -1,7 +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 "routedirective.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routing/routeparser.cpp b/messagebus/src/vespa/messagebus/routing/routeparser.cpp index aef49eb55d2..86f5e3433f1 100644 --- a/messagebus/src/vespa/messagebus/routing/routeparser.cpp +++ b/messagebus/src/vespa/messagebus/routing/routeparser.cpp @@ -1,15 +1,14 @@ // 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/messagebus/common.h> -#include <stdio.h> -#include <vespa/vespalib/util/stringfmt.h> -#include <vespa/vespalib/util/vstringfmt.h> #include "errordirective.h" #include "policydirective.h" #include "routedirective.h" #include "routeparser.h" #include "tcpdirective.h" #include "verbatimdirective.h" +#include <vespa/messagebus/common.h> +#include <stdio.h> +#include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/util/vstringfmt.h> using vespalib::stringref; diff --git a/messagebus/src/vespa/messagebus/routing/routespec.cpp b/messagebus/src/vespa/messagebus/routing/routespec.cpp index 7cd3d140114..7d6cf65aa1f 100644 --- a/messagebus/src/vespa/messagebus/routing/routespec.cpp +++ b/messagebus/src/vespa/messagebus/routing/routespec.cpp @@ -1,16 +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/vespalib/util/vstringfmt.h> #include "routingspec.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { RouteSpec::RouteSpec(const string &name) : _name(name), _hops() -{ - // empty -} +{ } RouteSpec & RouteSpec::addHops(const std::vector<string> &hops) diff --git a/messagebus/src/vespa/messagebus/routing/routingcontext.cpp b/messagebus/src/vespa/messagebus/routing/routingcontext.cpp index 1bdcf6ce147..8732ed4fc08 100644 --- a/messagebus/src/vespa/messagebus/routing/routingcontext.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingcontext.cpp @@ -1,5 +1,4 @@ // 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 "route.h" #include "routingnode.h" @@ -11,9 +10,7 @@ RoutingContext::RoutingContext(RoutingNode &node, uint32_t directive) : _consumableErrors(), _selectOnRetry(true), _context() -{ - // empty -} +{ } bool RoutingContext::hasRecipients() const diff --git a/messagebus/src/vespa/messagebus/routing/routingnode.cpp b/messagebus/src/vespa/messagebus/routing/routingnode.cpp index 3e50ea12f3c..7bfb31c2e68 100644 --- a/messagebus/src/vespa/messagebus/routing/routingnode.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingnode.cpp @@ -1,15 +1,14 @@ // 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 "routingnode.h" +#include "errordirective.h" +#include "policydirective.h" +#include "routedirective.h" #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/tracelevel.h> #include <stack> #include <vespa/vespalib/util/atomic.h> #include <vespa/vespalib/util/vstringfmt.h> -#include "errordirective.h" -#include "policydirective.h" -#include "routedirective.h" -#include "routingnode.h" namespace mbus { @@ -34,9 +33,7 @@ RoutingNode::RoutingNode(MessageBus &mbus, INetwork &net, Resender *resender, _serviceAddress(), _isActive(true), _shouldRetry(false) -{ - // empty -} +{ } RoutingNode::RoutingNode(RoutingNode &parent, const Route &route) : _mbus(parent._mbus), @@ -57,9 +54,7 @@ RoutingNode::RoutingNode(RoutingNode &parent, const Route &route) _serviceAddress(), _isActive(true), _shouldRetry(false) -{ - // empty -} +{ } RoutingNode::~RoutingNode() { diff --git a/messagebus/src/vespa/messagebus/routing/routingnodeiterator.cpp b/messagebus/src/vespa/messagebus/routing/routingnodeiterator.cpp index 9528a896736..ddac6f7c01b 100644 --- a/messagebus/src/vespa/messagebus/routing/routingnodeiterator.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingnodeiterator.cpp @@ -1,5 +1,4 @@ // 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 "routingnode.h" namespace mbus { @@ -7,9 +6,7 @@ namespace mbus { RoutingNodeIterator::RoutingNodeIterator(std::vector<RoutingNode*> &children) : _pos(children.begin()), _end(children.end()) -{ - // empty -} +{ } bool RoutingNodeIterator::isValid() diff --git a/messagebus/src/vespa/messagebus/routing/routingspec.cpp b/messagebus/src/vespa/messagebus/routing/routingspec.cpp index 3dde29fa30d..10c134a9424 100644 --- a/messagebus/src/vespa/messagebus/routing/routingspec.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingspec.cpp @@ -1,7 +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 "routingspec.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routing/routingtable.cpp b/messagebus/src/vespa/messagebus/routing/routingtable.cpp index 1cbe4c03800..a424f7047a8 100644 --- a/messagebus/src/vespa/messagebus/routing/routingtable.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingtable.cpp @@ -1,13 +1,11 @@ // 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 "routingtable.h" +#include "hop.h" +#include "routingtablespec.h" #include <vespa/messagebus/iprotocol.h> #include <vespa/messagebus/message.h> #include <vector> -#include <vespa/vespalib/util/vstringfmt.h> -#include "hop.h" -#include "routingtable.h" -#include "routingtablespec.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routing/routingtablespec.cpp b/messagebus/src/vespa/messagebus/routing/routingtablespec.cpp index b1833516f20..06d1aa73d60 100644 --- a/messagebus/src/vespa/messagebus/routing/routingtablespec.cpp +++ b/messagebus/src/vespa/messagebus/routing/routingtablespec.cpp @@ -1,7 +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 "routingspec.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routing/tcpdirective.cpp b/messagebus/src/vespa/messagebus/routing/tcpdirective.cpp index 041f089c472..7f4a04b6033 100644 --- a/messagebus/src/vespa/messagebus/routing/tcpdirective.cpp +++ b/messagebus/src/vespa/messagebus/routing/tcpdirective.cpp @@ -1,8 +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/vespalib/stllike/asciistream.h> #include "tcpdirective.h" +#include <vespa/vespalib/stllike/asciistream.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/routing/verbatimdirective.cpp b/messagebus/src/vespa/messagebus/routing/verbatimdirective.cpp index 0fc91209f3c..d8d76718751 100644 --- a/messagebus/src/vespa/messagebus/routing/verbatimdirective.cpp +++ b/messagebus/src/vespa/messagebus/routing/verbatimdirective.cpp @@ -1,7 +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 "verbatimdirective.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/rpcmessagebus.cpp b/messagebus/src/vespa/messagebus/rpcmessagebus.cpp index 99d193694f3..9e3c1e2cd32 100644 --- a/messagebus/src/vespa/messagebus/rpcmessagebus.cpp +++ b/messagebus/src/vespa/messagebus/rpcmessagebus.cpp @@ -1,5 +1,4 @@ // 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 "rpcmessagebus.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/sendproxy.cpp b/messagebus/src/vespa/messagebus/sendproxy.cpp index be7b4822d0d..64cc364a8ce 100644 --- a/messagebus/src/vespa/messagebus/sendproxy.cpp +++ b/messagebus/src/vespa/messagebus/sendproxy.cpp @@ -1,10 +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 "sendproxy.h" + #include <vespa/log/log.h> LOG_SETUP(".sendproxy"); -#include "sendproxy.h" - namespace mbus { SendProxy::SendProxy(MessageBus &mbus, INetwork &net, Resender *resender) : diff --git a/messagebus/src/vespa/messagebus/sequencer.cpp b/messagebus/src/vespa/messagebus/sequencer.cpp index 039531c9b00..0471be50ca0 100644 --- a/messagebus/src/vespa/messagebus/sequencer.cpp +++ b/messagebus/src/vespa/messagebus/sequencer.cpp @@ -1,8 +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/vespalib/util/vstringfmt.h> #include "sequencer.h" #include "tracelevel.h" +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/sourcesession.cpp b/messagebus/src/vespa/messagebus/sourcesession.cpp index 591829be962..53a7e3b11eb 100644 --- a/messagebus/src/vespa/messagebus/sourcesession.cpp +++ b/messagebus/src/vespa/messagebus/sourcesession.cpp @@ -1,18 +1,14 @@ // 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/messagebus/routing/routingtable.h> -#include <vespa/vespalib/util/vstringfmt.h> +#include "sourcesession.h" +#include "sourcesessionparams.h" #include "error.h" #include "errorcode.h" #include "messagebus.h" #include "replygate.h" -#include "sourcesession.h" -#include "sourcesessionparams.h" #include "tracelevel.h" #include <algorithm> -#include <vespa/log/log.h> -LOG_SETUP(".sourcesession"); - +#include <vespa/messagebus/routing/routingtable.h> +#include <vespa/vespalib/util/stringfmt.h> namespace mbus { @@ -28,7 +24,7 @@ SourceSession::SourceSession(MessageBus &mbus, const SourceSessionParams ¶ms _closed(false), _done(false) { - LOG_ASSERT(params.hasReplyHandler()); + assert(params.hasReplyHandler()); } SourceSession::~SourceSession() @@ -117,7 +113,7 @@ SourceSession::handleReply(Reply::UP reply) bool done; { vespalib::MonitorGuard guard(_monitor); - LOG_ASSERT(_pendingCount > 0); + assert(_pendingCount > 0); --_pendingCount; if (_throttlePolicy.get() != NULL) { _throttlePolicy->processReply(*reply); @@ -134,8 +130,8 @@ SourceSession::handleReply(Reply::UP reply) handler.handleReply(std::move(reply)); if (done) { vespalib::MonitorGuard guard(_monitor); - LOG_ASSERT(_pendingCount == 0); - LOG_ASSERT(_closed); + assert(_pendingCount == 0); + assert(_closed); _done = true; guard.broadcast(); } diff --git a/messagebus/src/vespa/messagebus/sourcesessionparams.cpp b/messagebus/src/vespa/messagebus/sourcesessionparams.cpp index b97b3ee194c..731d4073be6 100644 --- a/messagebus/src/vespa/messagebus/sourcesessionparams.cpp +++ b/messagebus/src/vespa/messagebus/sourcesessionparams.cpp @@ -1,8 +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 "dynamicthrottlepolicy.h" #include "sourcesessionparams.h" +#include "dynamicthrottlepolicy.h" namespace mbus { @@ -10,9 +9,7 @@ SourceSessionParams::SourceSessionParams() : _replyHandler(NULL), _throttlePolicy(new DynamicThrottlePolicy()), _timeout(180.0) -{ - // empty -} +{ } IThrottlePolicy::SP SourceSessionParams::getThrottlePolicy() const diff --git a/messagebus/src/vespa/messagebus/staticthrottlepolicy.cpp b/messagebus/src/vespa/messagebus/staticthrottlepolicy.cpp index d26362e9072..a1725e608a3 100644 --- a/messagebus/src/vespa/messagebus/staticthrottlepolicy.cpp +++ b/messagebus/src/vespa/messagebus/staticthrottlepolicy.cpp @@ -1,5 +1,4 @@ // 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 "staticthrottlepolicy.h" namespace mbus { @@ -8,9 +7,7 @@ StaticThrottlePolicy::StaticThrottlePolicy() : _maxPendingCount(0), _maxPendingSize(0), _pendingSize(0) -{ - // empty -} +{ } uint32_t StaticThrottlePolicy::getMaxPendingCount() const diff --git a/messagebus/src/vespa/messagebus/systemtimer.cpp b/messagebus/src/vespa/messagebus/systemtimer.cpp index 35f8b22f1b8..1b4229b6547 100644 --- a/messagebus/src/vespa/messagebus/systemtimer.cpp +++ b/messagebus/src/vespa/messagebus/systemtimer.cpp @@ -1,6 +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 "systemtimer.h" +#include <vespa/fastos/time.h> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/testlib/create-class-cpp.sh b/messagebus/src/vespa/messagebus/testlib/create-class-cpp.sh index 17f7bf46fea..5bc3c1327b6 100755 --- a/messagebus/src/vespa/messagebus/testlib/create-class-cpp.sh +++ b/messagebus/src/vespa/messagebus/testlib/create-class-cpp.sh @@ -8,7 +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/fastos/fastos.h> #include "$name.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp b/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp index 4d26732067d..4e794a49d97 100644 --- a/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp +++ b/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp @@ -1,8 +1,4 @@ // 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(".custompolicy"); - #include <boost/tokenizer.hpp> #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> @@ -11,6 +7,9 @@ LOG_SETUP(".custompolicy"); #include "custompolicy.h" #include "simpleprotocol.h" +#include <vespa/log/log.h> +LOG_SETUP(".custompolicy"); + namespace mbus { CustomPolicy::CustomPolicy(bool selectOnRetry, diff --git a/messagebus/src/vespa/messagebus/testlib/oosstate.cpp b/messagebus/src/vespa/messagebus/testlib/oosstate.cpp index 05cd98aec86..4504976f7e5 100644 --- a/messagebus/src/vespa/messagebus/testlib/oosstate.cpp +++ b/messagebus/src/vespa/messagebus/testlib/oosstate.cpp @@ -1,14 +1,12 @@ // 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 "oosstate.h" namespace mbus { OOSState::OOSState() : _data() -{ -} +{ } OOSState & OOSState::add(const string &service, bool oos) diff --git a/messagebus/src/vespa/messagebus/testlib/receptor.cpp b/messagebus/src/vespa/messagebus/testlib/receptor.cpp index ca1d742e1b1..d2d0668901c 100644 --- a/messagebus/src/vespa/messagebus/testlib/receptor.cpp +++ b/messagebus/src/vespa/messagebus/testlib/receptor.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 "receptor.h" namespace mbus { @@ -11,8 +10,7 @@ Receptor::Receptor() _mon("mbus::Receptor::_mon", true), _msg(), _reply() -{ -} +{ } void Receptor::handleMessage(Message::UP msg) diff --git a/messagebus/src/vespa/messagebus/testlib/simplemessage.cpp b/messagebus/src/vespa/messagebus/testlib/simplemessage.cpp index 206473e0b32..db35cac1a2d 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplemessage.cpp +++ b/messagebus/src/vespa/messagebus/testlib/simplemessage.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 "simplemessage.h" #include "simpleprotocol.h" @@ -11,23 +10,16 @@ SimpleMessage::SimpleMessage(const string &str) : _value(str), _hasSeqId(false), _seqId(0) -{ - // empty -} +{ } SimpleMessage::SimpleMessage(const string &str, bool hasSeqId, uint64_t seqId) : Message(), _value(str), _hasSeqId(hasSeqId), _seqId(seqId) -{ - // empty -} +{ } -SimpleMessage::~SimpleMessage() -{ - // empty -} +SimpleMessage::~SimpleMessage() { } void SimpleMessage::setValue(const string &value) diff --git a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp index 4e7c9b0b1de..564b07135db 100644 --- a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp +++ b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.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 <vespa/fastos/fastos.h> +#include "simpleprotocol.h" +#include "simplemessage.h" +#include "simplereply.h" #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/routing/routingcontext.h> #include <vespa/messagebus/routing/routingnodeiterator.h> #include <cstdlib> -#include "simplemessage.h" -#include "simpleprotocol.h" -#include "simplereply.h" namespace mbus { diff --git a/messagebus/src/vespa/messagebus/testlib/simplereply.cpp b/messagebus/src/vespa/messagebus/testlib/simplereply.cpp index 65d6af67967..a516a6d6498 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplereply.cpp +++ b/messagebus/src/vespa/messagebus/testlib/simplereply.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 "simplereply.h" #include "simpleprotocol.h" @@ -9,14 +8,9 @@ namespace mbus { SimpleReply::SimpleReply(const string &str) : Reply(), _value(str) -{ - // empty -} +{ } -SimpleReply::~SimpleReply() -{ - // empty -} +SimpleReply::~SimpleReply() { } void SimpleReply::setValue(const string &value) diff --git a/messagebus/src/vespa/messagebus/testlib/slobrokstate.cpp b/messagebus/src/vespa/messagebus/testlib/slobrokstate.cpp index 9aefca7a70c..d99eb4d96bd 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrokstate.cpp +++ b/messagebus/src/vespa/messagebus/testlib/slobrokstate.cpp @@ -1,14 +1,12 @@ // 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 "slobrokstate.h" namespace mbus { SlobrokState::SlobrokState() : _data() -{ -} +{ } SlobrokState & SlobrokState::add(const string &pattern, uint32_t cnt) diff --git a/messagebus/src/vespa/messagebus/testlib/testserver.cpp b/messagebus/src/vespa/messagebus/testlib/testserver.cpp index 207ab2b83c2..23aa4e04094 100644 --- a/messagebus/src/vespa/messagebus/testlib/testserver.cpp +++ b/messagebus/src/vespa/messagebus/testlib/testserver.cpp @@ -1,16 +1,12 @@ // 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/component/vtag.h> -#include <vespa/vespalib/util/vstringfmt.h> -#include <vespa/messagebus/network/rpcnetworkparams.h> +#include "testserver.h" #include "oosstate.h" #include "simpleprotocol.h" #include "slobrok.h" #include "slobrokstate.h" -#include "testserver.h" -#include <vespa/log/log.h> - -LOG_SETUP(".testserver"); +#include <vespa/vespalib/component/vtag.h> +#include <vespa/vespalib/util/vstringfmt.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> namespace mbus { diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp index d5b5c15f66a..afc0d428ee7 100644 --- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp +++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp @@ -20,6 +20,7 @@ #include <vespa/searchlib/diskindex/pagedict4file.h> #include <vespa/searchlib/diskindex/pagedict4randread.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/fastos/app.h> #include <vespa/log/log.h> LOG_SETUP("fieldwriter_test"); diff --git a/storageapi/src/tests/buckets/bucketinfotest.cpp b/storageapi/src/tests/buckets/bucketinfotest.cpp index bc079ce8cad..5cfbdf97664 100644 --- a/storageapi/src/tests/buckets/bucketinfotest.cpp +++ b/storageapi/src/tests/buckets/bucketinfotest.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 <cppunit/extensions/HelperMacros.h> #include <vespa/storageapi/buckets/bucketinfo.h> diff --git a/storageapi/src/tests/testrunner.cpp b/storageapi/src/tests/testrunner.cpp index d6a42e57fb4..9a07796a3f4 100644 --- a/storageapi/src/tests/testrunner.cpp +++ b/storageapi/src/tests/testrunner.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/vdstestlib/cppunit/cppunittestrunner.h> diff --git a/storageapi/src/vespa/storageapi/app/getbucketid.cpp b/storageapi/src/vespa/storageapi/app/getbucketid.cpp index bb9130a49b8..e25a9cfb64f 100644 --- a/storageapi/src/vespa/storageapi/app/getbucketid.cpp +++ b/storageapi/src/vespa/storageapi/app/getbucketid.cpp @@ -1,5 +1,4 @@ // 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/document/bucket/bucketidfactory.h> #include <vespa/document/base/documentid.h> #include <iostream> diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp index 1b3427b5784..334816fe93c 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp @@ -1,9 +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/storageapi/mbusprot/protocolserialization5_0.h> - -#include <vespa/log/log.h> +#include "protocolserialization5_0.h" +#include "serializationhelper.h" +#include "storagecommand.h" +#include "storagereply.h" +#include "storageprotocol.h" #include <vespa/messagebus/blob.h> #include <vespa/messagebus/blobref.h> #include <vespa/storageapi/messageapi/storagemessage.h> @@ -11,16 +12,10 @@ #include <vespa/storageapi/message/bucketsplitting.h> #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/multioperation.h> -#include <vespa/storageapi/mbusprot/serializationhelper.h> -#include <vespa/storageapi/mbusprot/storagecommand.h> -#include <vespa/storageapi/mbusprot/storagereply.h> -#include <vespa/storageapi/mbusprot/storageprotocol.h> #include <vespa/vespalib/util/growablebytebuffer.h> #include <vespa/document/select/orderingspecification.h> #include <vespa/storageapi/messageapi/returncode.h> -LOG_SETUP(".storage.api.mbusprot.serialization.5_0"); - namespace storage { namespace mbusprot { diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp index 9244189da1f..c1941b475e4 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp @@ -1,9 +1,11 @@ // 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/storageapi/mbusprot/protocolserialization5_1.h> +#include "protocolserialization5_1.h" +#include "serializationhelper.h" +#include "storagecommand.h" +#include "storagereply.h" +#include "storageprotocol.h" -#include <vespa/log/log.h> #include <vespa/messagebus/blob.h> #include <vespa/messagebus/blobref.h> #include <vespa/storageapi/messageapi/storagemessage.h> @@ -11,16 +13,10 @@ #include <vespa/storageapi/message/bucketsplitting.h> #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/multioperation.h> -#include <vespa/storageapi/mbusprot/serializationhelper.h> -#include <vespa/storageapi/mbusprot/storagecommand.h> -#include <vespa/storageapi/mbusprot/storagereply.h> -#include <vespa/storageapi/mbusprot/storageprotocol.h> #include <vespa/vespalib/util/growablebytebuffer.h> #include <vespa/document/select/orderingspecification.h> #include <vespa/storageapi/messageapi/returncode.h> -LOG_SETUP(".storage.api.mbusprot.serialization.5_1"); - namespace storage { namespace mbusprot { diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp index 68b8449cf4c..0b9cd6e5311 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.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. // @author Vegard Sjonfjell -#include <vespa/fastos/fastos.h> -#include <vespa/storageapi/mbusprot/protocolserialization5_2.h> -#include <vespa/storageapi/mbusprot/storagecommand.h> -#include <vespa/storageapi/mbusprot/serializationhelper.h> - -#include <vespa/log/log.h> -LOG_SETUP(".storage.api.mbusprot.serialization.5_2"); +#include "protocolserialization5_2.h" +#include "storagecommand.h" +#include "serializationhelper.h" namespace storage { namespace mbusprot { diff --git a/storageapi/src/vespa/storageapi/mbusprot/storagecommand.cpp b/storageapi/src/vespa/storageapi/mbusprot/storagecommand.cpp index 04d92b8fa9e..b0df3bc3e04 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storagecommand.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/storagecommand.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/storageapi/mbusprot/storagecommand.h> +#include "storagecommand.h" namespace storage { namespace mbusprot { @@ -8,8 +7,7 @@ namespace mbusprot { StorageCommand::StorageCommand(const storage::api::StorageCommand::SP& cmd) : mbus::Message(), _cmd(cmd) -{ -} +{ } } // mbusprot } // storage diff --git a/storageapi/src/vespa/storageapi/message/batch.cpp b/storageapi/src/vespa/storageapi/message/batch.cpp index 6da213efaf5..a3dcea3d13f 100644 --- a/storageapi/src/vespa/storageapi/message/batch.cpp +++ b/storageapi/src/vespa/storageapi/message/batch.cpp @@ -1,8 +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 <algorithm> -#include <vespa/storageapi/message/batch.h> +// +#include "batch.h" #include <vespa/document/bucket/bucketidfactory.h> +#include <algorithm> using namespace storage::api; diff --git a/storageapi/src/vespa/storageapi/message/datagram.cpp b/storageapi/src/vespa/storageapi/message/datagram.cpp index 8d93bc68944..11ad170eb5e 100644 --- a/storageapi/src/vespa/storageapi/message/datagram.cpp +++ b/storageapi/src/vespa/storageapi/message/datagram.cpp @@ -1,7 +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 "datagram.h" #include <cassert> -#include <vespa/storageapi/message/datagram.h> namespace storage { namespace api { diff --git a/storageapi/src/vespa/storageapi/message/documentsummary.cpp b/storageapi/src/vespa/storageapi/message/documentsummary.cpp index cfb56489459..67f23fdb816 100644 --- a/storageapi/src/vespa/storageapi/message/documentsummary.cpp +++ b/storageapi/src/vespa/storageapi/message/documentsummary.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/storageapi/message/documentsummary.h> +#include "documentsummary.h" namespace storage { namespace api { @@ -11,8 +10,7 @@ IMPLEMENT_REPLY(DocumentSummaryReply) DocumentSummaryCommand::DocumentSummaryCommand() : StorageCommand(MessageType::DOCUMENTSUMMARY), DocumentSummary() -{ -} +{ } void DocumentSummaryCommand::print(std::ostream& out, bool verbose, @@ -27,8 +25,7 @@ DocumentSummaryCommand::print(std::ostream& out, bool verbose, DocumentSummaryReply::DocumentSummaryReply(const DocumentSummaryCommand& cmd) : StorageReply(cmd) -{ -} +{ } void DocumentSummaryReply::print(std::ostream& out, bool verbose, diff --git a/storageapi/src/vespa/storageapi/message/queryresult.cpp b/storageapi/src/vespa/storageapi/message/queryresult.cpp index 0bef270b6ce..8981afc4131 100644 --- a/storageapi/src/vespa/storageapi/message/queryresult.cpp +++ b/storageapi/src/vespa/storageapi/message/queryresult.cpp @@ -1,6 +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/storageapi/message/queryresult.h> + +#include "queryresult.h" namespace storage { namespace api { @@ -12,8 +12,7 @@ QueryResultCommand::QueryResultCommand() : StorageCommand(MessageType::QUERYRESULT), _searchResult(), _summary() -{ -} +{ } void QueryResultCommand::print(std::ostream& out, bool verbose, @@ -28,8 +27,7 @@ QueryResultCommand::print(std::ostream& out, bool verbose, QueryResultReply::QueryResultReply(const QueryResultCommand& cmd) : StorageReply(cmd) -{ -} +{ } void QueryResultReply::print(std::ostream& out, bool verbose, diff --git a/storageapi/src/vespa/storageapi/message/searchresult.cpp b/storageapi/src/vespa/storageapi/message/searchresult.cpp index b344ce8566a..700191d46e4 100644 --- a/storageapi/src/vespa/storageapi/message/searchresult.cpp +++ b/storageapi/src/vespa/storageapi/message/searchresult.cpp @@ -1,6 +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/storageapi/message/searchresult.h> + +#include "searchresult.h" using vdslib::SearchResult; @@ -29,8 +29,7 @@ SearchResultCommand::print(std::ostream& out, bool verbose, SearchResultReply::SearchResultReply(const SearchResultCommand& cmd) : StorageReply(cmd) -{ -} +{ } void SearchResultReply::print(std::ostream& out, bool verbose, diff --git a/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.cpp b/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.cpp index feb03e58c71..9f671b953f1 100644 --- a/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.cpp +++ b/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.cpp @@ -1,7 +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/storageapi/messageapi/bucketinfocommand.h> +#include "bucketinfocommand.h" #include <vespa/storageapi/message/persistence.h> diff --git a/storageapi/src/vespa/storageapi/messageapi/returncode.cpp b/storageapi/src/vespa/storageapi/messageapi/returncode.cpp index 6b2a80563c8..f11d91b7079 100644 --- a/storageapi/src/vespa/storageapi/messageapi/returncode.cpp +++ b/storageapi/src/vespa/storageapi/messageapi/returncode.cpp @@ -1,13 +1,11 @@ // 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/storageapi/messageapi/returncode.h> +#include "returncode.h" #include <vespa/messagebus/errorcode.h> #include <vespa/document/util/bytebuffer.h> #include <vespa/fnet/frt/error.h> -#include <iostream> -#include <vector> +#include <ostream> namespace storage { namespace api { |