diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-10 11:25:48 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-10 12:25:38 +0000 |
commit | 4412aace869986be3a1060f78f367841353d3384 (patch) | |
tree | f4b5e1f6da5eaf1563f3b2fd64779800acfd5796 /messagebus | |
parent | 840d4e0578dc627b75bcd0050f1b253e84cc30ed (diff) |
Simplify the supervisor responsibility
Diffstat (limited to 'messagebus')
-rw-r--r-- | messagebus/src/tests/shutdown/shutdown.cpp | 11 | ||||
-rw-r--r-- | messagebus/src/tests/targetpool/targetpool.cpp | 6 | ||||
-rw-r--r-- | messagebus/src/vespa/messagebus/network/rpcnetwork.cpp | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/messagebus/src/tests/shutdown/shutdown.cpp b/messagebus/src/tests/shutdown/shutdown.cpp index 46a8a6518f0..1706da3b55f 100644 --- a/messagebus/src/tests/shutdown/shutdown.cpp +++ b/messagebus/src/tests/shutdown/shutdown.cpp @@ -37,21 +37,18 @@ TEST_APPHOOK(Test); void Test::requireThatListenFailedIsExceptionSafe() { - FRT_Supervisor orb; - ASSERT_TRUE(orb.Listen(0)); - ASSERT_TRUE(orb.Start()); + fnet::frt::StandaloneFRT orb; + ASSERT_TRUE(orb.supervisor().Listen(0)); Slobrok slobrok; try { TestServer bar(MessageBusParams(), RPCNetworkParams(slobrok.config()) - .setListenPort(orb.GetListenPort())); + .setListenPort(orb.supervisor().GetListenPort())); EXPECT_TRUE(false); } catch (vespalib::Exception &e) { - EXPECT_EQUAL("Failed to start network.", - e.getMessage()); + EXPECT_EQUAL("Failed to start network.", e.getMessage()); } - orb.ShutDown(true); } void diff --git a/messagebus/src/tests/targetpool/targetpool.cpp b/messagebus/src/tests/targetpool/targetpool.cpp index 0ae70daf489..0e0e566f2be 100644 --- a/messagebus/src/tests/targetpool/targetpool.cpp +++ b/messagebus/src/tests/targetpool/targetpool.cpp @@ -38,8 +38,8 @@ Test::Main() TestServer srv3(Identity("srv3"), RoutingSpec(), slobrok); RPCServiceAddress adr3("", srv3.mb.getConnectionSpec()); - FRT_Supervisor orb(1024u, 1); - ASSERT_TRUE(orb.Start()); + fnet::frt::StandaloneFRT server; + FRT_Supervisor & orb = server.supervisor(); std::unique_ptr<PoolTimer> ptr(new PoolTimer()); PoolTimer &timer = *ptr; RPCTargetPool pool(std::move(ptr), 0.666); @@ -92,7 +92,5 @@ Test::Main() pool.flushTargets(false); EXPECT_EQUAL(0u, pool.size()); - orb.ShutDown(true); - TEST_DONE(); } diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp index 358c9ebdeac..be25a73ece2 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp @@ -112,7 +112,7 @@ RPCNetwork::RPCNetwork(const RPCNetworkParams ¶ms) : _ident(params.getIdentity()), _threadPool(std::make_unique<FastOS_ThreadPool>(128000, 0)), _transport(std::make_unique<FNET_Transport>()), - _orb(std::make_unique<FRT_Supervisor>(_transport.get(), nullptr)), + _orb(std::make_unique<FRT_Supervisor>(_transport.get())), _scheduler(*_transport->GetScheduler()), _targetPool(std::make_unique<RPCTargetPool>(params.getConnectionExpireSecs())), _targetPoolTask(_scheduler, *_targetPool), |