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)

2 files changed, 4 insertions, 4 deletions

diff --git a/messagebus/src/vespa/messagebus/network/rpcsend.cpp b/messagebus/src/vespa/messagebus/network/rpcsend.cpp
index 8c67424d5f2..e12313af53c 100644
--- a/messagebus/src/vespa/messagebus/network/rpcsend.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcsend.cpp
@@ -93,7 +93,7 @@ RPCSend::handleDiscard(Context ctx)
     ReplyContext::UP tmp(static_cast<ReplyContext*>(ctx.value.PTR));
     FRT_RPCRequest &req = tmp->getRequest();
     FNET_Channel *chn = req.GetContext()._value.CHANNEL;
-    req.SubRef();
+    req.internal_subref();
     chn->Free();
 }
 
@@ -189,7 +189,7 @@ RPCSend::doRequestDone(FRT_RPCRequest *req) {
         reply->addError(error);
     }
     _net->getOwner().deliverReply(std::move(reply), ctx->getRecipient());
-    req->SubRef();
+    req->internal_subref();
 }
 
 std::unique_ptr<Reply>
diff --git a/messagebus/src/vespa/messagebus/network/rpctarget.cpp b/messagebus/src/vespa/messagebus/network/rpctarget.cpp
index 656ab081652..9c6ca9dff69 100644
--- a/messagebus/src/vespa/messagebus/network/rpctarget.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpctarget.cpp
@@ -19,7 +19,7 @@ RPCTarget::RPCTarget(const string &spec, FRT_Supervisor &orb) :
 
 RPCTarget::~RPCTarget()
 {
-    _target.SubRef();
+    _target.internal_subref();
 }
 
 void
@@ -94,7 +94,7 @@ RPCTarget::RequestDone(FRT_RPCRequest *req)
         _state = (_version.get() ? VERSION_RESOLVED : VERSION_NOT_RESOLVED);
     }
     _cond.notify_all();
-    req->SubRef();
+    req->internal_subref();
 }
 
 } // namespace mbus