aboutsummaryrefslogtreecommitdiffstats
path: root/vespamalloc
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-03-16 22:03:09 +0100
committerHenning Baldersheim <balder@oath.com>2018-03-19 09:59:20 +0100
commit9335569e415a04beaab3ebcb62e02faf37be7ad3 (patch)
tree0468dce784c03994f0de8e70a5ad9be3da109dbe /vespamalloc
parentf52a07e96ccf1baf2b4bbfa148bff540ba35357d (diff)
Remove MultiOperation
Conflicts: storage/src/tests/persistence/filestorage/filestormanagertest.cpp storage/src/vespa/storage/persistence/persistencethread.cpp Fix merge conflict.
Diffstat (limited to 'vespamalloc')
-rwxr-xr-xvespamalloc/bin/parsememorydump.pl6
1 files changed, 0 insertions, 6 deletions
diff --git a/vespamalloc/bin/parsememorydump.pl b/vespamalloc/bin/parsememorydump.pl
index 1919e33fbff..a1183f185ea 100755
--- a/vespamalloc/bin/parsememorydump.pl
+++ b/vespamalloc/bin/parsememorydump.pl
@@ -65,10 +65,7 @@ my %patterns = (
'storage::SlotFileBuffer::getInputBuffer' => 'Persistence layer - Input buffer',
'storage::SlotFileBuffer::getIndexBuffer' => 'Persistence layer - Index buffer',
'storage::SlotFileBuffer::getOutputBuffer' => 'Persistence layer - Output buffer',
- 'std::vector<storage::SlotFile::WriteEntry.*storage::FileStorThread::onMultiOperation'
- => 'Persistence layer - Temporary buffer used to store data to write multi operation commands',
- 'storage::api::MultiOperationCommand::onDeserialize' => 'Messages - Queued multi operation commands',
'storage::api::\S*::makeReply.*storage::MessageDispatcher::handleCommand' => 'Messages - Replies stored in message dispatcher',
'document::SerializableArray::onDeserialize.*storage::CommunicationManager::onEvent\(std::auto_ptr<storage::rpc::Event>\)'
=> 'Messages - Documents from storage API messages - serializable arrays',
@@ -82,13 +79,10 @@ my %patterns = (
=> 'Messages - Merge apply entries',
'storage::api::ApplyBucketDiffCommand::Entry::Entry.*storage::api::StorageMessage::onDeserialize'
=> 'Messages - Merge apply entries',
- 'storage::api::MultiOperationCommand::MultiOperationCommand.*storage::api::MultiOperationCommand::clone.*storage::MessageDispatcher::handleCommand'
=> 'Messages - Queued multi operation commands - cloned for local use in message dispatcher',
'storage::BufHolder::reserve.*storage::FileStorThread::onGetIterCommand' => 'Visiting - Downsized docblocks',
'storage::BufHolder::resize.*storage::FileStorThread::onGetIterCommand' => 'Visiting - Upsized docblocks',
- 'documentapi::MultiOperationMessage::MultiOperationMessage.*storage::VisitorManager::send'
- => 'Visiting - Pending messagebus multi operation messages',
'JudyLIns.*storage::StorBucketDatabase::(get|insert)' => 'Bucket database - Judy',
'JudyLDel.*WrappedEntry::remove' => 'Bucket database - Judy',