From 78fea899e0ea79447f64bfd2804cae84bba3b2f8 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Thu, 9 Feb 2023 13:56:50 +0100 Subject: [PATCH 1/3] Check interupts even when download stalled --- src/libstore/filetransfer.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index 756bd4423..2818043e8 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -828,16 +828,15 @@ void FileTransfer::download(FileTransferRequest && request, Sink & sink) { auto state(_state->lock()); - while (state->data.empty()) { - - if (state->quit) { - if (state->exc) std::rethrow_exception(state->exc); - return; - } - - state.wait(state->avail); + if (state->quit) { + if (state->exc) std::rethrow_exception(state->exc); + return; } + state.wait(state->avail); + + if (state->data.empty()) continue; + chunk = std::move(state->data); state->request.notify_one(); From aa18404ecb1fd9cbcb663355e8f5c26ff2b00694 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 10 Feb 2023 00:54:29 +0100 Subject: [PATCH 2/3] Flush data when download ends --- src/libstore/filetransfer.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index 2818043e8..a9a5d1389 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -828,17 +828,18 @@ void FileTransfer::download(FileTransferRequest && request, Sink & sink) { auto state(_state->lock()); - if (state->quit) { - if (state->exc) std::rethrow_exception(state->exc); - return; + if (state->data.empty()) { + if (state->quit) { + if (state->exc) std::rethrow_exception(state->exc); + return; + } + + state.wait(state->avail); + + if (state->data.empty()) continue; } - state.wait(state->avail); - - if (state->data.empty()) continue; - chunk = std::move(state->data); - state->request.notify_one(); } From e6ad8e844029ac340dc3f2a4693c3f4a1d645226 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 10 Feb 2023 00:57:56 +0100 Subject: [PATCH 3/3] nit: cleaner diff --- src/libstore/filetransfer.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index a9a5d1389..3ca40db72 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -829,6 +829,7 @@ void FileTransfer::download(FileTransferRequest && request, Sink & sink) auto state(_state->lock()); if (state->data.empty()) { + if (state->quit) { if (state->exc) std::rethrow_exception(state->exc); return; @@ -840,6 +841,7 @@ void FileTransfer::download(FileTransferRequest && request, Sink & sink) } chunk = std::move(state->data); + state->request.notify_one(); }