diff options
author | Håvard Pettersen <havardpe@yahooinc.com> | 2023-03-06 11:42:42 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@yahooinc.com> | 2023-03-06 15:11:11 +0000 |
commit | 793a0bbc6c8bedcf0ee5de51be687d760defcd57 (patch) | |
tree | 016f83e652b0734aa3555df9332c72f9a82ff424 /storage | |
parent | 9a95875744e88f29cb4a78f8bb31bab13e7cec4d (diff) |
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)
Diffstat (limited to 'storage')
5 files changed, 8 insertions, 8 deletions
diff --git a/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp b/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp index bac1ab34574..ad410eb93e8 100644 --- a/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp +++ b/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp @@ -67,7 +67,7 @@ struct FixtureBase { // instance _before_ we destroy the request itself. dispatcher._enqueued.clear(); if (bound_request) { - bound_request->SubRef(); + bound_request->internal_subref(); } } }; diff --git a/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp b/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp index 9a98a40e7eb..bfc22b9f1ea 100644 --- a/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp +++ b/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp @@ -204,8 +204,8 @@ public: EXPECT_TRUE(req->IsError()); EXPECT_EQ(req->GetErrorCode(), FRTE_RPC_METHOD_FAILED); EXPECT_EQ(req->GetErrorMessage(), expected_msg); - target->SubRef(); - req->SubRef(); + target->internal_subref(); + req->internal_subref(); } }; diff --git a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp index 3f015d91a4a..5e4cb9d3026 100644 --- a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp +++ b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp @@ -35,7 +35,7 @@ public: _spec(spec) {} ~RpcTargetImpl() override { - _target->SubRef(); + _target->internal_subref(); } FRT_Target* get() noexcept override { return _target; } bool is_valid() const noexcept override { return _target->IsValid(); } diff --git a/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp b/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp index bcb5dbab279..e494f4e67da 100644 --- a/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp +++ b/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp @@ -83,7 +83,7 @@ namespace { struct SubRefDeleter { template <typename T> void operator()(T* v) const noexcept { - v->SubRef(); + v->internal_subref(); } }; diff --git a/storage/src/vespa/storage/tools/storage-cmd.cpp b/storage/src/vespa/storage/tools/storage-cmd.cpp index 12299c7458e..bc932fcf6fd 100644 --- a/storage/src/vespa/storage/tools/storage-cmd.cpp +++ b/storage/src/vespa/storage/tools/storage-cmd.cpp @@ -90,7 +90,7 @@ public: req->GetErrorMessage()); continue; } - req->SubRef(); + req->internal_subref(); } FRT_RPCRequest *req = supervisor.supervisor().AllocRPCRequest(); @@ -115,8 +115,8 @@ public: req->GetErrorMessage()); } } - req->SubRef(); - target->SubRef(); + req->internal_subref(); + target->internal_subref(); } return retCode; } |