Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=5e88fca7959b4d5e2a3e84d2f7c8c7b9e100690b

commit 5e88fca7959b4d5e2a3e84d2f7c8c7b9e100690b
Author: Michel Hermier <[email protected]>
Date:   Thu Nov 28 11:36:00 2013 +0100

libpacman: Implement download avg and rate computation.

diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c
index 50e5c2d..8eb0a55 100644
--- a/lib/libpacman/server.c
+++ b/lib/libpacman/server.c
@@ -149,11 +149,21 @@ int _pacman_curl_progresscb(void *clientp, double 
dltotal, double dlnow, double
{
if(dltotal > 0 && dlnow > 0) {
pmcurldownloader_t *curldownloader = clientp;
-               pmdownloadstate_t *downloadstate = 
&curldownloader->downloadstate;
+               pmdownload_t *download = &curldownloader->download;
+               struct timeval now;
+               double time_delta;
+
+               gettimeofday(&now, NULL);
+               download->dst_tell = download->dst_resume + dlnow;
+               download->dst_size = download->dst_resume + dltotal;
+               if((time_delta = f_difftimeval(curldownloader->previous_update, 
now)) > 1) {
+                       curldownloader->download.dst_avg = dltotal / 
f_difftimeval(curldownloader->download.dst_begin, now);
+                       curldownloader->download.dst_rate = 
(curldownloader->previous_update_dltotal - dltotal) / time_delta;
+                       curldownloader->previous_update = now;
+                       curldownloader->previous_update_dltotal = dltotal;
+               }

-               downloadstate->dst_tell = downloadstate->dst_resume + dlnow;
-               downloadstate->dst_size = downloadstate->dst_resume + dltotal;
-               pm_dlcb(downloadstate);
+               pm_dlcb(download);
}
return 0;
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to