diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-12-27 18:39:47 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-12-27 18:40:08 +0900 |
| commit | b1132d6b10cd3791b9529d7031d723fd0e2d8215 (patch) | |
| tree | 9ce465b42bf09372118335c7c619bb2b41869eaf /src/DHTMessageDispatcherImpl.cc | |
| parent | 4abad2f64c9ff80144a61c5a9c2bea144852b883 (diff) | |
make clang-format using clang-format-3.6
Diffstat (limited to 'src/DHTMessageDispatcherImpl.cc')
| -rw-r--r-- | src/DHTMessageDispatcherImpl.cc | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/DHTMessageDispatcherImpl.cc b/src/DHTMessageDispatcherImpl.cc index 9f4a92c5..97327d63 100644 --- a/src/DHTMessageDispatcherImpl.cc +++ b/src/DHTMessageDispatcherImpl.cc @@ -47,26 +47,23 @@ namespace aria2 { -DHTMessageDispatcherImpl::DHTMessageDispatcherImpl -(const std::shared_ptr<DHTMessageTracker>& tracker) - : tracker_{tracker}, - timeout_{DHT_MESSAGE_TIMEOUT} -{} +DHTMessageDispatcherImpl::DHTMessageDispatcherImpl( + const std::shared_ptr<DHTMessageTracker>& tracker) + : tracker_{tracker}, timeout_{DHT_MESSAGE_TIMEOUT} +{ +} -void -DHTMessageDispatcherImpl::addMessageToQueue -(std::unique_ptr<DHTMessage> message, - std::chrono::seconds timeout, - std::unique_ptr<DHTMessageCallback> callback) +void DHTMessageDispatcherImpl::addMessageToQueue( + std::unique_ptr<DHTMessage> message, std::chrono::seconds timeout, + std::unique_ptr<DHTMessageCallback> callback) { messageQueue_.push_back(make_unique<DHTMessageEntry>( std::move(message), std::move(timeout), std::move(callback))); } -void -DHTMessageDispatcherImpl::addMessageToQueue -(std::unique_ptr<DHTMessage> message, - std::unique_ptr<DHTMessageCallback> callback) +void DHTMessageDispatcherImpl::addMessageToQueue( + std::unique_ptr<DHTMessage> message, + std::unique_ptr<DHTMessageCallback> callback) { addMessageToQueue(std::move(message), timeout_, std::move(callback)); } @@ -74,24 +71,26 @@ DHTMessageDispatcherImpl::addMessageToQueue bool DHTMessageDispatcherImpl::sendMessage(DHTMessageEntry* entry) { try { - if(entry->message->send()) { - if(!entry->message->isReply()) { + if (entry->message->send()) { + if (!entry->message->isReply()) { tracker_->addMessage(entry->message.get(), entry->timeout, std::move(entry->callback)); } A2_LOG_INFO(fmt("Message sent: %s", entry->message->toString().c_str())); - } else { + } + else { return false; } - } catch(RecoverableException& e) { - A2_LOG_INFO_EX(fmt("Failed to send message: %s", - entry->message->toString().c_str()), - e); + } + catch (RecoverableException& e) { + A2_LOG_INFO_EX( + fmt("Failed to send message: %s", entry->message->toString().c_str()), + e); // Add message to DHTMessageTracker with timeout 0 to treat it as // time out. Without this, we have untracked message and some of // DHTTask(such as DHTAbstractNodeLookupTask) don't finish // forever. - if(!entry->message->isReply()) { + if (!entry->message->isReply()) { tracker_->addMessage(entry->message.get(), 0_s, std::move(entry->callback)); } @@ -102,8 +101,8 @@ bool DHTMessageDispatcherImpl::sendMessage(DHTMessageEntry* entry) void DHTMessageDispatcherImpl::sendMessages() { auto itr = std::begin(messageQueue_); - for(; itr != std::end(messageQueue_); ++itr) { - if(!sendMessage((*itr).get())) { + for (; itr != std::end(messageQueue_); ++itr) { + if (!sendMessage((*itr).get())) { break; } } |
