diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-30 00:17:46 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-30 00:17:46 +0200 |
commit | ac40360439b406d700c417076ec169f509468269 (patch) | |
tree | 5f41d4445fc398aa360810de0df9ee3a8c8a7aa2 /slobrok | |
parent | b5434960947f06f914569324d0b5e803eb7d4eef (diff) |
Reduce exposure of fastos.h and frt.h.
Only include what you need where you need it.
Diffstat (limited to 'slobrok')
52 files changed, 155 insertions, 197 deletions
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 <vespa/fnet/frt/frt.h> #include <vespa/fastos/app.h> -#include <string> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> + #include <sstream> #include <vespa/log/log.h> 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 <vespa/fnet/frt/frt.h> #include <vespa/fastos/app.h> -#include <string> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> #include <sstream> #include <vespa/log/log.h> 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 <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("backoff_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/slobrok/backoff.h> -#include <algorithm> + +#include <vespa/log/log.h> +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 <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("configure_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <vespa/slobrok/sbmirror.h> #include <vespa/slobrok/sbregister.h> #include <vespa/slobrok/server/slobrokserver.h> #include <vespa/config/config.h> #include <vespa/config-slobroks.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/vespalib/util/host_name.h> #include <sstream> #include <algorithm> #include <iostream> -#include <vespa/vespalib/util/host_name.h> + +#include <vespa/log/log.h> +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 <vespa/fastos/fastos.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> #include <vespa/vespalib/util/host_name.h> +#include <cstdio> 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 <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("mirrorapi_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <vespa/slobrok/sbmirror.h> #include <vespa/config-slobroks.h> #include <algorithm> #include <vespa/slobrok/server/slobrokserver.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> + +#include <vespa/log/log.h> +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 <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> + #include <vespa/log/log.h> LOG_SETUP(".slobrok.mirror"); -#include <vespa/fastos/fastos.h> -#include <vespa/fnet/frt/frt.h> -#include "mirror.h" -#include <memory> -namespace slobrok { -namespace api { +namespace slobrok::api { MirrorOld::MirrorOld(FRT_Supervisor &orb, const std::vector<std::string> &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 <vespa/fnet/frt/frt.h> #include <vespa/vespalib/util/gencnt.h> #include <vespa/slobrok/backoff.h> +#include <vespa/fnet/frt/invoker.h> -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 <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("mirrorapi_test"); #include <vespa/vespalib/testkit/testapp.h> #include "mirror.h" #include <vespa/config-slobroks.h> -#include <algorithm> #include <vespa/slobrok/server/slobrokserver.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> + +#include <vespa/log/log.h> +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 <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("registerapi_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/host_name.h> #include <vespa/slobrok/sbmirror.h> #include <vespa/slobrok/sbregister.h> #include <vespa/slobrok/server/slobrokserver.h> +#include <vespa/fnet/frt/supervisor.h> #include <sstream> #include <algorithm> +#include <vespa/log/log.h> +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 <vespa/vespalib/testkit/test_kit.h> -#include <vespa/fnet/frt/frt.h> #include <vespa/slobrok/server/slobrokserver.h> -#include <string> - +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> //----------------------------------------------------------------------------- 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 <vespa/fnet/frt/frt.h> #include <vespa/fastos/app.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/rpcrequest.h> +#include <vespa/fnet/frt/target.h> + 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 <vespa/vespalib/util/host_name.h> -#include <vespa/fnet/frt/frt.h> #include <vespa/fastos/app.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/invoker.h> +#include <vespa/fnet/transport.h> +#include <vespa/fnet/frt/target.h> #include <vespa/log/log.h> 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 <vespa/fastos/fastos.h> #include "cfg.h" -#include <vespa/log/log.h> -#include <vespa/vespalib/util/sync.h> +#include <vespa/log/log.h> 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 <vespa/fastos/fastos.h> #include "sblist.h" -#include <vespa/log/log.h> -LOG_SETUP(".slobrok.list"); #include <vespa/vespalib/util/random.h> +#include <vespa/log/log.h> +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<std::string> &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 <vespa/fastos/fastos.h> + +#include "sbmirror.h" +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> + #include <vespa/log/log.h> LOG_SETUP(".slobrok.mirror"); -#include <vespa/fnet/frt/frt.h> -#include <vespa/config-slobroks.h> -#include "sbmirror.h" -#include <memory> 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 <vespa/fnet/frt/frt.h> #include <vespa/vespalib/util/gencnt.h> -#include <vespa/vespalib/util/sync.h> +#include <vespa/fnet/frt/invoker.h> -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 <vespa/fnet/frt/frt.h> -#include <vespa/config-slobroks.h> #include "sbregister.h" -#include <memory> -#include <sstream> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> #include <vespa/vespalib/util/host_name.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <sstream> + #include <vespa/log/log.h> 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 <vespa/fnet/frt/frt.h> -#include <vespa/vespalib/util/gencnt.h> #include "backoff.h" #include "sblist.h" #include "cfg.h" -#include <string> -#include <vector> +#include <vespa/fnet/frt/invoker.h> +#include <vespa/fnet/frt/invokable.h> -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 <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".cmd"); - -#include <vespa/fnet/frt/frt.h> #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 <vespa/log/log.h> +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 <vespa/fastos/fastos.h> - -#include <vespa/log/log.h> -LOG_SETUP(".rpcserver"); - -#include <vector> -#include <deque> -#include <stdlib.h> #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 <vespa/fnet/frt/supervisor.h> + +#include <vespa/log/log.h> +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 <deque> #include <string> -#include <vespa/fnet/frt/frt.h> - #include <vespa/vespalib/util/hashmap.h> #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 <vespa/fastos/fastos.h> + +#include "history.h" #include <vespa/log/log.h> 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 <vespa/vespalib/util/gencnt.h> -#include <vespa/vespalib/util/hashmap.h> #include <vector> #include <string> #include <set> 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 <vespa/fnet/frt/frt.h> - 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 <vespa/fnet/frt/frt.h> - -#include "monitor.h" - #include <string> +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 <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> + #include <vespa/log/log.h> 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 <vespa/fnet/frt/frt.h> - -#include "monitor.h" #include "named_service.h" - -#include <string> +#include "monitor.h" +#include <vespa/fnet/frt/invoker.h> 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 <vespa/vespalib/data/slime/slime.h> +#include <vespa/fnet/task.h> +#include <vespa/fnet/transport.h> 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 <vespa/vespalib/net/metrics_producer.h> #include <vespa/vespalib/net/simple_metrics_producer.h> -#include <vespa/fnet/frt/frt.h> + +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 <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/channel.h> 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 <vespa/fnet/frt/frt.h> - #include "i_monitored_server.h" +#include <vespa/fnet/task.h> +#include <vespa/fnet/ipackethandler.h> + +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 <vespa/fastos/fastos.h> + +#include "named_service.h" #include <vespa/log/log.h> 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 <vespa/fnet/frt/frt.h> #include <string> 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 <stdlib.h> +#include <cstdlib> 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 <vespa/fastos/fastos.h> - -#include <vespa/log/log.h> -LOG_SETUP(".remcheck"); - -#include <vespa/fnet/frt/frt.h> #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 <vespa/log/log.h> +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 <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> #include <vespa/log/log.h> 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 <deque> -#include <string> - -#include <vespa/fnet/frt/frt.h> - -#include <vespa/vespalib/util/hashmap.h> #include "ok_state.h" #include "cmd.h" #include "i_rpc_server_manager.h" -#include "rpc_server_manager.h" #include "managed_rpc_server.h" +#include <deque> 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 <vespa/fnet/frt/frt.h> -#include <string> - #include "named_service.h" +#include <vespa/fastos/time.h> 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 <vespa/fastos/fastos.h> - -#include <vespa/log/log.h> -LOG_SETUP(".rpcserver"); - -#include <string> -#include <sstream> -#include <vespa/vespalib/util/stringfmt.h> #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 <sstream> + +#include <vespa/log/log.h> +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 <string> -#include <vector> - -#include <vespa/vespalib/util/hashmap.h> - -#include <vespa/fnet/frt/frt.h> - #include "ok_state.h" #include "cmd.h" #include "i_rpc_server_manager.h" #include "named_service.h" +#include <vespa/fnet/task.h> +#include <vector> 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 <vespa/fastos/fastos.h> - -#include <vespa/log/log.h> -LOG_SETUP(".rpcsrvmap"); - -#include <vector> #include "rpc_server_map.h" -#include "named_service.h" #include "reserved_name.h" #include "rpc_server_manager.h" #include "sbenv.h" +#include <vespa/log/log.h> +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 <vespa/fnet/frt/frt.h> -#include <vespa/vespalib/util/hashmap.h> -#include <vector> - #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 <vespa/fnet/frt/supervisor.h> +#include <vespa/vespalib/component/vtag.h> #include <vespa/log/log.h> 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 <vespa/fnet/frt/frt.h> +#include <vespa/fnet/frt/invokable.h> + +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 <vespa/log/log.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/rpcrequest.h> +#include <vespa/log/log.h> 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 <vespa/fnet/task.h> + +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 <vespa/vespalib/net/state_server.h> #include <vespa/vespalib/util/host_name.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/transport.h> #include <vespa/log/log.h> 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 <vespa/fastos/fastos.h> - -#include <vespa/log/log.h> -LOG_SETUP(".selfcheck"); - -#include <vespa/fnet/frt/frt.h> #include "selfcheck.h" #include "ok_state.h" @@ -14,6 +8,9 @@ LOG_SETUP(".selfcheck"); #include "managed_rpc_server.h" #include "random.h" +#include <vespa/log/log.h> +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 <vespa/fastos/fastos.h> #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 <vespa/fnet/frt/frt.h> -#include <vespa/vespalib/util/hashmap.h> -#include <vespa/vespalib/util/gencnt.h> -#include <vector> -#include <string> - #include "history.h" #include "named_service.h" +#include <vespa/vespalib/util/hashmap.h> namespace slobrok { |