[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 05/208: progress: let "current speed" be UL + DL sp
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 05/208: progress: let "current speed" be UL + DL speeds combined |
Date: |
Wed, 09 Aug 2017 17:33:22 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.
commit 1213baba27a30a14f917e3c8c044f22cac2389b6
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Jun 9 11:16:18 2017 +0200
progress: let "current speed" be UL + DL speeds combined
Bug #1556
Reported-by: Paul Harris
Closes #1559
---
lib/progress.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/progress.c b/lib/progress.c
index 1996d78dc..ccabe3c5d 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -380,11 +380,10 @@ int Curl_pgrsUpdate(struct connectdata *conn)
data->progress.lastshow = now.tv_sec;
- /* Let's do the "current speed" thing, which should use the fastest
- of the dl/ul speeds. Store the faster speed at entry 'nowindex'. */
+ /* Let's do the "current speed" thing, with the dl + ul speeds
+ combined. Store the speed at entry 'nowindex'. */
data->progress.speeder[ nowindex ] =
- data->progress.downloaded>data->progress.uploaded?
- data->progress.downloaded:data->progress.uploaded;
+ data->progress.downloaded + data->progress.uploaded;
/* remember the exact time for this moment */
data->progress.speeder_time [ nowindex ] = now;
@@ -433,10 +432,9 @@ int Curl_pgrsUpdate(struct connectdata *conn)
}
}
else
- /* the first second we use the main average */
+ /* the first second we use the average */
data->progress.current_speed =
- (data->progress.ulspeed>data->progress.dlspeed)?
- data->progress.ulspeed:data->progress.dlspeed;
+ data->progress.ulspeed + data->progress.dlspeed;
} /* Calculations end */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] annotated tag gnurl-7.55.0 created (now fe5f0f22e), gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 02/208: dist: make the hugehelp.c not get regenerated unnecessarily, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 17/208: fuzz/README: document how to build, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 13/208: TODO: the generated include file is gone, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 06/208: http-proxy: do the HTTP CONNECT process entirely non-blocking, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 05/208: progress: let "current speed" be UL + DL speeds combined,
gnunet <=
- [GNUnet-SVN] [gnurl] 09/208: curl: allow --header and --proxy-header read from file, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 20/208: dist: add the fuzz dir to the tarball, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 04/208: system.h: fix MinGW build, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 03/208: timers: store internal time stamps as time_t instead of doubles, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 12/208: curl_setup.h: error out on CURL_WANTS_CA_BUNDLE_ENV use, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 07/208: curl/curlver.h: start working on 7.55.0, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 08/208: RELEASE-NOTES: synced with 2ad80eec5, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 11/208: lib/curl_setup.h: remove CURL_WANTS_CA_BUNDLE_ENV, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 18/208: http-proxy: fix build with --disable-proxy or --disable-http, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 15/208: fuzz: bring oss-fuzz initial code converted to C89, gnunet, 2017/08/09