lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libstore: fix download thread notifications

Browse source 
since 4ae6fb5a8f dropping a source of a
download might not properly cancel the associated curl transfer after
the transfer was paused. we have also not unpaused the transfer often
enough, only if the transfer buffer had been drained in its entirety.

Change-Id: Ic9298d9df71daa0f3d1c3fd718ed441edae9e863
This commit is contained in:
eldritch horrors 2024-11-09 01:17:28 +01:00
parent b967f1d5fe
commit 12156d3beb
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/filetransfer.cc
View file

@ -808,7 +808,7 @@ struct curlFileTransfer : public FileTransfer
bool done = false, failed = false;
std::exception_ptr exc;
std::string data;
std::condition_variable avail, request;
std::condition_variable avail;
};
auto _state = std::make_shared<Sync<State>>();
@ -823,7 +823,6 @@ struct curlFileTransfer : public FileTransfer
state->done = true;
state->exc = ex;
state->avail.notify_one();
state->request.notify_one();
},
[_state](std::string_view data) {
auto state(_state->lock());
@ -872,7 +871,11 @@ struct curlFileTransfer : public FileTransfer
// wake up the download thread if it's still going and have it abort
auto state(_state->lock());
state->failed |= !state->done;
state->request.notify_one();
try {
transfer->unpause();
} catch (...) {
ignoreExceptionInDestructor();
}
}
void awaitData(Sync<State>::Lock & state)
@ -894,7 +897,7 @@ struct curlFileTransfer : public FileTransfer
chunk = std::move(state->data);
buffered = chunk;
state->request.notify_one();
transfer->unpause();
}
}