From 07e26362b74a836d84d8c988bc0169cc3c00d749 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 May 2021 10:35:28 +0100 Subject: [PATCH] progress: Disable the upload progress for now I have realised this can deadlock. Fixing it seems to involve maybe putting Tokio into otter(1) ... Signed-off-by: Ian Jackson --- src/progress.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/progress.rs b/src/progress.rs index d395224c..7d234c22 100644 --- a/src/progress.rs +++ b/src/progress.rs @@ -155,10 +155,14 @@ impl Read for ReadOriginator<'_,R> { #[throws(io::Error)] fn read(&mut self, buf: &mut [u8]) -> usize { let got = self.r.read(buf)?; + if false { + // todo: this has a potential deadlock unless the client is concurrent + // todo: which it currently isn't, so disable it self.counter += got; if self.counter - self.last_report > 10000 { self.report(); } + } got } } -- 2.30.2