diff options
| author | pfg <pfg@FreeBSD.org> | 2015-02-03 20:06:30 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2015-02-03 20:06:30 +0000 |
| commit | 8156f15777d30e316700a6f4b31f17911656fe3d (patch) | |
| tree | 3f91fa293a6c7841d35bdb2ad956c4596dd1fba7 /sys/cddl/contrib/opensolaris/uts/common/dtrace | |
| parent | 8afbe75ac6001979e4aff5555f039dc3fd5fcceb (diff) | |
| download | FreeBSD-src-8156f15777d30e316700a6f4b31f17911656fe3d.zip FreeBSD-src-8156f15777d30e316700a6f4b31f17911656fe3d.tar.gz | |
MFV r266995:
4767 dtrace_probe() always has the timestamp
Reference:
https://illumos.org/issues/4767
Obtained from: Illumos
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/dtrace')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 5a8d290..68e8161 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -24,7 +24,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. */ /* @@ -7083,7 +7083,8 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1, return; } - now = dtrace_gethrtime(); + now = mstate.dtms_timestamp = dtrace_gethrtime(); + mstate.dtms_present |= DTRACE_MSTATE_TIMESTAMP; vtime = dtrace_vtime_references != 0; if (vtime && curthread->t_dtrace_start) |
