diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-06-09 11:16:18 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-06-14 23:30:54 +0200 |
| commit | 1213baba27a30a14f917e3c8c044f22cac2389b6 (patch) | |
| tree | 2be4d13fbed6980ac6224481af06644207f1f9d8 | |
| parent | 31a67ac1f1f23f9395087f047486d97cddb58ea6 (diff) | |
| download | curl-1213baba27a30a14f917e3c8c044f22cac2389b6.tar.gz | |
progress: let "current speed" be UL + DL speeds combined
Bug #1556
Reported-by: Paul Harris
Closes #1559
| -rw-r--r-- | lib/progress.c | 12 |
1 files 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 */ |