guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstore: extract closures in curl wrapper to methods

Browse Source 
turning them into promises will be much less problematic this way.

Change-Id: I055186a6318fb75c67ae5e7f57561b2cd62d874e
This commit is contained in:
eldritch horrors
2025-06-15 13:36:31 +00:00
parent de89c7f7c8
commit 490c4e3694
1 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/libstore/filetransfer.cc
+34 -27
View File
@@ -928,35 +928,42 @@ struct curlFileTransfer : public FileTransfer
);
}
bool waitForData()
{
/* Grab data if available, otherwise wait for the download
thread to wake us up. */
while (buffered.empty()) {
auto state(transfer->downloadState.lock());
if (!state->data.empty()) {
chunk = std::move(state->data);
buffered = chunk;
totalReceived += chunk.size();
parent.unpause(transfer);
} else if (state->exc) {
std::rethrow_exception(state->exc);
} else if (state->done) {
return false;
} else {
parent.unpause(transfer);
state.wait(transfer->downloadEvent);
}
}
return true;
}
bool restartAndWaitForData()
{
restartTransfer();
return waitForData();
}
bool awaitData()
{
auto waitForData = [&] {
/* Grab data if available, otherwise wait for the download
thread to wake us up. */
while (buffered.empty()) {
auto state(transfer->downloadState.lock());
if (!state->data.empty()) {
chunk = std::move(state->data);
buffered = chunk;
totalReceived += chunk.size();
parent.unpause(transfer);
} else if (state->exc) {
std::rethrow_exception(state->exc);
} else if (state->done) {
return false;
} else {
parent.unpause(transfer);
state.wait(transfer->downloadEvent);
}
}
return true;
};
return withRetries(waitForData, [&] {
restartTransfer();
return waitForData();
});
return withRetries(
[&] { return waitForData(); }, [&] { return restartAndWaitForData(); }
);
}
size_t read(char * data, size_t len) override