Skip to content
Snippets Groups Projects
Commit 82b0e9d5 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

data transfer: fix warnings


Change-Id: I0c696b635bd7940d9d9803ecb577ef436943ded3
Reviewed-by: default avatarSebastien Blin <sebastien.blin@savoirfairelinux.com>
parent 5e01c27d
No related branches found
No related tags found
No related merge requests found
...@@ -166,7 +166,6 @@ OptimisticMetaOutgoingInfo::updateInfo(const DRing::DataTransferInfo& info) cons ...@@ -166,7 +166,6 @@ OptimisticMetaOutgoingInfo::updateInfo(const DRing::DataTransferInfo& info) cons
{ {
bool emitCodeChanged = false; bool emitCodeChanged = false;
bool checkOngoing = false; bool checkOngoing = false;
DRing::DataTransferEventCode lastEvent { DRing::DataTransferEventCode::invalid };
{ {
std::lock_guard<std::mutex> lk {infoMutex_}; std::lock_guard<std::mutex> lk {infoMutex_};
if (info_.lastEvent > DRing::DataTransferEventCode::timeout_expired) { if (info_.lastEvent > DRing::DataTransferEventCode::timeout_expired) {
...@@ -273,7 +272,7 @@ private: ...@@ -273,7 +272,7 @@ private:
SubOutgoingFileTransfer::SubOutgoingFileTransfer(DRing::DataTransferId tid, SubOutgoingFileTransfer::SubOutgoingFileTransfer(DRing::DataTransferId tid,
const std::string& peerUri, const std::string& peerUri,
std::shared_ptr<OptimisticMetaOutgoingInfo> metaInfo) std::shared_ptr<OptimisticMetaOutgoingInfo> metaInfo)
: DataTransfer(tid), peerUri_ {peerUri}, metaInfo_(metaInfo) : DataTransfer(tid), metaInfo_(metaInfo), peerUri_(peerUri)
{ {
info_ = metaInfo_->info(); info_ = metaInfo_->info();
...@@ -385,7 +384,7 @@ SubOutgoingFileTransfer::emit(DRing::DataTransferEventCode code) const ...@@ -385,7 +384,7 @@ SubOutgoingFileTransfer::emit(DRing::DataTransferEventCode code) const
} }
metaInfo_->updateInfo(info_); metaInfo_->updateInfo(info_);
if (code == DRing::DataTransferEventCode::wait_peer_acceptance) { if (code == DRing::DataTransferEventCode::wait_peer_acceptance) {
timeoutThread_ = std::move(std::unique_ptr<std::thread>(new std::thread([this]() { timeoutThread_ = std::unique_ptr<std::thread>(new std::thread([this]() {
const auto TEN_MIN = 1000 * 60 * 10; const auto TEN_MIN = 1000 * 60 * 10;
const auto SLEEP_DURATION = 100; const auto SLEEP_DURATION = 100;
for (auto i = 0; i < TEN_MIN / SLEEP_DURATION; ++i) { for (auto i = 0; i < TEN_MIN / SLEEP_DURATION; ++i) {
...@@ -396,7 +395,7 @@ SubOutgoingFileTransfer::emit(DRing::DataTransferEventCode code) const ...@@ -396,7 +395,7 @@ SubOutgoingFileTransfer::emit(DRing::DataTransferEventCode code) const
} }
RING_WARN() << "FTP#" << this->getId() << ": timeout. Cancel"; RING_WARN() << "FTP#" << this->getId() << ": timeout. Cancel";
this->closeAndEmit(DRing::DataTransferEventCode::timeout_expired); this->closeAndEmit(DRing::DataTransferEventCode::timeout_expired);
}))); }));
} else if (timeoutThread_) { } else if (timeoutThread_) {
stopTimeout_ = true; stopTimeout_ = true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment