use ref_counted in fnet

also get rid of some cleanup functions on reference counted classes

enable specifying low-level parameters to addref/subref (cnt/reserve)

4 files changed, 11 insertions, 11 deletions

diff --git a/slobrok/src/tests/mirrorapi/mirrorapi.cpp b/slobrok/src/tests/mirrorapi/mirrorapi.cpp
index 2e03ba52bd4..6dac6b22b05 100644
--- a/slobrok/src/tests/mirrorapi/mirrorapi.cpp
+++ b/slobrok/src/tests/mirrorapi/mirrorapi.cpp
@@ -66,8 +66,8 @@ Server::reg()
 
     FRT_Target *sb = _server.supervisor().GetTarget(_slobrokSpec.c_str());
     sb->InvokeSync(req, 5.0);
-    sb->SubRef();
-    req->SubRef();
+    sb->internal_subref();
+    req->internal_subref();
 }
 
 
diff --git a/slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp b/slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp
index 13db95eb35c..0493a43adf3 100644
--- a/slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp
+++ b/slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp
@@ -21,11 +21,11 @@ struct Server : FRT_Invokable {
     FNET_Connection *last_conn;
     void set_last_conn(FNET_Connection *conn) {
         if (last_conn) {
-            last_conn->SubRef();
+            last_conn->internal_subref();
         }
         last_conn = conn;
         if (last_conn) {
-            last_conn->AddRef();
+            last_conn->internal_addref();
         }
     }
     Server(fnet::TimeTools::SP time_tools)
@@ -210,7 +210,7 @@ TEST_F(RpcMappingMonitorTest, up_connection_is_reused) {
     a.last_conn = nullptr;
     EXPECT_TRUE(debugger.step_until([&]() { return (a.last_conn); }));
     EXPECT_EQ(a.last_conn, my_conn);
-    my_conn->SubRef();
+    my_conn->internal_subref();
     EXPECT_EQ(hist.map[foo_a].state(), State::UP);
 }
 
diff --git a/slobrok/src/tests/standalone/standalone.cpp b/slobrok/src/tests/standalone/standalone.cpp
index 33813fceb3a..653e4c64b0e 100644
--- a/slobrok/src/tests/standalone/standalone.cpp
+++ b/slobrok/src/tests/standalone/standalone.cpp
@@ -77,7 +77,7 @@ private:
 public:
     SubReferer(T* &t) : _t(t) {}
     ~SubReferer() {
-        if (_t != nullptr) _t->SubRef();
+        if (_t != nullptr) _t->internal_subref();
     }
 };
 
@@ -134,7 +134,7 @@ TEST("standalone") {
         }
         fprintf(stderr, "ping failed [retry %d]\n", retry);
         std::this_thread::sleep_for(200ms);
-        sb->SubRef();
+        sb->internal_subref();
         sb = orb.GetTarget(18541);
     }
     ASSERT_TRUE(checkOk(req));
diff --git a/slobrok/src/tests/startsome/rpc_info.cpp b/slobrok/src/tests/startsome/rpc_info.cpp
index a37cfa24889..be6d59f6a81 100644
--- a/slobrok/src/tests/startsome/rpc_info.cpp
+++ b/slobrok/src/tests/startsome/rpc_info.cpp
@@ -13,16 +13,16 @@ public:
   void GetReq(FRT_RPCRequest **req, FRT_Supervisor *supervisor)
   {
     if ((*req) != nullptr)
-      (*req)->SubRef();
+      (*req)->internal_subref();
     (*req) = supervisor->AllocRPCRequest();
   }
 
   void FreeReqs(FRT_RPCRequest *r1, FRT_RPCRequest *r2)
   {
     if (r1 != nullptr)
-      r1->SubRef();
+      r1->internal_subref();
     if (r2 != nullptr)
-      r2->SubRef();
+      r2->internal_subref();
   }
 
   void DumpMethodInfo(const char *indent, FRT_RPCRequest *info,
@@ -123,7 +123,7 @@ public:
               m_list->GetErrorMessage());
     }
     FreeReqs(m_list, info);
-    target->SubRef();
+    target->internal_subref();
     return 0;
   }
 };