RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 12-May-2017 20:53:26 Branch: rpm-5_4 Handle: 2017051218532600 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmsw.c Log: - split: RIP. Summary: Revision Changes Path 2.20.4.3 +2 -37 rpm/rpmio/rpmsw.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsw.c ============================================================================ $ cvs diff -u -r2.20.4.2 -r2.20.4.3 rpmsw.c --- rpm/rpmio/rpmsw.c 19 Apr 2016 13:01:52 -0000 2.20.4.2 +++ rpm/rpmio/rpmsw.c 12 May 2017 18:53:26 -0000 2.20.4.3 @@ -7,28 +7,14 @@ #include <rpmsw.h> #include "debug.h" -#if defined(__LCLINT__) -/*@-exportheader@*/ -extern int nanosleep(const struct timespec *__requested_time, - /*@out@*/ /*@null@*/ struct timespec *__remaining) - /*@globals errno @*/ - /*@modifies *__remaining, errno @*/; -/*@=exportheader@*/ -#endif - -/*@unchecked@*/ int _rpmsw_stats = 0; -/*@unchecked@*/ static rpmtime_t rpmsw_overhead = 0; -/*@unchecked@*/ static rpmtime_t rpmsw_cycles = 1; -/*@unchecked@*/ static int rpmsw_type = 0; -/*@unchecked@*/ static int rpmsw_initialized = 0; #if defined(__linux__) && defined(__i386__) && !defined(RPM_VENDOR_PLD) @@ -109,9 +95,8 @@ */ RPM_GNUC_PURE static inline -rpmtime_t tvsub(/*@null@*/ const struct timeval * etv, - /*@null@*/ const struct timeval * btv) - /*@*/ +rpmtime_t tvsub(const struct timeval * etv, + const struct timeval * btv) { time_t secs, usecs; if (etv == NULL || btv == NULL) return 0; @@ -148,8 +133,6 @@ #if defined(HP_TIMING_NOW) static rpmtime_t rpmswCalibrate(void) - /*@globals internalState @*/ - /*@modifies internalState @*/ { struct rpmsw_s begin, end; rpmtime_t ticks; @@ -157,9 +140,7 @@ int rc; int i; -/*@-uniondef@*/ (void) rpmswNow(&begin); -/*@=uniondef@*/ req.tv_sec = 0; req.tv_nsec = 20 * 1000 * 1000; for (i = 0; i < 100; i++) { @@ -170,19 +151,13 @@ break; req = rem; /* structure assignment */ } -/*@-uniondef@*/ ticks = rpmswDiff(rpmswNow(&end), &begin); -/*@=uniondef@*/ return ticks; } #endif rpmtime_t rpmswInit(void) - /*@globals rpmsw_cycles, rpmsw_initialized, rpmsw_overhead, - rpmsw_type @*/ - /*@modifies rpmsw_cycles, rpmsw_initialized, rpmsw_overhead, - rpmsw_type @*/ { struct rpmsw_s begin, end; rpmtime_t sum_overhead = 0; @@ -208,9 +183,7 @@ /* Start wall clock. */ rpmsw_type = 0; -/*@-uniondef@*/ (void) rpmswNow(&begin); -/*@=uniondef@*/ /* Get no. of cycles while doing nanosleep. */ rpmsw_type = 1; @@ -221,9 +194,7 @@ /* Compute wall clock delta in usecs. */ rpmsw_type = 0; -/*@-uniondef@*/ sum_usecs += rpmswDiff(rpmswNow(&end), &begin); -/*@=uniondef@*/ rpmsw_type = 1; /* Compute cycles/usec */ @@ -234,10 +205,8 @@ #endif /* Calculate timing overhead in usecs. */ -/*@-uniondef@*/ (void) rpmswNow(&begin); sum_overhead += rpmswDiff(rpmswNow(&end), &begin); -/*@=uniondef@*/ rpmsw_overhead = sum_overhead/(i+1); @@ -256,9 +225,7 @@ op->bytes = 0; op->usecs = 0; } -/*@-uniondef@*/ (void) rpmswNow(&op->begin); -/*@=uniondef@*/ return 0; } @@ -269,9 +236,7 @@ if (op == NULL) return 0; -/*@-uniondef@*/ op->usecs += rpmswDiff(rpmswNow(&end), &op->begin); -/*@=uniondef@*/ if (rc > 0) op->bytes += rc; op->begin = end; /* structure assignment */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
