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 /jrt_test | |
parent | 840d4e0578dc627b75bcd0050f1b253e84cc30ed (diff) |
Simplify the supervisor responsibility
Diffstat (limited to 'jrt_test')
-rw-r--r-- | jrt_test/src/jrt-test/simpleserver/simpleserver.cpp | 11 | ||||
-rw-r--r-- | jrt_test/src/tests/echo/echo-client.cpp | 5 | ||||
-rw-r--r-- | jrt_test/src/tests/mandatory-methods/extract-reflection.cpp | 16 | ||||
-rw-r--r-- | jrt_test/src/tests/mockup-invoke/mockup-server.cpp | 8 | ||||
-rw-r--r-- | jrt_test/src/tests/rpc-error/test-errors.cpp | 12 |
5 files changed, 23 insertions, 29 deletions
diff --git a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp index 89d8cd881a8..b45d7986842 100644 --- a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp +++ b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp @@ -38,8 +38,7 @@ public: void rpc_inc(FRT_RPCRequest *req) { - req->GetReturn()->AddInt32(req->GetParams()->GetValue(0)._intval32 - + 1); + req->GetReturn()->AddInt32(req->GetParams()->GetValue(0)._intval32 + 1); } void rpc_blob(FRT_RPCRequest *req) @@ -79,10 +78,10 @@ App::Main() printf("usage: %s <listenspec>\n", _argv[0]); return 1; } - FRT_Supervisor orb; - Server server(&orb); - orb.Listen(_argv[1]); - orb.Main(); + fnet::frt::StandaloneFRT frtServer; + Server server(&frtServer.supervisor()); + frtServer.supervisor().Listen(_argv[1]); + frtServer.wait_finished(); return 0; } diff --git a/jrt_test/src/tests/echo/echo-client.cpp b/jrt_test/src/tests/echo/echo-client.cpp index 18e5892ef71..c1ffe29e1ce 100644 --- a/jrt_test/src/tests/echo/echo-client.cpp +++ b/jrt_test/src/tests/echo/echo-client.cpp @@ -12,9 +12,9 @@ public: printf("usage : echo_client <connectspec>\n"); return 1; } - FRT_Supervisor supervisor; + fnet::frt::StandaloneFRT server; + FRT_Supervisor & supervisor = server.supervisor(); - supervisor.Start(); FRT_Target *target = supervisor.GetTarget(_argv[1]); FRT_RPCRequest *req = supervisor.AllocRPCRequest(); FRT_Values *args = req->GetParams(); @@ -77,7 +77,6 @@ public: printf("Return values != parameters.\n"); } req->SubRef(); - supervisor.ShutDown(true); return 0; } }; diff --git a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp index a465316343d..40c54980c11 100644 --- a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp +++ b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp @@ -9,16 +9,16 @@ public: void GetReq(FRT_RPCRequest **req, FRT_Supervisor *supervisor) { - if ((*req) != NULL) + if ((*req) != nullptr) (*req)->SubRef(); (*req) = supervisor->AllocRPCRequest(); } void FreeReqs(FRT_RPCRequest *r1, FRT_RPCRequest *r2) { - if (r1 != NULL) + if (r1 != nullptr) r1->SubRef(); - if (r2 != NULL) + if (r2 != nullptr) r2->SubRef(); } @@ -72,11 +72,11 @@ public: } bool verbose = (_argc > 2 && strcmp(_argv[2], "verbose") == 0); - FRT_Supervisor supervisor; + fnet::frt::StandaloneFRT server; + FRT_Supervisor & supervisor = server.supervisor(); FRT_Target *target = supervisor.GetTarget(_argv[1]); - FRT_RPCRequest *m_list = NULL; - FRT_RPCRequest *info = NULL; - supervisor.Start(); + FRT_RPCRequest *m_list = nullptr; + FRT_RPCRequest *info = nullptr; for (int i = 0; i < 50; i++) { GetReq(&info, &supervisor); @@ -93,7 +93,6 @@ public: fprintf(stderr, "Error talking to %s\n", _argv[1]); info->Print(); FreeReqs(m_list, info); - supervisor.ShutDown(true); return 1; } @@ -131,7 +130,6 @@ public: } FreeReqs(m_list, info); target->SubRef(); - supervisor.ShutDown(true); return 0; } }; diff --git a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp index 8456bee1e41..4e1d57e2ce6 100644 --- a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp +++ b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp @@ -51,10 +51,10 @@ App::Main() printf("usage: %s <listenspec>\n", _argv[0]); return 1; } - FRT_Supervisor orb; - MockupServer server(&orb); - orb.Listen(_argv[1]); - orb.Main(); + fnet::frt::StandaloneFRT orb; + MockupServer server(&orb.supervisor()); + orb.supervisor().Listen(_argv[1]); + orb.wait_finished(); return 0; } diff --git a/jrt_test/src/tests/rpc-error/test-errors.cpp b/jrt_test/src/tests/rpc-error/test-errors.cpp index 22e1007a517..c30af8ea579 100644 --- a/jrt_test/src/tests/rpc-error/test-errors.cpp +++ b/jrt_test/src/tests/rpc-error/test-errors.cpp @@ -5,22 +5,20 @@ class TestErrors : public vespalib::TestApp { private: + fnet::frt::StandaloneFRT server; FRT_Supervisor *client; FRT_Target *target; public: void init(const char *spec) { - client = new FRT_Supervisor; + client = & server.supervisor(); target = client->GetTarget(spec); - client->Start(); } void fini() { - target->SubRef(); - target = NULL; - client->ShutDown(true); - delete client; - client = NULL; + target->SubRef(); + target = nullptr; + client = nullptr; } void testNoError(); |