chiark / gitweb /
Revert "progress: Disable the upload progress for now"
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 17 May 2021 10:16:35 +0000 (11:16 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 17 May 2021 14:00:29 +0000 (15:00 +0100)
This is now done in bundles.rs

This reverts commit 07e26362b74a836d84d8c988bc0169cc3c00d749.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/progress.rs

index 7d234c229f751b40352171d0835bfb35cd58c37b..d395224c33bb515214afb385d743a5a0e7486709 100644 (file)
@@ -155,14 +155,10 @@ impl<R:Read> 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
   }
 }