diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-27 12:40:23 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-27 12:40:23 +0000 |
commit | 7006f31dd19d06bfa7a36088aec56cd251817c13 (patch) | |
tree | 3ce77a2a653162c2e8638d43887bdedfe7489023 /messagebus | |
parent | 311f0b4a454dc7d56db50a2921ffc9376bab92b2 (diff) |
GC unused MessageTask and ReplyTask. Also modernize some Sequenzer to c++11
Diffstat (limited to 'messagebus')
-rw-r--r-- | messagebus/src/vespa/messagebus/messenger.cpp | 80 | ||||
-rw-r--r-- | messagebus/src/vespa/messagebus/replygate.cpp | 3 | ||||
-rw-r--r-- | messagebus/src/vespa/messagebus/sendproxy.cpp | 7 | ||||
-rw-r--r-- | messagebus/src/vespa/messagebus/sequencer.cpp | 10 |
4 files changed, 12 insertions, 88 deletions
diff --git a/messagebus/src/vespa/messagebus/messenger.cpp b/messagebus/src/vespa/messagebus/messenger.cpp index 20b39dae522..926d8b6ef22 100644 --- a/messagebus/src/vespa/messagebus/messenger.cpp +++ b/messagebus/src/vespa/messagebus/messenger.cpp @@ -18,70 +18,6 @@ struct DeleteFunctor } }; -class MessageTask : public mbus::Messenger::ITask { -private: - mbus::Message::UP _msg; - mbus::IMessageHandler &_handler; - -public: - MessageTask(mbus::Message::UP msg, mbus::IMessageHandler &handler) - : _msg(std::move(msg)), - _handler(handler) - { - // empty - } - - ~MessageTask() { - if (_msg) { - _msg->discard(); - } - } - - void run() override { - _handler.handleMessage(std::move(_msg)); - } - - uint8_t priority() const override { - if (_msg) { - return _msg->priority(); - } - - return 255; - } -}; - -class ReplyTask : public mbus::Messenger::ITask { -private: - mbus::Reply::UP _reply; - mbus::IReplyHandler &_handler; - -public: - ReplyTask(mbus::Reply::UP reply, mbus::IReplyHandler &handler) - : _reply(std::move(reply)), - _handler(handler) - { - // empty - } - - ~ReplyTask() { - if (_reply) { - _reply->discard(); - } - } - - void run() override { - _handler.handleReply(std::move(_reply)); - } - - uint8_t priority() const override { - if (_reply) { - return _reply->priority(); - } - - return 255; - } -}; - class SyncTask : public mbus::Messenger::ITask { private: vespalib::Gate &_gate; @@ -89,17 +25,13 @@ private: public: SyncTask(vespalib::Gate &gate) : _gate(gate) - { - // empty - } + { } ~SyncTask() { _gate.countDown(); } - void run() override { - // empty - } + void run() override { } uint8_t priority() const override { return 255; @@ -115,9 +47,7 @@ public: AddRecurrentTask(std::vector<ITask*> &tasks, mbus::Messenger::ITask::UP task) : _tasks(tasks), _task(std::move(task)) - { - // empty - } + { } void run() override { _tasks.push_back(_task.release()); @@ -136,9 +66,7 @@ public: DiscardRecurrentTasks(vespalib::Gate &gate, std::vector<ITask*> &tasks) : SyncTask(gate), _tasks(tasks) - { - // empty - } + { } void run() override { std::for_each(_tasks.begin(), _tasks.end(), DeleteFunctor<ITask>()); diff --git a/messagebus/src/vespa/messagebus/replygate.cpp b/messagebus/src/vespa/messagebus/replygate.cpp index d1bd6ef05c7..8094119f14c 100644 --- a/messagebus/src/vespa/messagebus/replygate.cpp +++ b/messagebus/src/vespa/messagebus/replygate.cpp @@ -38,9 +38,8 @@ ReplyGate::handleReply(Reply::UP reply) } void -ReplyGate::handleDiscard(Context ctx) +ReplyGate::handleDiscard(Context) { - (void)ctx; subRef(); } diff --git a/messagebus/src/vespa/messagebus/sendproxy.cpp b/messagebus/src/vespa/messagebus/sendproxy.cpp index dcb24b70eeb..9adeceb9a41 100644 --- a/messagebus/src/vespa/messagebus/sendproxy.cpp +++ b/messagebus/src/vespa/messagebus/sendproxy.cpp @@ -13,9 +13,7 @@ SendProxy::SendProxy(MessageBus &mbus, INetwork &net, Resender *resender) : _msg(), _logTrace(false), _root() -{ - // empty -} +{ } void SendProxy::handleMessage(Message::UP msg) @@ -36,9 +34,8 @@ SendProxy::handleMessage(Message::UP msg) } void -SendProxy::handleDiscard(Context ctx) +SendProxy::handleDiscard(Context) { - (void)ctx; _msg->discard(); delete this; } diff --git a/messagebus/src/vespa/messagebus/sequencer.cpp b/messagebus/src/vespa/messagebus/sequencer.cpp index e17509033d6..59e3164e11d 100644 --- a/messagebus/src/vespa/messagebus/sequencer.cpp +++ b/messagebus/src/vespa/messagebus/sequencer.cpp @@ -18,8 +18,8 @@ Sequencer::Sequencer(IMessageHandler &sender) : Sequencer::~Sequencer() { - for (QueueMap::iterator it = _seqMap.begin(); it != _seqMap.end(); ++it) { - MessageQueue *queue = it->second; + for (auto & entry : _seqMap) { + MessageQueue *queue = entry.second; if (queue != nullptr) { while (queue->size() > 0) { Message *msg = queue->front(); @@ -39,7 +39,7 @@ Sequencer::filter(Message::UP msg) msg->setContext(Context(seqId)); { std::lock_guard guard(_lock); - QueueMap::iterator it = _seqMap.find(seqId); + auto it = _seqMap.find(seqId); if (it != _seqMap.end()) { if (it->second == nullptr) { it->second = new MessageQueue(); @@ -48,7 +48,7 @@ Sequencer::filter(Message::UP msg) make_string("Sequencer queued message with sequence id '%" PRIu64 "'.", seqId)); it->second->push(msg.get()); msg.release(); - return Message::UP(); + return {}; } _seqMap[seqId] = nullptr; // insert empty queue } @@ -87,7 +87,7 @@ Sequencer::handleReply(Reply::UP reply) Message::UP msg; { std::lock_guard guard(_lock); - QueueMap::iterator it = _seqMap.find(seq); + auto it = _seqMap.find(seq); MessageQueue *que = it->second; assert(it != _seqMap.end()); if (que == nullptr || que->size() == 0) { |