diff options
| author | delphij <delphij@FreeBSD.org> | 2013-02-26 19:46:59 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-02-26 19:46:59 +0000 |
| commit | 8ef4aa5bd21ae8102697ecd2da0df25171c19c55 (patch) | |
| tree | f9dc5cec16fbff930a511212f6779256f4365a31 /usr.bin/truss | |
| parent | 50cba338c890752495578e5210b50e2c299a9058 (diff) | |
| download | FreeBSD-src-8ef4aa5bd21ae8102697ecd2da0df25171c19c55.zip FreeBSD-src-8ef4aa5bd21ae8102697ecd2da0df25171c19c55.tar.gz | |
Revert r247300 for now. I'll post a new changeset for review.
Diffstat (limited to 'usr.bin/truss')
| -rw-r--r-- | usr.bin/truss/main.c | 8 | ||||
| -rw-r--r-- | usr.bin/truss/syscalls.c | 10 | ||||
| -rw-r--r-- | usr.bin/truss/truss.h | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c index 7b8242b..4e9f74b 100644 --- a/usr.bin/truss/main.c +++ b/usr.bin/truss/main.c @@ -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); diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c index c926af2..0afd083 100644 --- a/usr.bin/truss/syscalls.c +++ b/usr.bin/truss/syscalls.c @@ -1126,14 +1126,14 @@ print_syscall(struct trussinfo *trussinfo, const char *name, int nargs, } 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 *trussinfo, const char *name, int nargs, 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 *trussinfo) 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; } diff --git a/usr.bin/truss/truss.h b/usr.bin/truss/truss.h index ea954e8..dcc86a5 100644 --- a/usr.bin/truss/truss.h +++ b/usr.bin/truss/truss.h @@ -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; \ |
