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

commit b34e0f58ae506ec79948531845b86b38b48c2352
Author: Michel Hermier <[email protected]>
Date:   Thu Nov 28 11:56:12 2013 +0100

libpacman: Remove PM_OPT_DLRATE.

diff --git a/doc/libpacman-changes.txt b/doc/libpacman-changes.txt
index 618cf99..e045aa6 100644
--- a/doc/libpacman-changes.txt
+++ b/doc/libpacman-changes.txt
@@ -76,7 +76,7 @@ PM_TRANS_SYNCPKGS: Access to transaction syncpkgs list.

==== Symbols removed:

-PM_NETBUF, PM_OPT_DLOFFSET, PM_OPT_DLT0: Remove due to code refactor so public 
API does not try to hide that it use libftp internal callback. See 
pacman_trans_cb_download changes.
+PM_NETBUF, PM_OPT_DLRATE, PM_OPT_DLOFFSET, PM_OPT_DLT0: Removed due to code 
refactor so public API does not try to hide that it use libftp internal 
callback. See pacman_trans_cb_download changes.

PM_TRANS: Unused in the public API.

diff --git a/lib/libpacman/handle.c b/lib/libpacman/handle.c
index 0f320d9..90c330d 100644
--- a/lib/libpacman/handle.c
+++ b/lib/libpacman/handle.c
@@ -236,9 +236,6 @@ int _pacman_handle_set_option(pmhandle_t *ph, unsigned char 
val, unsigned long d
case PM_OPT_DLT:
pm_dlt = (struct timeval *)data;
break;
-               case PM_OPT_DLRATE:
-                       pm_dlrate = (float *)data;
-               break;
case PM_OPT_DLXFERED1:
pm_dlxfered1 = (int *)data;
break;
@@ -346,7 +343,6 @@ int _pacman_handle_get_option(pmhandle_t *ph, unsigned char 
val, long *data)
case PM_OPT_LOGMASK:   *data = pm_logmask; break;
case PM_OPT_DLFNM:     *data = (long)pm_dlfnm; break;
case PM_OPT_DLT:       *data = (long)pm_dlt; break;
-               case PM_OPT_DLRATE:    *data = (long)pm_dlrate; break;
case PM_OPT_DLXFERED1: *data = (long)pm_dlxfered1; break;
case PM_OPT_DLETA_H:   *data = (long)pm_dleta_h; break;
case PM_OPT_DLETA_M:   *data = (long)pm_dleta_m; break;
diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h
index 1534a69..44573c5 100644
--- a/lib/libpacman/pacman.h
+++ b/lib/libpacman/pacman.h
@@ -119,7 +119,6 @@ enum {
PM_OPT_DLCB,
PM_OPT_DLFNM,
PM_OPT_DLT,
-       PM_OPT_DLRATE,
PM_OPT_DLXFERED1,
PM_OPT_DLETA_H,
PM_OPT_DLETA_M,
diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c
index ca3691e..ccd03a5 100644
--- a/lib/libpacman/server.c
+++ b/lib/libpacman/server.c
@@ -48,7 +48,6 @@ pacman_trans_cb_download pm_dlcb = NULL;
/* progress bar */
char *pm_dlfnm=NULL;
struct timeval *pm_dlt=NULL;
-float *pm_dlrate=NULL;
int *pm_dlxfered1=NULL;
unsigned int *pm_dleta_h=NULL, *pm_dleta_m=NULL, *pm_dleta_s=NULL;

@@ -233,9 +232,8 @@ pmdownloadsuccess_t 
_pacman_curl_download(pmcurldownloader_t *curldownloader, co

/* ETA setup */
gettimeofday(&curldownloader->download.dst_begin, NULL);
-       if(pm_dlt && pm_dlrate && pm_dlxfered1 && pm_dleta_h && pm_dleta_m && 
pm_dleta_s) {
+       if(pm_dlt && pm_dlxfered1 && pm_dleta_h && pm_dleta_m && pm_dleta_s) {
*pm_dlt = curldownloader->download.dst_begin;
-               *pm_dlrate = 0;
*pm_dlxfered1 = 0;
*pm_dleta_h = 0;
*pm_dleta_m = 0;
diff --git a/lib/libpacman/server.h b/lib/libpacman/server.h
index 8fc8d31..aa71913 100644
--- a/lib/libpacman/server.h
+++ b/lib/libpacman/server.h
@@ -67,7 +67,6 @@ extern pacman_trans_cb_download pm_dlcb;
/* progress bar */
extern char *pm_dlfnm;
extern struct timeval *pm_dlt;
-extern float *pm_dlrate;
extern int *pm_dlxfered1;
extern unsigned int *pm_dleta_h, *pm_dleta_m, *pm_dleta_s;

diff --git a/src/pacman-g2/download.c b/src/pacman-g2/download.c
index c2738c5..25cdc4d 100644
--- a/src/pacman-g2/download.c
+++ b/src/pacman-g2/download.c
@@ -42,7 +42,6 @@
/* progress bar */
char sync_fnm[PM_DLFNM_LEN+1];
struct timeval t;
-float rate;
int xfered1;
unsigned int eta_h, eta_m, eta_s, remain, howmany;

@@ -60,6 +59,7 @@ int log_progress(const pmdownload_t *download)
unsigned int i, cur;
struct timeval t1;
float timediff;
+       double rate;
/* a little hard to conceal easter eggs in open-source software, but
* they're still fun.  ;)
*/
@@ -97,8 +97,7 @@ int log_progress(const pmdownload_t *download)
timediff = t1.tv_sec-t.tv_sec + (float)(t1.tv_usec-t.tv_usec) / 1000000;

if(xfered+offset == fsz) {
-               /* average download rate */
-               rate = xfered / (timediff * 1024);
+               pacman_download_avg(download, &rate);
/* total download time */
eta_s = (int)timediff;
eta_h = eta_s / 3600;
@@ -108,7 +107,7 @@ int log_progress(const pmdownload_t *download)
} else if(timediff > 1) {
/* we avoid computing the rate & ETA on too small periods of time, so that
results are more significant */
-               rate = (xfered-xfered1) / (timediff * 1024);
+               pacman_download_rate(download, &rate);
xfered1 = xfered;
gettimeofday(&t, NULL);
eta_s = (fsz-(xfered+offset)) / (rate * 1024);
@@ -117,6 +116,7 @@ int log_progress(const pmdownload_t *download)
eta_m = eta_s / 60;
eta_s -= eta_m * 60;
}
+       rate /= 1024; /* convert to KB/s */

// if the package name is too long, then slice the ending
maxpkglen=DLFNM_PROGRESS_LEN-(3+2*(int)log10(howmany));
diff --git a/src/pacman-g2/download.h b/src/pacman-g2/download.h
index dec01ff..ac6d7c3 100644
--- a/src/pacman-g2/download.h
+++ b/src/pacman-g2/download.h
@@ -28,7 +28,6 @@
extern char sync_fnm[PM_DLFNM_LEN+1];
extern int offset;
extern struct timeval t;
-extern float rate;
extern int xfered1;
extern unsigned int eta_h, eta_m, eta_s, remain, howmany;

diff --git a/src/pacman-g2/pacman-g2.c b/src/pacman-g2/pacman-g2.c
index b33a539..c63ccb9 100644
--- a/src/pacman-g2/pacman-g2.c
+++ b/src/pacman-g2/pacman-g2.c
@@ -577,10 +577,6 @@ int main(int argc, char *argv[])
ERR(NL, _("failed to set option DLT (%s)\n"), pacman_strerror(pm_errno));
cleanup(1);
}
-       if(pacman_set_option(PM_OPT_DLRATE, (long)&rate) == -1) {
-               ERR(NL, _("failed to set option DLRATE (%s)\n"), 
pacman_strerror(pm_errno));
-               cleanup(1);
-       }
if(pacman_set_option(PM_OPT_DLXFERED1, (long)&xfered1) == -1) {
ERR(NL, _("failed to set option DLXFERED1 (%s)\n"), pacman_strerror(pm_errno));
cleanup(1);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to