diff options
author | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-12-04 11:31:29 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-12-04 13:06:46 +0000 |
commit | 952a877611d657cfa0166b14699c8731b18f7587 (patch) | |
tree | c1b4330b9dc512c3ffbf845e626857ddcd801982 /storageapi | |
parent | d164fbb93e277ef23ab610320a7cf8556e3c036e (diff) |
Remove memory manager component from content layer
We already have resource utilization tracking in both MessageBus
and the search core. The memory manager has never been auto-scaled
based on the hardware present and adds a _lot_ of complexity without
having any known instances where it has actually saved the day.
Removing it also removes a mutex on the message hot path.
If we need such functionality in the future, should design a lock-free
solution.
Cleanup
Diffstat (limited to 'storageapi')
-rw-r--r-- | storageapi/src/vespa/storageapi/messageapi/storagemessage.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h index 663a0ccdf4e..32f6c769e87 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h +++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h @@ -12,7 +12,6 @@ #pragma once #include "messagehandler.h" -#include <vespa/storageframework/generic/memory/memorytoken.h> #include <vespa/documentapi/loadtypes/loadtype.h> #include <vespa/messagebus/routing/route.h> #include <vespa/messagebus/trace.h> @@ -335,7 +334,6 @@ private: StorageMessage(const StorageMessage&); mutable std::unique_ptr<TransportContext> _transportContext; - std::unique_ptr<framework::MemoryToken> _memoryToken; protected: static Id generateMsgId(); @@ -375,10 +373,6 @@ public: void setAddress(const StorageMessageAddress& address) { _address.reset(new StorageMessageAddress(address)); } - void setMemoryToken(std::unique_ptr<framework::MemoryToken> token) { - _memoryToken = std::move(token); - } - /** Returns the approximate memory footprint of a storage message. By default, returns 50 bytes. This only needs to be overriden if the |