Author: delphij
Date: Tue Feb 26 02:13:02 2013
New Revision: 247300
URL: http://svnweb.freebsd.org/changeset/base/247300
Log:
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
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 01:38:12 2013 (r247299)
+++ head/sys/sys/time.h Tue Feb 26 02:13:02 2013 (r247300)
@@ -156,9 +156,6 @@ 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)
@@ -197,7 +194,7 @@ timeval2bintime(const struct timeval *tv
/* timevaladd and timevalsub are not inlined */
-#endif /* _KERNEL */
+#endif /* __BSD_VISIBLE */
#ifndef _KERNEL /* NetBSD/OpenBSD compatible interfaces
*/
Modified: head/usr.bin/truss/main.c
==============================================================================
--- head/usr.bin/truss/main.c Tue Feb 26 01:38:12 2013 (r247299)
+++ head/usr.bin/truss/main.c Tue Feb 26 02:13:02 2013 (r247300)
@@ -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);
Modified: head/usr.bin/truss/syscalls.c
==============================================================================
--- head/usr.bin/truss/syscalls.c Tue Feb 26 01:38:12 2013
(r247299)
+++ head/usr.bin/truss/syscalls.c Tue Feb 26 02:13:02 2013
(r247300)
@@ -1126,14 +1126,14 @@ print_syscall(struct trussinfo *trussinf
}
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 *trus
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 *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(&total, &sc->time, &total);
+ timespecadd_to(&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 01:38:12 2013 (r247299)
+++ head/usr.bin/truss/truss.h Tue Feb 26 02:13:02 2013 (r247300)
@@ -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; \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
