Date: Tue, 26 Feb 2013 19:46:59 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r247338 - in head: sys/sys usr.bin/truss Message-ID: <201302261946.r1QJkxcK038276@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue Feb 26 19:46:59 2013 New Revision: 247338 URL: http://svnweb.freebsd.org/changeset/base/247338 Log: Revert r247300 for now. I'll post a new changeset for review. Modified: head/sys/sys/time.h head/usr.bin/truss/main.c head/usr.bin/truss/syscalls.c head/usr.bin/truss/truss.h Modified: head/sys/sys/time.h ============================================================================== --- head/sys/sys/time.h Tue Feb 26 19:46:02 2013 (r247337) +++ head/sys/sys/time.h Tue Feb 26 19:46:59 2013 (r247338) @@ -156,6 +156,9 @@ timeval2bintime(const struct timeval *tv /* 18446744073709 = int(2^64 / 1000000) */ bt->frac = tv->tv_usec * (uint64_t)18446744073709LL; } +#endif /* __BSD_VISIBLE */ + +#ifdef _KERNEL /* Operations on timespecs */ #define timespecclear(tvp) ((tvp)->tv_sec = (tvp)->tv_nsec = 0) @@ -194,7 +197,7 @@ timeval2bintime(const struct timeval *tv /* timevaladd and timevalsub are not inlined */ -#endif /* __BSD_VISIBLE */ +#endif /* _KERNEL */ #ifndef _KERNEL /* NetBSD/OpenBSD compatible interfaces */ Modified: head/usr.bin/truss/main.c ============================================================================== --- head/usr.bin/truss/main.c Tue Feb 26 19:46:02 2013 (r247337) +++ head/usr.bin/truss/main.c Tue Feb 26 19:46:59 2013 (r247338) @@ -323,14 +323,14 @@ START_TRACE: fprintf(trussinfo->outfile, "%5d: ", trussinfo->pid); if (trussinfo->flags & ABSOLUTETIMESTAMPS) { - timespecsubt_to(&trussinfo->curthread->after, + timespecsubt(&trussinfo->curthread->after, &trussinfo->start_time, &timediff); fprintf(trussinfo->outfile, "%ld.%09ld ", (long)timediff.tv_sec, timediff.tv_nsec); } if (trussinfo->flags & RELATIVETIMESTAMPS) { - timespecsubt_to(&trussinfo->curthread->after, + timespecsubt(&trussinfo->curthread->after, &trussinfo->curthread->before, &timediff); fprintf(trussinfo->outfile, "%ld.%09ld ", (long)timediff.tv_sec, @@ -349,14 +349,14 @@ START_TRACE: fprintf(trussinfo->outfile, "%5d: ", trussinfo->pid); if (trussinfo->flags & ABSOLUTETIMESTAMPS) { - timespecsubt_to(&trussinfo->curthread->after, + timespecsubt(&trussinfo->curthread->after, &trussinfo->start_time, &timediff); fprintf(trussinfo->outfile, "%ld.%09ld ", (long)timediff.tv_sec, timediff.tv_nsec); } if (trussinfo->flags & RELATIVETIMESTAMPS) { - timespecsubt_to(&trussinfo->curthread->after, + timespecsubt(&trussinfo->curthread->after, &trussinfo->curthread->before, &timediff); fprintf(trussinfo->outfile, "%ld.%09ld ", (long)timediff.tv_sec, timediff.tv_nsec); Modified: head/usr.bin/truss/syscalls.c ============================================================================== --- head/usr.bin/truss/syscalls.c Tue Feb 26 19:46:02 2013 (r247337) +++ head/usr.bin/truss/syscalls.c Tue Feb 26 19:46:59 2013 (r247338) @@ -1126,14 +1126,14 @@ print_syscall(struct trussinfo *trussinf } if (trussinfo->flags & ABSOLUTETIMESTAMPS) { - timespecsubt_to(&trussinfo->curthread->after, + timespecsubt(&trussinfo->curthread->after, &trussinfo->start_time, &timediff); len += fprintf(trussinfo->outfile, "%ld.%09ld ", (long)timediff.tv_sec, timediff.tv_nsec); } if (trussinfo->flags & RELATIVETIMESTAMPS) { - timespecsubt_to(&trussinfo->curthread->after, + timespecsubt(&trussinfo->curthread->after, &trussinfo->curthread->before, &timediff); len += fprintf(trussinfo->outfile, "%ld.%09ld ", (long)timediff.tv_sec, timediff.tv_nsec); @@ -1165,9 +1165,9 @@ print_syscall_ret(struct trussinfo *trus if (!sc) return; clock_gettime(CLOCK_REALTIME, &trussinfo->curthread->after); - timespecsubt_to(&trussinfo->curthread->after, + timespecsubt(&trussinfo->curthread->after, &trussinfo->curthread->before, &timediff); - timespecadd_to(&sc->time, &timediff, &sc->time); + timespecadd(&sc->time, &timediff, &sc->time); sc->ncalls++; if (errorp) sc->nerror++; @@ -1205,7 +1205,7 @@ print_summary(struct trussinfo *trussinf fprintf(trussinfo->outfile, "%-20s%5jd.%09ld%8d%8d\n", sc->name, (intmax_t)sc->time.tv_sec, sc->time.tv_nsec, sc->ncalls, sc->nerror); - timespecadd_to(&total, &sc->time, &total); + timespecadd(&total, &sc->time, &total); ncall += sc->ncalls; nerror += sc->nerror; } Modified: head/usr.bin/truss/truss.h ============================================================================== --- head/usr.bin/truss/truss.h Tue Feb 26 19:46:02 2013 (r247337) +++ head/usr.bin/truss/truss.h Tue Feb 26 19:46:59 2013 (r247338) @@ -62,7 +62,7 @@ struct trussinfo SLIST_HEAD(, threadinfo) threadlist; }; -#define timespecsubt_to(tvp, uvp, vvp) \ +#define timespecsubt(tvp, uvp, vvp) \ do { \ (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ (vvp)->tv_nsec = (tvp)->tv_nsec - (uvp)->tv_nsec; \ @@ -72,7 +72,7 @@ struct trussinfo } \ } while (0) -#define timespecadd_to(tvp, uvp, vvp) \ +#define timespecadd(tvp, uvp, vvp) \ do { \ (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \ (vvp)->tv_nsec = (tvp)->tv_nsec + (uvp)->tv_nsec; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302261946.r1QJkxcK038276>