maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix race downloading into a sink

Browse source 
This fixes 'error 10 while decompressing xz file'.

https://hydra.nixos.org/build/78308551
This commit is contained in:
Eelco Dolstra 2018-07-31 17:26:04 +02:00
parent d9e8ab0ff2
commit 4b4adbc93d
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/download.cc
View file

@ -718,15 +718,17 @@ void Downloader::download(DownloadRequest && request, Sink & sink)
while (true) { while (true) {
checkInterrupt(); checkInterrupt();
/* If no data is available, then wait for the download thread
to wake us up. */
if (state->data.empty()) {
if (state->quit) { if (state->quit) {
if (state->exc) std::rethrow_exception(state->exc); if (state->exc) std::rethrow_exception(state->exc);
break; break;
} }
/* If no data is available, then wait for the download thread
to wake us up. */
if (state->data.empty())
state.wait(state->avail); state.wait(state->avail);
}
/* If data is available, then flush it to the sink and wake up /* If data is available, then flush it to the sink and wake up
the download thread if it's blocked on a full buffer. */ the download thread if it's blocked on a full buffer. */