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)

3 files changed, 16 insertions, 16 deletions

diff --git a/jrt_test/src/tests/echo/echo-client.cpp b/jrt_test/src/tests/echo/echo-client.cpp
index a7c8d309114..16a4a2877b2 100644
--- a/jrt_test/src/tests/echo/echo-client.cpp
+++ b/jrt_test/src/tests/echo/echo-client.cpp
@@ -79,8 +79,8 @@ public:
     } else {
       printf("Return values != parameters.\n");
     }
-    req->SubRef();
-    target->SubRef();
+    req->internal_subref();
+    target->internal_subref();
     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 cdcf02da465..fae7bc90abb 100644
--- a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
+++ b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
@@ -14,16 +14,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,
@@ -90,7 +90,7 @@ public:
             break;
         }
         std::this_thread::sleep_for(1s);
-        target->SubRef();
+        target->internal_subref();
         target = supervisor.GetTarget(argv[1]);
     }
     if (info->IsError()) {
@@ -133,7 +133,7 @@ public:
               m_list->GetErrorMessage());
     }
     FreeReqs(m_list, info);
-    target->SubRef();
+    target->internal_subref();
     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 e64c2abfff6..1683d1e11f8 100644
--- a/jrt_test/src/tests/rpc-error/test-errors.cpp
+++ b/jrt_test/src/tests/rpc-error/test-errors.cpp
@@ -20,7 +20,7 @@ public:
     }
 
     void fini() {
-	    target->SubRef();
+	    target->internal_subref();
         target = nullptr;
         client = nullptr;
     }
@@ -51,7 +51,7 @@ TestErrors::testNoError()
     } else {
         EXPECT_TRUE(false);
     }
-    req1->SubRef();
+    req1->internal_subref();
 }
 
 
@@ -64,7 +64,7 @@ TestErrors::testNoSuchMethod()
     EXPECT_TRUE(req1->IsError());
     EXPECT_TRUE(0 == req1->GetReturn()->GetNumValues());
     EXPECT_TRUE(FRTE_RPC_NO_SUCH_METHOD == req1->GetErrorCode());
-    req1->SubRef();
+    req1->internal_subref();
 }
 
 
@@ -80,7 +80,7 @@ TestErrors::testWrongParameters()
     EXPECT_TRUE(req1->IsError());
     EXPECT_TRUE(0 == req1->GetReturn()->GetNumValues());
     EXPECT_TRUE(FRTE_RPC_WRONG_PARAMS == req1->GetErrorCode());
-    req1->SubRef();
+    req1->internal_subref();
 
     FRT_RPCRequest *req2 = client->AllocRPCRequest();
     req2->SetMethodName("test");
@@ -90,7 +90,7 @@ TestErrors::testWrongParameters()
     EXPECT_TRUE(req2->IsError());
     EXPECT_TRUE(0 == req2->GetReturn()->GetNumValues());
     EXPECT_TRUE(FRTE_RPC_WRONG_PARAMS == req2->GetErrorCode());
-    req2->SubRef();
+    req2->internal_subref();
 
     FRT_RPCRequest *req3 = client->AllocRPCRequest();
     req3->SetMethodName("test");
@@ -102,7 +102,7 @@ TestErrors::testWrongParameters()
     EXPECT_TRUE(req3->IsError());
     EXPECT_TRUE(0 == req3->GetReturn()->GetNumValues());
     EXPECT_TRUE(FRTE_RPC_WRONG_PARAMS == req3->GetErrorCode());
-    req3->SubRef();
+    req3->internal_subref();
 }
 
 
@@ -118,7 +118,7 @@ TestErrors::testWrongReturnValues()
     EXPECT_TRUE(req1->IsError());
     EXPECT_TRUE(0 == req1->GetReturn()->GetNumValues());
     EXPECT_TRUE(FRTE_RPC_WRONG_RETURN == req1->GetErrorCode());	
-    req1->SubRef();
+    req1->internal_subref();
 }
 
 
@@ -134,7 +134,7 @@ TestErrors::testMethodFailed()
     EXPECT_TRUE(req1->IsError());
     EXPECT_TRUE(0 == req1->GetReturn()->GetNumValues());
     EXPECT_TRUE(75000 == req1->GetErrorCode());	
-    req1->SubRef();
+    req1->internal_subref();
 
     FRT_RPCRequest *req2 = client->AllocRPCRequest();
     req2->SetMethodName("test");
@@ -145,7 +145,7 @@ TestErrors::testMethodFailed()
     EXPECT_TRUE(req2->IsError());
     EXPECT_TRUE(0 == req2->GetReturn()->GetNumValues());
     EXPECT_TRUE(75000 == req2->GetErrorCode());	
-    req2->SubRef();
+    req2->internal_subref();
 }