diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-13 15:05:02 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-13 15:05:02 +0100 |
commit | 2b3a7c21f8ca00502e26725d6cb4d67618d51cce (patch) | |
tree | 644d915841f24d56e53778946180daa9f0eab81e | |
parent | f168989ff8574a515a4ca067613fc9a7fa70215e (diff) |
Let getStash return a reference.
-rw-r--r-- | fnet/src/examples/frt/rpc/rpc_proxy.cpp | 4 | ||||
-rw-r--r-- | fnet/src/tests/frt/rpc/invoke.cpp | 2 | ||||
-rw-r--r-- | fnet/src/tests/printstuff/printstuff_test.cpp | 12 | ||||
-rw-r--r-- | fnet/src/vespa/fnet/frt/packets.cpp | 8 | ||||
-rw-r--r-- | fnet/src/vespa/fnet/frt/rpcrequest.cpp | 18 | ||||
-rw-r--r-- | fnet/src/vespa/fnet/frt/rpcrequest.h | 9 | ||||
-rw-r--r-- | fnet/src/vespa/fnet/frt/supervisor.cpp | 6 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/rpchooks.cpp | 4 |
8 files changed, 31 insertions, 32 deletions
diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp index 0be2c2131eb..19c59f9201d 100644 --- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp +++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp @@ -144,11 +144,11 @@ RPCProxy::HOOK_Mismatch(FRT_RPCRequest *req) req->SetError(FRTE_NO_ERROR, ""); if (req->GetConnection()->IsServer() && GetSession(req)->server != NULL) { - GetSession(req)->server->InvokeAsync(req, 60.0, &req->getStash()->create<ReqDone>(*this)); + GetSession(req)->server->InvokeAsync(req, 60.0, &req->getStash().create<ReqDone>(*this)); } else if (req->GetConnection()->IsClient() && GetSession(req)->client != NULL) { FRT_Supervisor::InvokeAsync(GetSession(req)->client->Owner(), GetSession(req)->client, - req, 60.0, &req->getStash()->create<ReqDone>(*this)); + req, 60.0, &req->getStash().create<ReqDone>(*this)); } else { req->SetError(FRTE_RPC_CONNECTION); req->Return(); diff --git a/fnet/src/tests/frt/rpc/invoke.cpp b/fnet/src/tests/frt/rpc/invoke.cpp index 2abe1b9a5de..2f5594779e9 100644 --- a/fnet/src/tests/frt/rpc/invoke.cpp +++ b/fnet/src/tests/frt/rpc/invoke.cpp @@ -261,7 +261,7 @@ public: if (delay == 0) { req->Return(); } else { - req->getStash()->create<DelayedReturn>(_scheduler, req, ((double)delay) / 1000.0); + req->getStash().create<DelayedReturn>(_scheduler, req, ((double)delay) / 1000.0); } } else { diff --git a/fnet/src/tests/printstuff/printstuff_test.cpp b/fnet/src/tests/printstuff/printstuff_test.cpp index 09e4d34daab..f112763d248 100644 --- a/fnet/src/tests/printstuff/printstuff_test.cpp +++ b/fnet/src/tests/printstuff/printstuff_test.cpp @@ -24,14 +24,14 @@ TEST("rpc packets in a queue") { { req->SetMethodName("foo"); FNET_PacketQueue_NoLock q1(1, FNET_IPacketHandler::FNET_KEEP_CHANNEL); - q1.QueuePacket_NoLock(&req->getStash()->create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); - q1.QueuePacket_NoLock(&req->getStash()->create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); - q1.QueuePacket_NoLock(&req->getStash()->create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); + q1.QueuePacket_NoLock(&req->getStash().create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); + q1.QueuePacket_NoLock(&req->getStash().create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); + q1.QueuePacket_NoLock(&req->getStash().create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); q1.Print(); FNET_PacketQueue q2(2, FNET_IPacketHandler::FNET_KEEP_CHANNEL); - q2.QueuePacket(&req->getStash()->create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); - q2.QueuePacket(&req->getStash()->create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); - q2.QueuePacket(&req->getStash()->create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); + q2.QueuePacket(&req->getStash().create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); + q2.QueuePacket(&req->getStash().create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); + q2.QueuePacket(&req->getStash().create<FRT_RPCRequestPacket>(req, 0, false), FNET_Context()); q2.Print(); } req->SubRef(); diff --git a/fnet/src/vespa/fnet/frt/packets.cpp b/fnet/src/vespa/fnet/frt/packets.cpp index a6cb8cb4000..0a3f63dc8bf 100644 --- a/fnet/src/vespa/fnet/frt/packets.cpp +++ b/fnet/src/vespa/fnet/frt/packets.cpp @@ -251,19 +251,19 @@ FRT_PacketFactory::CreatePacket(uint32_t pcode, FNET_Context context) if (req == NULL || (flags & ~FLAG_FRT_RPC_SUPPORTED_MASK) != 0) return NULL; - vespalib::Stash *tub = req->getStash(); + vespalib::Stash & stash = req->getStash(); pcode &= 0xffff; // remove flags switch(pcode) { case PCODE_FRT_RPC_REQUEST: - return &tub->create<FRT_RPCRequestPacket>(req, flags, false); + return &stash.create<FRT_RPCRequestPacket>(req, flags, false); case PCODE_FRT_RPC_REPLY: - return &tub->create<FRT_RPCReplyPacket>(req, flags, false); + return &stash.create<FRT_RPCReplyPacket>(req, flags, false); case PCODE_FRT_RPC_ERROR: - return &tub->create<FRT_RPCErrorPacket>(req, flags, false); + return &stash.create<FRT_RPCErrorPacket>(req, flags, false); } return NULL; } diff --git a/fnet/src/vespa/fnet/frt/rpcrequest.cpp b/fnet/src/vespa/fnet/frt/rpcrequest.cpp index 55ed2ccd01b..bedb85e32ea 100644 --- a/fnet/src/vespa/fnet/frt/rpcrequest.cpp +++ b/fnet/src/vespa/fnet/frt/rpcrequest.cpp @@ -6,10 +6,10 @@ #include <cassert> FRT_RPCRequest::FRT_RPCRequest() - : _tub(), + : _stash(), _context(), - _params(&_tub), - _return(&_tub), + _params(&_stash), + _return(&_stash), _refcnt(1), _completed(0), _errorCode(FRTE_NO_ERROR), @@ -33,7 +33,7 @@ FRT_RPCRequest::SetError(uint32_t errorCode, const char *errorMessage, uint32_t { _errorCode = errorCode; _errorMessageLen = errorMessageLen; - _errorMessage = fnet::copyString(_tub.alloc(errorMessageLen + 1), errorMessage, errorMessageLen); + _errorMessage = fnet::copyString(_stash.alloc(errorMessageLen + 1), errorMessage, errorMessageLen); } void FRT_RPCRequest::SetError(uint32_t errorCode, const char *errorMessage) { @@ -60,7 +60,7 @@ FRT_RPCRequest::CheckReturnTypes(const char *types) { void FRT_RPCRequest::SetMethodName(const char *methodName, uint32_t len) { _methodNameLen = len; - _methodName = fnet::copyString(_tub.alloc(len + 1), methodName, len); + _methodName = fnet::copyString(_stash.alloc(len + 1), methodName, len); } void FRT_RPCRequest::SetMethodName(const char *methodName) { @@ -102,7 +102,7 @@ FRT_RPCRequest::Reset() { _context = FNET_Context(); _params.Reset(); _return.Reset(); - _tub.clear(); + _stash.clear(); _errorCode = FRTE_NO_ERROR; _errorMessageLen = 0; _errorMessage = NULL; @@ -166,7 +166,7 @@ FRT_RPCRequest::CreateRequestPacket(bool wantReply) else flags |= FLAG_FRT_RPC_NOREPLY; - return &_tub.create<FRT_RPCRequestPacket>(this, flags, true); + return &_stash.create<FRT_RPCRequestPacket>(this, flags, true); } @@ -178,8 +178,8 @@ FRT_RPCRequest::CreateReplyPacket() flags |= FLAG_FRT_RPC_LITTLE_ENDIAN; if (IsError()) { - return &_tub.create<FRT_RPCErrorPacket>(this, flags, true); + return &_stash.create<FRT_RPCErrorPacket>(this, flags, true); } else { - return &_tub.create<FRT_RPCReplyPacket>(this, flags, true); + return &_stash.create<FRT_RPCReplyPacket>(this, flags, true); } } diff --git a/fnet/src/vespa/fnet/frt/rpcrequest.h b/fnet/src/vespa/fnet/frt/rpcrequest.h index 5846322e901..89611a9035a 100644 --- a/fnet/src/vespa/fnet/frt/rpcrequest.h +++ b/fnet/src/vespa/fnet/frt/rpcrequest.h @@ -55,7 +55,7 @@ class FRT_RPCRequest { private: using Stash = vespalib::Stash; - Stash _tub; + Stash _stash; FNET_Context _context; FRT_Values _params; FRT_Values _return; @@ -72,10 +72,9 @@ private: FRT_IReturnHandler *_returnHandler; FRT_ICleanupHandler *_cleanupHandler; - FRT_RPCRequest(const FRT_RPCRequest &); - FRT_RPCRequest &operator=(const FRT_RPCRequest &); - public: + FRT_RPCRequest(const FRT_RPCRequest &) = delete; + FRT_RPCRequest &operator=(const FRT_RPCRequest &) = delete; FRT_RPCRequest(); ~FRT_RPCRequest(); @@ -95,7 +94,7 @@ public: void SetContext(FNET_Context context) { _context = context; } FNET_Context GetContext() { return _context; } - Stash * getStash() { return &_tub; } + Stash & getStash() { return _stash; } FRT_Values *GetParams() { return &_params; } FRT_Values *GetReturn() { return &_return; } diff --git a/fnet/src/vespa/fnet/frt/supervisor.cpp b/fnet/src/vespa/fnet/frt/supervisor.cpp index 68775da44c6..e631402b791 100644 --- a/fnet/src/vespa/fnet/frt/supervisor.cpp +++ b/fnet/src/vespa/fnet/frt/supervisor.cpp @@ -206,7 +206,7 @@ FRT_Supervisor::InvokeAsync(SchedulerPtr scheduler, { uint32_t chid; FNET_Packet *packet = req->CreateRequestPacket(true); - FRT_RPCAdapter *adapter = &req->getStash()->create<FRT_RPCAdapter>(scheduler.ptr, req, waiter); + FRT_RPCAdapter *adapter = &req->getStash().create<FRT_RPCAdapter>(scheduler.ptr, req, waiter); FNET_Channel *ch = (conn == nullptr)? nullptr : conn->OpenChannel(adapter, FNET_Context((void *)req), &chid); adapter->SetChannel(ch); @@ -274,7 +274,7 @@ FRT_Supervisor::HandlePacket(FNET_Packet *packet, FNET_Context context) } else { req->SetError(FRTE_RPC_BAD_REQUEST); } - invoker = &req->getStash()->create<FRT_RPCInvoker>(this, req, noReply); + invoker = &req->getStash().create<FRT_RPCInvoker>(this, req, noReply); packet->Free(); if (req->IsError()) { @@ -480,7 +480,7 @@ FRT_Supervisor::ConnHooks::InvokeHook(FRT_Method *hook, { FRT_RPCRequest *req = _parent.AllocRPCRequest(); req->SetMethodName(hook->GetName()); - req->getStash()->create<FRT_HookInvoker>(req, hook, conn).Invoke(); + req->getStash().create<FRT_HookInvoker>(req, hook, conn).Invoke(); } diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.cpp b/slobrok/src/vespa/slobrok/server/rpchooks.cpp index 2274230b42d..b991997b18a 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.cpp +++ b/slobrok/src/vespa/slobrok/server/rpchooks.cpp @@ -522,7 +522,7 @@ RPCHooks::rpc_mirrorFetch(FRT_RPCRequest *req) vespalib::GenCnt gencnt(args[0]._intval32); uint32_t msTimeout = args[1]._intval32; - req->getStash()->create<MirrorFetch>(_env.getSupervisor(), req, + req->getStash().create<MirrorFetch>(_env.getSupervisor(), req, _rpcsrvmap.visibleMap(), gencnt).invoke(msTimeout); } @@ -535,7 +535,7 @@ RPCHooks::rpc_incrementalFetch(FRT_RPCRequest *req) vespalib::GenCnt gencnt(args[0]._intval32); uint32_t msTimeout = args[1]._intval32; - req->getStash()->create<IncrementalFetch>(_env.getSupervisor(), req, + req->getStash().create<IncrementalFetch>(_env.getSupervisor(), req, _rpcsrvmap.visibleMap(), gencnt).invoke(msTimeout); } |