summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2013-02-26 02:13:02 +0000
committerdelphij <delphij@FreeBSD.org>2013-02-26 02:13:02 +0000
commit6eb36900d3b68eef8de23beb09bb58794733617f (patch)
tree27e9d89610129335f9930bce3cdb6e8339c0c5ee /usr.bin
parentcb47f0509be0470c174870a68ed3c1d94eb52ed7 (diff)
downloadFreeBSD-src-6eb36900d3b68eef8de23beb09bb58794733617f.zip
FreeBSD-src-6eb36900d3b68eef8de23beb09bb58794733617f.tar.gz
Expose timespec and timeval macros when __BSD_VISIBLE is defined. This
allows userland application to use the following macros: timespecclear, timespecisset, timespeccmp, timespecadd, timespecsub; timevalclear, timevalisset, timevalcmp. MFC after: 1 month
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/truss/main.c8
-rw-r--r--usr.bin/truss/syscalls.c10
-rw-r--r--usr.bin/truss/truss.h4
3 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 4e9f74b..7b8242b 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(&trussinfo->curthread->after,
+ timespecsubt_to(&trussinfo->curthread->after,
&trussinfo->start_time, &timediff);
fprintf(trussinfo->outfile, "%ld.%09ld ",
(long)timediff.tv_sec,
timediff.tv_nsec);
}
if (trussinfo->flags & RELATIVETIMESTAMPS) {
- timespecsubt(&trussinfo->curthread->after,
+ timespecsubt_to(&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(&trussinfo->curthread->after,
+ timespecsubt_to(&trussinfo->curthread->after,
&trussinfo->start_time, &timediff);
fprintf(trussinfo->outfile, "%ld.%09ld ",
(long)timediff.tv_sec,
timediff.tv_nsec);
}
if (trussinfo->flags & RELATIVETIMESTAMPS) {
- timespecsubt(&trussinfo->curthread->after,
+ timespecsubt_to(&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 0afd083..c926af2 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(&trussinfo->curthread->after,
+ timespecsubt_to(&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(&trussinfo->curthread->after,
+ timespecsubt_to(&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(&trussinfo->curthread->after,
+ timespecsubt_to(&trussinfo->curthread->after,
&trussinfo->curthread->before, &timediff);
- timespecadd(&sc->time, &timediff, &sc->time);
+ timespecadd_to(&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(&total, &sc->time, &total);
+ timespecadd_to(&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 dcc86a5..ea954e8 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(tvp, uvp, vvp) \
+#define timespecsubt_to(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(tvp, uvp, vvp) \
+#define timespecadd_to(tvp, uvp, vvp) \
do { \
(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
(vvp)->tv_nsec = (tvp)->tv_nsec + (uvp)->tv_nsec; \
OpenPOWER on IntegriCloud