From 4412aace869986be3a1060f78f367841353d3384 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 10 May 2019 11:25:48 +0000
Subject: Simplify the supervisor responsibility

---
 slobrok/src/apps/check_slobrok/check_slobrok.cpp | 18 ++++++++----------
 slobrok/src/apps/sbcmd/sbcmd.cpp                 | 18 ++++++++----------
 2 files changed, 16 insertions(+), 20 deletions(-)

(limited to 'slobrok/src/apps')

diff --git a/slobrok/src/apps/check_slobrok/check_slobrok.cpp b/slobrok/src/apps/check_slobrok/check_slobrok.cpp
index ed72c459e44..0342cccb221 100644
--- a/slobrok/src/apps/check_slobrok/check_slobrok.cpp
+++ b/slobrok/src/apps/check_slobrok/check_slobrok.cpp
@@ -13,14 +13,14 @@ LOG_SETUP("check_slobrok");
 class Slobrok_Checker : public FastOS_Application
 {
 private:
-    std::unique_ptr<FRT_Supervisor>  _supervisor;
+    std::unique_ptr<fnet::frt::StandaloneFRT>  _server;
     FRT_Target                      *_target;
 
     Slobrok_Checker(const Slobrok_Checker &);
     Slobrok_Checker &operator=(const Slobrok_Checker &);
 
 public:
-    Slobrok_Checker() : _supervisor(), _target(nullptr) {}
+    Slobrok_Checker() : _server(), _target(nullptr) {}
     virtual ~Slobrok_Checker();
     int usage();
     void initRPC(const char *spec);
@@ -30,7 +30,7 @@ public:
 
 Slobrok_Checker::~Slobrok_Checker()
 {
-    LOG_ASSERT( !_supervisor);
+    LOG_ASSERT( !_server);
     LOG_ASSERT(_target == nullptr);
 }
 
@@ -46,9 +46,8 @@ Slobrok_Checker::usage()
 void
 Slobrok_Checker::initRPC(const char *spec)
 {
-    _supervisor = std::make_unique<FRT_Supervisor>();
-    _target     = _supervisor->GetTarget(spec);
-    _supervisor->Start();
+    _server = std::make_unique<fnet::frt::StandaloneFRT>();
+    _target     = _server->supervisor().GetTarget(spec);
 }
 
 
@@ -59,9 +58,8 @@ Slobrok_Checker::finiRPC()
         _target->SubRef();
         _target = nullptr;
     }
-    if (_supervisor) {
-        _supervisor->ShutDown(true);
-        _supervisor.reset();
+    if (_server) {
+        _server.reset();
     }
 }
 
@@ -82,7 +80,7 @@ Slobrok_Checker::Main()
         initRPC(tmp.str().c_str());
     }
 
-    FRT_RPCRequest *req = _supervisor->AllocRPCRequest();
+    FRT_RPCRequest *req = _server->supervisor().AllocRPCRequest();
 
     req->SetMethodName("slobrok.system.version");
     _target->InvokeSync(req, 5.0);
diff --git a/slobrok/src/apps/sbcmd/sbcmd.cpp b/slobrok/src/apps/sbcmd/sbcmd.cpp
index c4b76bd7ed0..f32155ae80b 100644
--- a/slobrok/src/apps/sbcmd/sbcmd.cpp
+++ b/slobrok/src/apps/sbcmd/sbcmd.cpp
@@ -12,14 +12,14 @@ LOG_SETUP("vespa-slobrok-cmd");
 class Slobrok_CMD : public FastOS_Application
 {
 private:
-    std::unique_ptr<FRT_Supervisor> _supervisor;
+    std::unique_ptr<fnet::frt::StandaloneFRT> _server;
     FRT_Target     *_target;
 
     Slobrok_CMD(const Slobrok_CMD &);
     Slobrok_CMD &operator=(const Slobrok_CMD &);
 
 public:
-    Slobrok_CMD() : _supervisor(), _target(nullptr) {}
+    Slobrok_CMD() : _server(), _target(nullptr) {}
     virtual ~Slobrok_CMD();
     int usage();
     void initRPC(const char *spec);
@@ -29,7 +29,7 @@ public:
 
 Slobrok_CMD::~Slobrok_CMD()
 {
-    LOG_ASSERT(! _supervisor);
+    LOG_ASSERT(! _server);
     LOG_ASSERT(_target == nullptr);
 }
 
@@ -56,9 +56,8 @@ Slobrok_CMD::usage()
 void
 Slobrok_CMD::initRPC(const char *spec)
 {
-    _supervisor = std::make_unique<FRT_Supervisor>();
-    _target     = _supervisor->GetTarget(spec);
-    _supervisor->Start();
+    _server = std::make_unique<fnet::frt::StandaloneFRT>();
+    _target     = _server->supervisor().GetTarget(spec);
 }
 
 
@@ -69,9 +68,8 @@ Slobrok_CMD::finiRPC()
         _target->SubRef();
         _target = nullptr;
     }
-    if (_supervisor) {
-        _supervisor->ShutDown(true);
-        _supervisor.reset();
+    if (_server) {
+        _server.reset();
     }
 }
 
@@ -95,7 +93,7 @@ Slobrok_CMD::Main()
     bool threeTables = false;
     bool twoTables = false;
 
-    FRT_RPCRequest *req = _supervisor->AllocRPCRequest();
+    FRT_RPCRequest *req = _server->supervisor().AllocRPCRequest();
 
     req->SetMethodName(_argv[2]);
     if (strcmp(_argv[2], "slobrok.admin.listAllRpcServers") == 0) {
-- 
cgit v1.2.3