diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2018-08-11 04:26:29 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2018-08-11 04:26:29 +0000 |
| commit | 14b841d4a8e6c25d964f5e3bbda379a1541a27ec (patch) | |
| tree | 01beba21222007fffb9203b614973505da4d8169 /tools/tools/netrate/juggle/juggle.c | |
| parent | 6eeb282e0017163803f12ad57945e00f76c109f8 (diff) | |
| parent | a04ed7615ed26cc2c22286b2f4c624dce23a758f (diff) | |
| download | src-14b841d4a8e6c25d964f5e3bbda379a1541a27ec.tar.gz src-14b841d4a8e6c25d964f5e3bbda379a1541a27ec.zip | |
MFH @ r337607, in preparation for boarding
Notes
Notes:
svn path=/projects/bectl/; revision=337608
Diffstat (limited to 'tools/tools/netrate/juggle/juggle.c')
| -rw-r--r-- | tools/tools/netrate/juggle/juggle.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/tools/tools/netrate/juggle/juggle.c b/tools/tools/netrate/juggle/juggle.c index 804dfc9173e0..226f34ad301a 100644 --- a/tools/tools/netrate/juggle/juggle.c +++ b/tools/tools/netrate/juggle/juggle.c @@ -93,19 +93,6 @@ */ #define PIPELINE_MAX 4 -/* - * As in all programs, steal timespecsub() from time.h. - */ -#define timespecsub(vvp, uvp) \ - do { \ - (vvp)->tv_sec -= (uvp)->tv_sec; \ - (vvp)->tv_nsec -= (uvp)->tv_nsec; \ - if ((vvp)->tv_nsec < 0) { \ - (vvp)->tv_sec--; \ - (vvp)->tv_nsec += 1000000000; \ - } \ - } while (0) - static int udp_create(int *fd1p, int *fd2p) { @@ -277,7 +264,7 @@ juggle(int fd1, int fd2, int pipeline) if (clock_gettime(CLOCK_REALTIME, &tfinish) < 0) err(-1, "juggle: clock_gettime"); - timespecsub(&tfinish, &tstart); + timespecsub(&tfinish, &tstart, &tfinish); return (tfinish); } @@ -373,7 +360,7 @@ thread_juggle(int fd1, int fd2, int pipeline) if (pthread_join(thread, NULL) != 0) err(-1, "thread_juggle: pthread_join"); - timespecsub(&tfinish, &tstart); + timespecsub(&tfinish, &tstart, &tfinish); return (tfinish); } @@ -458,7 +445,7 @@ process_juggle(int fd1, int fd2, int pipeline) if (wpid != pid) errx(-1, "process_juggle: waitpid: pid != wpid"); - timespecsub(&tfinish, &tstart); + timespecsub(&tfinish, &tstart, &tfinish); return (tfinish); } |