diff options
| author | pfg <pfg@FreeBSD.org> | 2015-06-07 21:14:48 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2015-06-07 21:14:48 +0000 |
| commit | e14a5416a58c8d41d05b81855bac377292691bca (patch) | |
| tree | 9606e1edc21e1b1eb4f5837c36799d7c35eae941 /sys/cddl | |
| parent | 5c276e329ddaed9d4f6f4210e9fb9d4c349081f6 (diff) | |
| download | FreeBSD-src-e14a5416a58c8d41d05b81855bac377292691bca.zip FreeBSD-src-e14a5416a58c8d41d05b81855bac377292691bca.tar.gz | |
MFC r278167, MFV r266995:
4767 dtrace_probe() always has the timestamp
Reference:
https://illumos.org/issues/4767
Obtained from: Illumos
Diffstat (limited to 'sys/cddl')
| -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 5ce6166..0a38cff 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. */ /* @@ -7087,7 +7087,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) |
