From ac40360439b406d700c417076ec169f509468269 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 30 May 2017 00:17:46 +0200 Subject: Reduce exposure of fastos.h and frt.h. Only include what you need where you need it. --- messagebus/src/vespa/messagebus/network/rpcnetwork.cpp | 4 +++- messagebus/src/vespa/messagebus/testlib/slobrok.cpp | 2 ++ .../src/vespa/searchcore/fdispatch/common/rpc.cpp | 1 + slobrok/src/apps/check_slobrok/check_slobrok.cpp | 6 ++++-- slobrok/src/apps/sbcmd/sbcmd.cpp | 5 +++-- slobrok/src/tests/backoff/testbackoff.cpp | 7 +++---- slobrok/src/tests/configure/configure.cpp | 10 ++++++---- slobrok/src/tests/configure/gencfg.cpp | 5 +---- slobrok/src/tests/mirrorapi/mirrorapi.cpp | 9 ++++++--- slobrok/src/tests/oldapi/mirror.cpp | 14 ++++++-------- slobrok/src/tests/oldapi/mirror.h | 10 +++++----- slobrok/src/tests/oldapi/old.cpp | 9 +++++---- slobrok/src/tests/registerapi/registerapi.cpp | 8 +++++--- slobrok/src/tests/standalone/standalone.cpp | 5 ++--- slobrok/src/tests/startsome/rpc_info.cpp | 5 ++++- slobrok/src/tests/startsome/tstdst.cpp | 5 ++++- slobrok/src/vespa/slobrok/cfg.cpp | 4 +--- slobrok/src/vespa/slobrok/sblist.cpp | 12 ++++-------- slobrok/src/vespa/slobrok/sbmirror.cpp | 10 +++++----- slobrok/src/vespa/slobrok/sbmirror.h | 13 +++++-------- slobrok/src/vespa/slobrok/sbregister.cpp | 8 ++++---- slobrok/src/vespa/slobrok/sbregister.h | 15 ++++++--------- slobrok/src/vespa/slobrok/server/cmd.cpp | 13 ++++--------- slobrok/src/vespa/slobrok/server/exchange_manager.cpp | 18 ++++-------------- slobrok/src/vespa/slobrok/server/exchange_manager.h | 2 -- slobrok/src/vespa/slobrok/server/history.cpp | 5 ++--- slobrok/src/vespa/slobrok/server/history.h | 1 - slobrok/src/vespa/slobrok/server/i_monitored_server.h | 2 -- .../src/vespa/slobrok/server/i_rpc_server_manager.h | 6 ++---- .../src/vespa/slobrok/server/managed_rpc_server.cpp | 3 +++ slobrok/src/vespa/slobrok/server/managed_rpc_server.h | 7 ++----- slobrok/src/vespa/slobrok/server/metrics_producer.cpp | 3 +++ slobrok/src/vespa/slobrok/server/metrics_producer.h | 3 ++- slobrok/src/vespa/slobrok/server/monitor.cpp | 3 +++ slobrok/src/vespa/slobrok/server/monitor.h | 7 +++++-- slobrok/src/vespa/slobrok/server/named_service.cpp | 6 ++---- slobrok/src/vespa/slobrok/server/named_service.h | 1 - slobrok/src/vespa/slobrok/server/random.h | 2 +- slobrok/src/vespa/slobrok/server/remote_check.cpp | 13 ++++--------- slobrok/src/vespa/slobrok/server/remote_slobrok.cpp | 4 ++++ slobrok/src/vespa/slobrok/server/remote_slobrok.h | 12 +----------- slobrok/src/vespa/slobrok/server/reserved_name.h | 4 +--- .../src/vespa/slobrok/server/rpc_server_manager.cpp | 14 ++++---------- slobrok/src/vespa/slobrok/server/rpc_server_manager.h | 9 ++------- slobrok/src/vespa/slobrok/server/rpc_server_map.cpp | 10 +++------- slobrok/src/vespa/slobrok/server/rpc_server_map.h | 4 ---- slobrok/src/vespa/slobrok/server/rpchooks.cpp | 2 ++ slobrok/src/vespa/slobrok/server/rpchooks.h | 5 ++++- slobrok/src/vespa/slobrok/server/rpcmirror.cpp | 4 +++- slobrok/src/vespa/slobrok/server/rpcmirror.h | 4 ++++ slobrok/src/vespa/slobrok/server/sbenv.cpp | 6 ++++++ slobrok/src/vespa/slobrok/server/sbenv.h | 2 +- slobrok/src/vespa/slobrok/server/selfcheck.cpp | 9 +++------ slobrok/src/vespa/slobrok/server/slobrokserver.cpp | 1 - slobrok/src/vespa/slobrok/server/visible_map.h | 7 +------ vespalib/src/vespa/vespalib/util/hashmap.h | 6 ++---- vespalib/src/vespa/vespalib/util/hashmapdata.h | 2 +- 57 files changed, 164 insertions(+), 203 deletions(-) diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp index 06cbef7b57b..2991c44c9d6 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp @@ -8,8 +8,10 @@ #include #include #include -#include +#include +#include +#include LOG_SETUP(".rpcnetwork"); namespace { diff --git a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp index fa71cb9f9ad..10c501db854 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp @@ -2,6 +2,8 @@ #include "slobrok.h" #include +#include +#include #include LOG_SETUP(".slobrok"); diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/rpc.cpp b/searchcore/src/vespa/searchcore/fdispatch/common/rpc.cpp index b2b7086c20a..39b2c74a4a9 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/common/rpc.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/common/rpc.cpp @@ -3,6 +3,7 @@ #include "rpc.h" #include "appcontext.h" +#include extern char FastS_VersionTag[]; diff --git a/slobrok/src/apps/check_slobrok/check_slobrok.cpp b/slobrok/src/apps/check_slobrok/check_slobrok.cpp index 9d588eab39f..f2b6fa0e71b 100644 --- a/slobrok/src/apps/check_slobrok/check_slobrok.cpp +++ b/slobrok/src/apps/check_slobrok/check_slobrok.cpp @@ -1,8 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include #include -#include +#include +#include +#include + #include #include diff --git a/slobrok/src/apps/sbcmd/sbcmd.cpp b/slobrok/src/apps/sbcmd/sbcmd.cpp index a96c4609137..927fab6ebff 100644 --- a/slobrok/src/apps/sbcmd/sbcmd.cpp +++ b/slobrok/src/apps/sbcmd/sbcmd.cpp @@ -1,8 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include #include -#include +#include +#include +#include #include #include diff --git a/slobrok/src/tests/backoff/testbackoff.cpp b/slobrok/src/tests/backoff/testbackoff.cpp index af0dbd5bc81..f64ca79917c 100644 --- a/slobrok/src/tests/backoff/testbackoff.cpp +++ b/slobrok/src/tests/backoff/testbackoff.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 -#include -LOG_SETUP("backoff_test"); #include #include -#include + +#include +LOG_SETUP("backoff_test"); using slobrok::api::BackOff; diff --git a/slobrok/src/tests/configure/configure.cpp b/slobrok/src/tests/configure/configure.cpp index e8977f678e4..086917dd5d7 100644 --- a/slobrok/src/tests/configure/configure.cpp +++ b/slobrok/src/tests/configure/configure.cpp @@ -1,17 +1,19 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -#include -LOG_SETUP("configure_test"); + #include #include #include #include #include #include +#include +#include #include #include #include -#include + +#include +LOG_SETUP("configure_test"); using slobrok::api::MirrorAPI; using slobrok::api::RegisterAPI; diff --git a/slobrok/src/tests/configure/gencfg.cpp b/slobrok/src/tests/configure/gencfg.cpp index 85cc8629830..8e0de4abb8c 100644 --- a/slobrok/src/tests/configure/gencfg.cpp +++ b/slobrok/src/tests/configure/gencfg.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 -#include -#include -#include #include +#include int main(int, char **) diff --git a/slobrok/src/tests/mirrorapi/mirrorapi.cpp b/slobrok/src/tests/mirrorapi/mirrorapi.cpp index 4370931b785..4a1f4f023ca 100644 --- a/slobrok/src/tests/mirrorapi/mirrorapi.cpp +++ b/slobrok/src/tests/mirrorapi/mirrorapi.cpp @@ -1,12 +1,15 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -#include -LOG_SETUP("mirrorapi_test"); + #include #include #include #include #include +#include +#include + +#include +LOG_SETUP("mirrorapi_test"); using slobrok::api::MirrorAPI; using slobrok::SlobrokServer; diff --git a/slobrok/src/tests/oldapi/mirror.cpp b/slobrok/src/tests/oldapi/mirror.cpp index 22304091395..fb9fa167c32 100644 --- a/slobrok/src/tests/oldapi/mirror.cpp +++ b/slobrok/src/tests/oldapi/mirror.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 "mirror.h" +#include +#include + #include LOG_SETUP(".slobrok.mirror"); -#include -#include -#include "mirror.h" -#include -namespace slobrok { -namespace api { +namespace slobrok::api { MirrorOld::MirrorOld(FRT_Supervisor &orb, const std::vector &slobroks) @@ -171,5 +170,4 @@ MirrorOld::RequestDone(FRT_RPCRequest *req) ScheduleNow(); } -} // namespace api -} // namespace slobrok +} // namespace slobrok::api diff --git a/slobrok/src/tests/oldapi/mirror.h b/slobrok/src/tests/oldapi/mirror.h index b83392dec5e..b6259c76b7e 100644 --- a/slobrok/src/tests/oldapi/mirror.h +++ b/slobrok/src/tests/oldapi/mirror.h @@ -1,12 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include #include #include +#include -namespace slobrok { -namespace api { +class FRT_Target; + +namespace slobrok::api { /** * @brief Defines an interface for the name server lookup. @@ -122,5 +123,4 @@ private: FRT_RPCRequest *_req; }; -} // namespace api -} // namespace slobrok +} // namespace slobrok::api diff --git a/slobrok/src/tests/oldapi/old.cpp b/slobrok/src/tests/oldapi/old.cpp index 8b620cda3b2..23cde98674f 100644 --- a/slobrok/src/tests/oldapi/old.cpp +++ b/slobrok/src/tests/oldapi/old.cpp @@ -1,12 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -#include -LOG_SETUP("mirrorapi_test"); #include #include "mirror.h" #include -#include #include +#include +#include + +#include +LOG_SETUP("mirrorapi_test"); using slobrok::api::MirrorOld; using slobrok::SlobrokServer; diff --git a/slobrok/src/tests/registerapi/registerapi.cpp b/slobrok/src/tests/registerapi/registerapi.cpp index 8e4cb2404f9..e61a28e3c28 100644 --- a/slobrok/src/tests/registerapi/registerapi.cpp +++ b/slobrok/src/tests/registerapi/registerapi.cpp @@ -1,15 +1,17 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -#include -LOG_SETUP("registerapi_test"); + #include #include #include #include #include +#include #include #include +#include +LOG_SETUP("registerapi_test"); + using slobrok::api::MirrorAPI; using slobrok::api::RegisterAPI; using slobrok::SlobrokServer; diff --git a/slobrok/src/tests/standalone/standalone.cpp b/slobrok/src/tests/standalone/standalone.cpp index 7cae6eabbad..9d9ccbdeadd 100644 --- a/slobrok/src/tests/standalone/standalone.cpp +++ b/slobrok/src/tests/standalone/standalone.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 -#include #include -#include - +#include +#include //----------------------------------------------------------------------------- diff --git a/slobrok/src/tests/startsome/rpc_info.cpp b/slobrok/src/tests/startsome/rpc_info.cpp index be5418ff1a8..40e4db46bf5 100644 --- a/slobrok/src/tests/startsome/rpc_info.cpp +++ b/slobrok/src/tests/startsome/rpc_info.cpp @@ -1,7 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include #include +#include +#include +#include + class RPCInfo : public FastOS_Application { diff --git a/slobrok/src/tests/startsome/tstdst.cpp b/slobrok/src/tests/startsome/tstdst.cpp index 7d3fcef8695..577bf6f59a1 100644 --- a/slobrok/src/tests/startsome/tstdst.cpp +++ b/slobrok/src/tests/startsome/tstdst.cpp @@ -1,8 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include -#include #include +#include +#include +#include +#include #include LOG_SETUP("testrpcserver"); diff --git a/slobrok/src/vespa/slobrok/cfg.cpp b/slobrok/src/vespa/slobrok/cfg.cpp index 50320f7dd23..733377d5e0c 100644 --- a/slobrok/src/vespa/slobrok/cfg.cpp +++ b/slobrok/src/vespa/slobrok/cfg.cpp @@ -1,9 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include #include "cfg.h" -#include -#include +#include LOG_SETUP(".slobrok.configurator"); namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/sblist.cpp b/slobrok/src/vespa/slobrok/sblist.cpp index be702c6c5c2..de7795164d6 100644 --- a/slobrok/src/vespa/slobrok/sblist.cpp +++ b/slobrok/src/vespa/slobrok/sblist.cpp @@ -1,15 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include #include "sblist.h" -#include -LOG_SETUP(".slobrok.list"); #include +#include +LOG_SETUP(".slobrok.list"); using vespalib::LockGuard; -namespace slobrok { -namespace api { +namespace slobrok::api { SlobrokList::SlobrokList() : _lock(), @@ -96,6 +94,4 @@ SlobrokList::setup(const std::vector &specList) } } - -} // namespace api -} // namespace slobrok +} // namespace slobrok::api diff --git a/slobrok/src/vespa/slobrok/sbmirror.cpp b/slobrok/src/vespa/slobrok/sbmirror.cpp index 7b0974d5b0d..d828f64f1c1 100644 --- a/slobrok/src/vespa/slobrok/sbmirror.cpp +++ b/slobrok/src/vespa/slobrok/sbmirror.cpp @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include + +#include "sbmirror.h" +#include +#include + #include LOG_SETUP(".slobrok.mirror"); -#include -#include -#include "sbmirror.h" -#include using vespalib::LockGuard; diff --git a/slobrok/src/vespa/slobrok/sbmirror.h b/slobrok/src/vespa/slobrok/sbmirror.h index c9bca70885f..002cd43929f 100644 --- a/slobrok/src/vespa/slobrok/sbmirror.h +++ b/slobrok/src/vespa/slobrok/sbmirror.h @@ -4,13 +4,12 @@ #include "imirrorapi.h" #include "backoff.h" #include "sblist.h" -#include "cfg.h" -#include #include -#include +#include -namespace slobrok { -namespace api { +class FRT_Target; + +namespace slobrok::api { /** * @brief A MirrorAPI object is used to keep track of the services registered @@ -108,6 +107,4 @@ private: FRT_RPCRequest *_req; }; -} // namespace api -} // namespace slobrok - +} // namespace slobrok::api diff --git a/slobrok/src/vespa/slobrok/sbregister.cpp b/slobrok/src/vespa/slobrok/sbregister.cpp index a904a49884a..c930c35f8bb 100644 --- a/slobrok/src/vespa/slobrok/sbregister.cpp +++ b/slobrok/src/vespa/slobrok/sbregister.cpp @@ -1,12 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -#include #include "sbregister.h" -#include -#include +#include +#include #include #include +#include + #include LOG_SETUP(".slobrok.register"); diff --git a/slobrok/src/vespa/slobrok/sbregister.h b/slobrok/src/vespa/slobrok/sbregister.h index 7a71db8d480..be6516ecdbc 100644 --- a/slobrok/src/vespa/slobrok/sbregister.h +++ b/slobrok/src/vespa/slobrok/sbregister.h @@ -1,16 +1,15 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include -#include #include "backoff.h" #include "sblist.h" #include "cfg.h" -#include -#include +#include +#include -namespace slobrok { -namespace api { +class FRT_Target; + +namespace slobrok::api { /** * @brief A RegisterAPI object is used to register and unregister @@ -100,6 +99,4 @@ private: FRT_RPCRequest *_req; }; -} // namespace api -} // namespace slobrok - +} // namespace slobrok::api diff --git a/slobrok/src/vespa/slobrok/server/cmd.cpp b/slobrok/src/vespa/slobrok/server/cmd.cpp index b83bcbe2fba..c22c9cdaebd 100644 --- a/slobrok/src/vespa/slobrok/server/cmd.cpp +++ b/slobrok/src/vespa/slobrok/server/cmd.cpp @@ -1,20 +1,15 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -#include -LOG_SETUP(".cmd"); - -#include #include "cmd.h" -#include "ok_state.h" -#include "named_service.h" -#include "reserved_name.h" #include "rpc_server_map.h" -#include "rpc_server_manager.h" +#include "reserved_name.h" #include "remote_slobrok.h" #include "sbenv.h" +#include +LOG_SETUP(".cmd"); + namespace slobrok { //----------------------------------------------------------------------------- diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp index 197a1dd8a18..b4086f03527 100644 --- a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp +++ b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp @@ -1,22 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include - -#include -LOG_SETUP(".rpcserver"); - -#include -#include -#include #include "exchange_manager.h" - -#include "ok_state.h" -#include "named_service.h" #include "rpc_server_map.h" -#include "rpc_server_manager.h" -#include "remote_slobrok.h" #include "sbenv.h" -#include "cmd.h" +#include + +#include +LOG_SETUP(".rpcserver"); namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.h b/slobrok/src/vespa/slobrok/server/exchange_manager.h index 20cf03e921a..b3883ffd92d 100644 --- a/slobrok/src/vespa/slobrok/server/exchange_manager.h +++ b/slobrok/src/vespa/slobrok/server/exchange_manager.h @@ -4,8 +4,6 @@ #include #include -#include - #include #include "ok_state.h" #include "cmd.h" diff --git a/slobrok/src/vespa/slobrok/server/history.cpp b/slobrok/src/vespa/slobrok/server/history.cpp index fa2bf9c9023..f542d718b1f 100644 --- a/slobrok/src/vespa/slobrok/server/history.cpp +++ b/slobrok/src/vespa/slobrok/server/history.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 + +#include "history.h" #include LOG_SETUP(".history"); -#include "history.h" - namespace slobrok { void diff --git a/slobrok/src/vespa/slobrok/server/history.h b/slobrok/src/vespa/slobrok/server/history.h index 9898d5b21cc..9b0e629f7ab 100644 --- a/slobrok/src/vespa/slobrok/server/history.h +++ b/slobrok/src/vespa/slobrok/server/history.h @@ -2,7 +2,6 @@ #pragma once #include -#include #include #include #include diff --git a/slobrok/src/vespa/slobrok/server/i_monitored_server.h b/slobrok/src/vespa/slobrok/server/i_monitored_server.h index 1bfe52387e0..bc66844e4cf 100644 --- a/slobrok/src/vespa/slobrok/server/i_monitored_server.h +++ b/slobrok/src/vespa/slobrok/server/i_monitored_server.h @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include - namespace slobrok { //----------------------------------------------------------------------------- diff --git a/slobrok/src/vespa/slobrok/server/i_rpc_server_manager.h b/slobrok/src/vespa/slobrok/server/i_rpc_server_manager.h index b093acd7c2a..bca885661b9 100644 --- a/slobrok/src/vespa/slobrok/server/i_rpc_server_manager.h +++ b/slobrok/src/vespa/slobrok/server/i_rpc_server_manager.h @@ -1,12 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include - -#include "monitor.h" - #include +class FRT_Supervisor; + namespace slobrok { class ManagedRpcServer; diff --git a/slobrok/src/vespa/slobrok/server/managed_rpc_server.cpp b/slobrok/src/vespa/slobrok/server/managed_rpc_server.cpp index 0513f30c1dc..1003c239150 100644 --- a/slobrok/src/vespa/slobrok/server/managed_rpc_server.cpp +++ b/slobrok/src/vespa/slobrok/server/managed_rpc_server.cpp @@ -2,6 +2,9 @@ #include "managed_rpc_server.h" #include "i_rpc_server_manager.h" +#include +#include + #include LOG_SETUP(".rpcserver"); diff --git a/slobrok/src/vespa/slobrok/server/managed_rpc_server.h b/slobrok/src/vespa/slobrok/server/managed_rpc_server.h index 4ade368e623..9b75671f1e2 100644 --- a/slobrok/src/vespa/slobrok/server/managed_rpc_server.h +++ b/slobrok/src/vespa/slobrok/server/managed_rpc_server.h @@ -1,12 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include - -#include "monitor.h" #include "named_service.h" - -#include +#include "monitor.h" +#include namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/metrics_producer.cpp b/slobrok/src/vespa/slobrok/server/metrics_producer.cpp index d566e757248..8752161505b 100644 --- a/slobrok/src/vespa/slobrok/server/metrics_producer.cpp +++ b/slobrok/src/vespa/slobrok/server/metrics_producer.cpp @@ -1,6 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "metrics_producer.h" #include +#include +#include namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/metrics_producer.h b/slobrok/src/vespa/slobrok/server/metrics_producer.h index d66a1d53071..65505a38c43 100644 --- a/slobrok/src/vespa/slobrok/server/metrics_producer.h +++ b/slobrok/src/vespa/slobrok/server/metrics_producer.h @@ -4,7 +4,8 @@ #include "rpchooks.h" #include #include -#include + +class FNET_Transport; namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/monitor.cpp b/slobrok/src/vespa/slobrok/server/monitor.cpp index 70df443af86..20afeb5ae23 100644 --- a/slobrok/src/vespa/slobrok/server/monitor.cpp +++ b/slobrok/src/vespa/slobrok/server/monitor.cpp @@ -1,6 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "monitor.h" +#include +#include +#include namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/monitor.h b/slobrok/src/vespa/slobrok/server/monitor.h index a71c6b69821..7d55a4ad4ee 100644 --- a/slobrok/src/vespa/slobrok/server/monitor.h +++ b/slobrok/src/vespa/slobrok/server/monitor.h @@ -1,9 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include - #include "i_monitored_server.h" +#include +#include + +class FRT_Supervisor; +class FRT_Target; namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/named_service.cpp b/slobrok/src/vespa/slobrok/server/named_service.cpp index f46acd700d2..33f0815772d 100644 --- a/slobrok/src/vespa/slobrok/server/named_service.cpp +++ b/slobrok/src/vespa/slobrok/server/named_service.cpp @@ -1,12 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include + +#include "named_service.h" #include LOG_SETUP(".rpcserver"); -#include "named_service.h" -#include "i_rpc_server_manager.h" - namespace slobrok { //----------------------------------------------------------------------------- diff --git a/slobrok/src/vespa/slobrok/server/named_service.h b/slobrok/src/vespa/slobrok/server/named_service.h index 9d04475573a..db48bb6b80e 100644 --- a/slobrok/src/vespa/slobrok/server/named_service.h +++ b/slobrok/src/vespa/slobrok/server/named_service.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include #include namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/random.h b/slobrok/src/vespa/slobrok/server/random.h index 0ab2597dd03..e8315db85a1 100644 --- a/slobrok/src/vespa/slobrok/server/random.h +++ b/slobrok/src/vespa/slobrok/server/random.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include +#include namespace { diff --git a/slobrok/src/vespa/slobrok/server/remote_check.cpp b/slobrok/src/vespa/slobrok/server/remote_check.cpp index 96360daf873..eac452db88c 100644 --- a/slobrok/src/vespa/slobrok/server/remote_check.cpp +++ b/slobrok/src/vespa/slobrok/server/remote_check.cpp @@ -1,22 +1,17 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include - -#include -LOG_SETUP(".remcheck"); - -#include #include "remote_check.h" -#include "ok_state.h" #include "named_service.h" #include "rpc_server_map.h" #include "rpc_server_manager.h" #include "remote_slobrok.h" -#include "sbenv.h" #include "random.h" +#include "exchange_manager.h" -namespace slobrok { +#include +LOG_SETUP(".remcheck"); +namespace slobrok { RemoteCheck::RemoteCheck(FNET_Scheduler *sched, RpcServerMap& rpcsrvmap, diff --git a/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp b/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp index 23b8fc75e50..35f2405f82a 100644 --- a/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp +++ b/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp @@ -2,7 +2,11 @@ #include "remote_slobrok.h" #include "rpc_server_map.h" +#include "rpc_server_manager.h" +#include "exchange_manager.h" #include "sbenv.h" +#include +#include #include LOG_SETUP(".rpcserver"); diff --git a/slobrok/src/vespa/slobrok/server/remote_slobrok.h b/slobrok/src/vespa/slobrok/server/remote_slobrok.h index fdc4c6e492b..3989ab70237 100644 --- a/slobrok/src/vespa/slobrok/server/remote_slobrok.h +++ b/slobrok/src/vespa/slobrok/server/remote_slobrok.h @@ -1,29 +1,19 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include -#include - -#include - -#include #include "ok_state.h" #include "cmd.h" #include "i_rpc_server_manager.h" -#include "rpc_server_manager.h" #include "managed_rpc_server.h" +#include namespace slobrok { //----------------------------------------------------------------------------- -class SBEnv; -class RpcServerMap; class RpcServerManager; class ExchangeManager; -using vespalib::HashMap; - //----------------------------------------------------------------------------- /** diff --git a/slobrok/src/vespa/slobrok/server/reserved_name.h b/slobrok/src/vespa/slobrok/server/reserved_name.h index b36e8e8ac50..8399c93380e 100644 --- a/slobrok/src/vespa/slobrok/server/reserved_name.h +++ b/slobrok/src/vespa/slobrok/server/reserved_name.h @@ -1,10 +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 -#include - #include "named_service.h" +#include namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp b/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp index a4cb5c067ac..84ef6432f74 100644 --- a/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp +++ b/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp @@ -1,20 +1,14 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include - -#include -LOG_SETUP(".rpcserver"); - -#include -#include -#include #include "rpc_server_manager.h" -#include "ok_state.h" -#include "named_service.h" #include "reserved_name.h" #include "rpc_server_map.h" #include "remote_slobrok.h" #include "sbenv.h" +#include + +#include +LOG_SETUP(".rpcserver"); namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_manager.h b/slobrok/src/vespa/slobrok/server/rpc_server_manager.h index b355c39c77b..7866681feb1 100644 --- a/slobrok/src/vespa/slobrok/server/rpc_server_manager.h +++ b/slobrok/src/vespa/slobrok/server/rpc_server_manager.h @@ -1,17 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include -#include - -#include - -#include - #include "ok_state.h" #include "cmd.h" #include "i_rpc_server_manager.h" #include "named_service.h" +#include +#include namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_map.cpp b/slobrok/src/vespa/slobrok/server/rpc_server_map.cpp index 7c354874dc7..cf4ad69b819 100644 --- a/slobrok/src/vespa/slobrok/server/rpc_server_map.cpp +++ b/slobrok/src/vespa/slobrok/server/rpc_server_map.cpp @@ -1,17 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include - -#include -LOG_SETUP(".rpcsrvmap"); - -#include #include "rpc_server_map.h" -#include "named_service.h" #include "reserved_name.h" #include "rpc_server_manager.h" #include "sbenv.h" +#include +LOG_SETUP(".rpcsrvmap"); + namespace slobrok { //----------------------------------------------------------------------------- diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_map.h b/slobrok/src/vespa/slobrok/server/rpc_server_map.h index 5f08039057a..3cadab0632d 100644 --- a/slobrok/src/vespa/slobrok/server/rpc_server_map.h +++ b/slobrok/src/vespa/slobrok/server/rpc_server_map.h @@ -1,10 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include -#include -#include - #include "visible_map.h" namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.cpp b/slobrok/src/vespa/slobrok/server/rpchooks.cpp index a79c0883cef..b3d8df33f6b 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.cpp +++ b/slobrok/src/vespa/slobrok/server/rpchooks.cpp @@ -8,6 +8,8 @@ #include "remote_slobrok.h" #include "sbenv.h" #include "rpcmirror.h" +#include +#include #include LOG_SETUP(".rpchooks"); diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.h b/slobrok/src/vespa/slobrok/server/rpchooks.h index 212f997a368..6a8fb1e0e9a 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.h +++ b/slobrok/src/vespa/slobrok/server/rpchooks.h @@ -1,7 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include +#include + +class FNET_Task; +class FRT_Supervisor; namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/rpcmirror.cpp b/slobrok/src/vespa/slobrok/server/rpcmirror.cpp index 1ea6e3b4742..7c9d04fa9e5 100644 --- a/slobrok/src/vespa/slobrok/server/rpcmirror.cpp +++ b/slobrok/src/vespa/slobrok/server/rpcmirror.cpp @@ -1,8 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "rpcmirror.h" -#include +#include +#include +#include LOG_SETUP(".rpcmirror"); namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/rpcmirror.h b/slobrok/src/vespa/slobrok/server/rpcmirror.h index 1bb31720db5..45458d646e5 100644 --- a/slobrok/src/vespa/slobrok/server/rpcmirror.h +++ b/slobrok/src/vespa/slobrok/server/rpcmirror.h @@ -2,6 +2,10 @@ #pragma once #include "visible_map.h" +#include + +class FRT_RPCRequest; +class FRT_Supervisor; namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index 0cc0b2467e2..88d34f228c4 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include LOG_SETUP(".sbenv"); @@ -105,6 +107,10 @@ SBEnv::~SBEnv() getTransport()->WaitFinished(); } +FNET_Scheduler * +SBEnv::getScheduler() { + return _transport->GetScheduler(); +} void SBEnv::shutdown() diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h index def29359379..0d9a89c45d0 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.h +++ b/slobrok/src/vespa/slobrok/server/sbenv.h @@ -64,7 +64,7 @@ public: ~SBEnv(); FNET_Transport *getTransport() { return _transport.get(); } - FNET_Scheduler *getScheduler() { return _transport->GetScheduler(); } + FNET_Scheduler *getScheduler(); FRT_Supervisor *getSupervisor() { return _supervisor.get(); } void shutdown(); diff --git a/slobrok/src/vespa/slobrok/server/selfcheck.cpp b/slobrok/src/vespa/slobrok/server/selfcheck.cpp index bb8cb930bae..bb38f4c93a8 100644 --- a/slobrok/src/vespa/slobrok/server/selfcheck.cpp +++ b/slobrok/src/vespa/slobrok/server/selfcheck.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 - -#include -LOG_SETUP(".selfcheck"); - -#include #include "selfcheck.h" #include "ok_state.h" @@ -14,6 +8,9 @@ LOG_SETUP(".selfcheck"); #include "managed_rpc_server.h" #include "random.h" +#include +LOG_SETUP(".selfcheck"); + namespace slobrok { diff --git a/slobrok/src/vespa/slobrok/server/slobrokserver.cpp b/slobrok/src/vespa/slobrok/server/slobrokserver.cpp index 731a2a1da60..3574caa2553 100644 --- a/slobrok/src/vespa/slobrok/server/slobrokserver.cpp +++ b/slobrok/src/vespa/slobrok/server/slobrokserver.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 #include "slobrokserver.h" diff --git a/slobrok/src/vespa/slobrok/server/visible_map.h b/slobrok/src/vespa/slobrok/server/visible_map.h index 11702ddb92a..a6cebd787ce 100644 --- a/slobrok/src/vespa/slobrok/server/visible_map.h +++ b/slobrok/src/vespa/slobrok/server/visible_map.h @@ -1,14 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include -#include -#include -#include -#include - #include "history.h" #include "named_service.h" +#include namespace slobrok { diff --git a/vespalib/src/vespa/vespalib/util/hashmap.h b/vespalib/src/vespa/vespalib/util/hashmap.h index f357ab6cf04..cbaa9540878 100644 --- a/vespalib/src/vespa/vespalib/util/hashmap.h +++ b/vespalib/src/vespa/vespalib/util/hashmap.h @@ -1,11 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include -#include -#include - #include "hashmapdata.h" +#include +#include /** * @brief namespace for generic Vespa library diff --git a/vespalib/src/vespa/vespalib/util/hashmapdata.h b/vespalib/src/vespa/vespalib/util/hashmapdata.h index 42110246be2..e887e12d245 100644 --- a/vespalib/src/vespa/vespalib/util/hashmapdata.h +++ b/vespalib/src/vespa/vespalib/util/hashmapdata.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include +#include namespace vespalib { -- cgit v1.2.3