moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Convert get_update_timediff to integer return value

Browse Source 
We don't need absolute floating point precision at all here; we can
stick to integer land and use milliseconds which are precise enough for
our purposes. This also removes most floating point math out of the
non-update code path.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-12-31 19:18:46 -06:00
parent 819c28bf8c
commit 2ce4f85f1e
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/pacman/callback.c
View File

@ -43,15 +43,19 @@ static off_t list_total = 0.0;
static int on_progress = 0; static int on_progress = 0;
static alpm_list_t *output = NULL; static alpm_list_t *output = NULL;
/* Silly little helper function, determines if the caller needs a visual update /* update speed for the fill_progress based functions */
#define UPDATE_SPEED_MS 200
/**
* Silly little helper function, determines if the caller needs a visual update
* since the last time this function was called. * since the last time this function was called.
* This is made for the two progress bar functions, to prevent flicker * This is made for the two progress bar functions, to prevent flicker.
* * @param first_call 1 on first call for initialization purposes, 0 otherwise
* first_call indicates if this is the first time it is called, for * @return number of milliseconds since last call
* initialization purposes */ */
static double get_update_timediff(int first_call) static long get_update_timediff(int first_call)
{ {
double retval = 0.0; long retval = 0;
static struct timeval last_time = {0, 0}; static struct timeval last_time = {0, 0};
/* on first call, simply set the last time and return */ /* on first call, simply set the last time and return */
@ -59,18 +63,17 @@ static double get_update_timediff(int first_call)
gettimeofday(&last_time, NULL); gettimeofday(&last_time, NULL);
} else { } else {
struct timeval this_time; struct timeval this_time;
double diff_sec, diff_usec; time_t diff_sec;
suseconds_t diff_usec;
gettimeofday(&this_time, NULL); gettimeofday(&this_time, NULL);
diff_sec = this_time.tv_sec - last_time.tv_sec; diff_sec = this_time.tv_sec - last_time.tv_sec;
diff_usec = this_time.tv_usec - last_time.tv_usec; diff_usec = this_time.tv_usec - last_time.tv_usec;
retval = diff_sec + (diff_usec / 1000000.0); retval = (diff_sec * 1000) + (diff_usec / 1000);
/* return 0 and do not update last_time if interval was too short */ /* do not update last_time if interval was too short */
if(retval < UPDATE_SPEED_SEC) { if(retval >= UPDATE_SPEED_MS) {
retval = 0.0;
} else {
last_time = this_time; last_time = this_time;
} }
} }
@ -399,7 +402,7 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent,
if(current != prevcurrent) { if(current != prevcurrent) {
/* update always */ /* update always */
} else if(!pkgname || percent == prevpercent || } else if(!pkgname || percent == prevpercent ||
get_update_timediff(0) < UPDATE_SPEED_SEC) { get_update_timediff(0) < UPDATE_SPEED_MS) {
/* only update the progress bar when we have a package name, the /* only update the progress bar when we have a package name, the
* percentage has changed, and it has been long enough. */ * percentage has changed, and it has been long enough. */
return; return;
@ -534,7 +537,8 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
int totaldownload = 0; int totaldownload = 0;
off_t xfered, total; off_t xfered, total;
double rate = 0.0, timediff = 0.0; double rate = 0.0;
long timediff = 0;
unsigned int eta_h = 0, eta_m = 0, eta_s = 0; unsigned int eta_h = 0, eta_m = 0, eta_s = 0;
double rate_human, xfered_human; double rate_human, xfered_human;
const char *rate_label, *xfered_label; const char *rate_label, *xfered_label;
@ -593,16 +597,17 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
} else if(file_xfered == file_total) { } else if(file_xfered == file_total) {
/* compute final values */ /* compute final values */
struct timeval current_time; struct timeval current_time;
double diff_sec, diff_usec; time_t diff_sec;
suseconds_t diff_usec;
gettimeofday(&current_time, NULL); gettimeofday(&current_time, NULL);
diff_sec = current_time.tv_sec - initial_time.tv_sec; diff_sec = current_time.tv_sec - initial_time.tv_sec;
diff_usec = current_time.tv_usec - initial_time.tv_usec; diff_usec = current_time.tv_usec - initial_time.tv_usec;
timediff = diff_sec + (diff_usec / 1000000.0); timediff = (diff_sec * 1000) + (diff_usec / 1000);
if(timediff > 0.0) { if(timediff > 0) {
rate = xfered / timediff; rate = (double)xfered / (timediff / 1000.0);
/* round elapsed time to the nearest second */ /* round elapsed time (in ms) to the nearest second */
eta_s = (unsigned int)(timediff + 0.5); eta_s = (unsigned int)(timediff + 500) / 1000;
} else { } else {
eta_s = 0; eta_s = 0;
} }
@ -610,11 +615,11 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
/* compute current average values */ /* compute current average values */
timediff = get_update_timediff(0); timediff = get_update_timediff(0);
if(timediff < UPDATE_SPEED_SEC) { if(timediff < UPDATE_SPEED_MS) {
/* return if the calling interval was too short */ /* return if the calling interval was too short */
return; return;
} }
rate = (xfered - xfered_last) / timediff; rate = (double)(xfered - xfered_last) / (timediff / 1000.0);
/* average rate to reduce jumpiness */ /* average rate to reduce jumpiness */
rate = (rate + 2 * rate_last) / 3; rate = (rate + 2 * rate_last) / 3;
if(rate > 0.0) { if(rate > 0.0) {

3
src/pacman/util.h
View File

@ -36,9 +36,6 @@
#define _n(str1, str2, ct) (ct == 1 ? str1 : str2) #define _n(str1, str2, ct) (ct == 1 ? str1 : str2)
#endif #endif
/* update speed for the fill_progress based functions */
#define UPDATE_SPEED_SEC 0.2f
typedef struct _pm_target_t { typedef struct _pm_target_t {
alpm_pkg_t *remove; alpm_pkg_t *remove;
alpm_pkg_t *install; alpm_pkg_t *install;