emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detect clock_gettime(2) and use (if available) for the fetch cb.

Browse Source
This commit is contained in:
Juan RP 2011-12-19 16:41:57 +01:00
parent 866c395d12
commit 6ad7289d68
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/xbps-bin/fetch_cb.c
View File

@ -42,6 +42,20 @@
#include <xbps_api.h> #include <xbps_api.h>
#include "defs.h" #include "defs.h"
#include "config.h"
static void
get_time(struct timeval *tvp)
{
#ifdef HAVE_CLOCK_GETTIME
struct timespec ts;
(void)clock_gettime(CLOCK_MONOTONIC, &ts);
tvp->tv_sec = ts.tv_sec;
tvp->tv_usec = ts.tv_nsec / 1000;
#else
(void)gettimeofday(tvp, NULL);
#endif
}
/* /*
* Compute and display ETA * Compute and display ETA
@ -113,7 +127,7 @@ stat_display(const struct xbps_fetch_cb_data *xfpd, void *cbdata)
struct timeval now; struct timeval now;
char totsize[8], recvsize[8]; char totsize[8], recvsize[8];
gettimeofday(&now, NULL); get_time(&now);
if (now.tv_sec <= xfer->last.tv_sec) if (now.tv_sec <= xfer->last.tv_sec)
return; return;
xfer->last = now; xfer->last = now;
@ -136,7 +150,7 @@ fetch_file_progress_cb(const struct xbps_fetch_cb_data *xfpd, void *cbdata)
if (xfpd->cb_start) { if (xfpd->cb_start) {
/* start transfer stats */ /* start transfer stats */
gettimeofday(&xfer->start, NULL); get_time(&xfer->start);
xfer->last.tv_sec = xfer->last.tv_usec = 0; xfer->last.tv_sec = xfer->last.tv_usec = 0;
} else if (xfpd->cb_update) { } else if (xfpd->cb_update) {
/* update transfer stats */ /* update transfer stats */

23
configure vendored
View File

@ -443,6 +443,29 @@ fi
echo "$PROPLIB." echo "$PROPLIB."
rm -f _$func.c _$func rm -f _$func.c _$func
#
# Check for clock_gettime(3).
#
func=clock_gettime
printf "Checking for $func() ... "
cat <<EOF > _$func.c
#include <time.h>
int main(void) {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
return 0;
}
EOF
if $XCC -lrt _$func.c -o _$func 2>/dev/null; then
echo yes.
echo "CPPFLAGS += -DHAVE_CLOCK_GETTIME" >>$CONFIG_MK
echo "LDFLAGS += -lrt" >>$CONFIG_MK
echo "STATIC_LIBS += -lrt" >>$CONFIG_MK
else
echo no.
fi
rm -f _$func.c _$func
# #
# zlib is required. # zlib is required.
# #