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)

8 files changed, 17 insertions, 17 deletions

diff --git a/fnet/src/examples/frt/rpc/echo_client.cpp b/fnet/src/examples/frt/rpc/echo_client.cpp
index 0176337c466..869a010bfda 100644
--- a/fnet/src/examples/frt/rpc/echo_client.cpp
+++ b/fnet/src/examples/frt/rpc/echo_client.cpp
@@ -85,8 +85,8 @@ EchoClient::main(int argc, char **argv)
     } else {
         printf("Return values != parameters.\n");
     }
-    req->SubRef();
-    target->SubRef();
+    req->internal_subref();
+    target->internal_subref();
     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 b41c40ba29d..c52d48f24eb 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
@@ -102,8 +102,8 @@ MyApp::main(int argc, char **argv)
         ok = false;
     }
 
-    req->SubRef();
-    target->SubRef();
+    req->internal_subref();
+    target->internal_subref();
     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 37a819c6ee7..5c21f73da7f 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
@@ -27,7 +27,7 @@ void do_callback(FRT_RPCRequest *req) {
                cb->GetErrorCode(),
                cb->GetErrorMessage());
     }
-    cb->SubRef();
+    cb->internal_subref();
     req->Return();
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_client.cpp b/fnet/src/examples/frt/rpc/rpc_client.cpp
index acb20a880c9..55168a2acba 100644
--- a/fnet/src/examples/frt/rpc/rpc_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_client.cpp
@@ -49,7 +49,7 @@ RPCClient::main(int argc, char **argv)
     }
 
     fprintf(stdout, "\nTesting addFloat method\n");
-    req->SubRef();
+    req->internal_subref();
     req = supervisor.AllocRPCRequest();
     req->SetMethodName("addFloat");
     req->GetParams()->AddFloat(float1);
@@ -65,7 +65,7 @@ RPCClient::main(int argc, char **argv)
     }
 
     fprintf(stdout, "\nTesting addDouble method\n");
-    req->SubRef();
+    req->internal_subref();
     req = supervisor.AllocRPCRequest();
     req->SetMethodName("addDouble");
     req->GetParams()->AddDouble(double1);
@@ -80,8 +80,8 @@ RPCClient::main(int argc, char **argv)
                 req->GetErrorMessage());
     }
 
-    req->SubRef();
-    target->SubRef();
+    req->internal_subref();
+    target->internal_subref();
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp
index 9734342a24e..ab534a254c2 100644
--- a/fnet/src/examples/frt/rpc/rpc_info.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_info.cpp
@@ -15,16 +15,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,
@@ -130,7 +130,7 @@ RPCInfo::main(int argc, char **argv)
                 m_list->GetErrorMessage());
     }
     FreeReqs(m_list, info);
-    target->SubRef();
+    target->internal_subref();
     return 0;
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
index 9f3e90f469a..d56847098d8 100644
--- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
@@ -113,8 +113,8 @@ RPCClient::run(int argc, char **argv)
             retCode = 3;
         }
     }
-    req->SubRef();
-    target->SubRef();
+    req->internal_subref();
+    target->internal_subref();
     return retCode;
 }
 
diff --git a/fnet/src/examples/ping/pingclient.cpp b/fnet/src/examples/ping/pingclient.cpp
index 43296df7e57..b59df31607a 100644
--- a/fnet/src/examples/ping/pingclient.cpp
+++ b/fnet/src/examples/ping/pingclient.cpp
@@ -86,7 +86,7 @@ PingClient::main(int argc, char **argv)
         packet->Free();
     }
     if (conn != nullptr)
-        conn->SubRef();
+        conn->internal_subref();
     transport.ShutDown(true);
     return 0;
 }
diff --git a/fnet/src/examples/ping/pingserver.cpp b/fnet/src/examples/ping/pingserver.cpp
index fb5b12b66c0..79a67cd18a7 100644
--- a/fnet/src/examples/ping/pingserver.cpp
+++ b/fnet/src/examples/ping/pingserver.cpp
@@ -51,7 +51,7 @@ PingServer::main(int argc, char **argv)
     FNET_Connector *listener =
         transport.Listen(argv[1], &streamer, this);
     if (listener != nullptr)
-        listener->SubRef();
+        listener->internal_subref();
 
     FNET_SignalShutDown ssd(transport);
     transport.Main();