Simplify the supervisor responsibility

8 files changed, 24 insertions, 28 deletions

diff --git a/fnet/src/examples/frt/rpc/echo_client.cpp b/fnet/src/examples/frt/rpc/echo_client.cpp
index 9d73d38cd1e..cc406224135 100644
--- a/fnet/src/examples/frt/rpc/echo_client.cpp
+++ b/fnet/src/examples/frt/rpc/echo_client.cpp
@@ -19,9 +19,9 @@ EchoClient::Main()
         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();
@@ -84,7 +84,6 @@ EchoClient::Main()
         printf("Return values != parameters.\n");
     }
     req->SubRef();
-    supervisor.ShutDown(true);
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
index 7c6434e870a..726a500cc55 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
@@ -47,9 +47,9 @@ MyApp::Main()
     }
     bool ok = true;
     RPC rpc;
-    FRT_Supervisor orb;
+    fnet::frt::StandaloneFRT server;
+    FRT_Supervisor & orb = server.supervisor();
     rpc.Init(&orb);
-    orb.Start();
 
     FRT_Target *target = orb.Get2WayTarget(_argv[1]);
     FRT_RPCRequest *req = orb.AllocRPCRequest();
@@ -102,7 +102,6 @@ MyApp::Main()
 
     req->SubRef();
     target->SubRef();
-    orb.ShutDown(true);
     return ok ? 0 : 1;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
index ac7b34ebda0..7e0caaba00d 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
@@ -60,11 +60,12 @@ MyApp::Main()
         return 1;
     }
     RPC rpc;
-    FRT_Supervisor orb;
-    rpc.Init(&orb);
-    orb.Listen(_argv[1]);
-    FNET_SignalShutDown ssd(*orb.GetTransport());
-    orb.Main();
+    fnet::frt::StandaloneFRT server;
+    FRT_Supervisor & supervisor = server.supervisor();
+    rpc.Init(&supervisor);
+    supervisor.Listen(_argv[1]);
+    FNET_SignalShutDown ssd(*supervisor.GetTransport());
+    server.wait_finished();
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_client.cpp b/fnet/src/examples/frt/rpc/rpc_client.cpp
index cc230d2bc7c..fc1d54d3440 100644
--- a/fnet/src/examples/frt/rpc/rpc_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_client.cpp
@@ -19,9 +19,9 @@ RPCClient::Main()
         printf("usage  : rpc_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]);
 
     const char *str1 = "abc";
@@ -80,7 +80,6 @@ RPCClient::Main()
 
     req->SubRef();
     target->SubRef();
-    supervisor.ShutDown(true);
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp
index 5f17e69a10d..d90d22d1986 100644
--- a/fnet/src/examples/frt/rpc/rpc_info.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_info.cpp
@@ -79,11 +79,12 @@ RPCInfo::Main()
     }
 
     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 = nullptr;
     FRT_RPCRequest *info   = nullptr;
-    supervisor.Start();
 
     GetReq(&info, &supervisor);
     info->SetMethodName("frt.rpc.ping");
@@ -91,7 +92,6 @@ RPCInfo::Main()
     if (info->IsError()) {
         fprintf(stderr, "Error talking to %s\n", _argv[1]);
         FreeReqs(m_list, info);
-        supervisor.ShutDown(true);
         return 1;
     }
 
@@ -129,7 +129,6 @@ RPCInfo::Main()
     }
     FreeReqs(m_list, info);
     target->SubRef();
-    supervisor.ShutDown(true);
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
index ea34ffa6905..fb82622a537 100644
--- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
@@ -71,8 +71,8 @@ int
 RPCClient::run()
 {
     int retCode = 0;
-    FRT_Supervisor supervisor;
-    supervisor.Start();
+    fnet::frt::StandaloneFRT server;
+    FRT_Supervisor & supervisor = server.supervisor();
     int targetArg = 1;
     int methNameArg = 2;
     int startOfArgs = 3;
@@ -109,7 +109,6 @@ RPCClient::run()
     }
     req->SubRef();
     target->SubRef();
-    supervisor.ShutDown(true);
     return retCode;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
index 496190b2b80..fa152dcec10 100644
--- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
@@ -224,18 +224,18 @@ App::Main()
     }
     bool verbose = (_argc > 3) && (strcmp(_argv[3], "verbose") == 0);
 
-    FRT_Supervisor supervisor;
+    fnet::frt::StandaloneFRT server;
+    FRT_Supervisor & supervisor = server.supervisor();
     RPCProxy       proxy(supervisor, _argv[2], verbose);
 
     supervisor.GetReflectionManager()->Reset();
     supervisor.SetSessionInitHook(FRT_METHOD(RPCProxy::HOOK_Init), &proxy);
     supervisor.SetSessionDownHook(FRT_METHOD(RPCProxy::HOOK_Down), &proxy);
     supervisor.SetSessionFiniHook(FRT_METHOD(RPCProxy::HOOK_Fini), &proxy);
-    supervisor.SetMethodMismatchHook(FRT_METHOD(RPCProxy::HOOK_Mismatch),
-                                     &proxy);
+    supervisor.SetMethodMismatchHook(FRT_METHOD(RPCProxy::HOOK_Mismatch), &proxy);
     supervisor.Listen(_argv[1]);
     FNET_SignalShutDown ssd(*supervisor.GetTransport());
-    supervisor.Main();
+    server.wait_finished();
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index 03d618133c9..cc3972166ad 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -91,12 +91,12 @@ RPCServer::Main(int argc, char **argv)
         return 1;
     }
 
-    _supervisor = new FRT_Supervisor();
+    fnet::frt::StandaloneFRT server;
+    _supervisor = &server.supervisor();
     InitRPC(_supervisor);
     _supervisor->Listen(argv[1]);
     FNET_SignalShutDown ssd(*_supervisor->GetTransport());
-    _supervisor->Main();
-    delete _supervisor;
+    server.wait_finished();
     return 0;
 }