aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/lib
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2019-02-20 17:10:30 +0000
committerMark Johnston <markj@FreeBSD.org>2019-02-20 17:10:30 +0000
commit9747bd8e02b5e0c06934259a8950eb96ed6b1447 (patch)
treeff24a51560daf9ccbeee9bb1c512436074b12af0 /cddl/contrib/opensolaris/lib
parentcd2e908669a869bc4503f0d79402af810c74e982 (diff)
parentd287d23427d1fe4f198a47538a219ea4ec6b0c04 (diff)
downloadsrc-9747bd8e02b5e0c06934259a8950eb96ed6b1447.tar.gz
src-9747bd8e02b5e0c06934259a8950eb96ed6b1447.zip
MFV r344364:
9058 postmortem DTrace frequently broken under vmware illumos/illumos-gate@793bd7e3617ae7d3d24e8c6b7d6befe35f07ec1f MFC after: 1 week
Notes
Notes: svn path=/head/; revision=344366
Diffstat (limited to 'cddl/contrib/opensolaris/lib')
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
index 62c120388b18..811c88bbf0ad 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
@@ -24,7 +24,7 @@
*/
/*
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2017, Joyent, Inc. All rights reserved.
* Copyright (c) 2012 by Delphix. All rights reserved.
*/
@@ -3040,9 +3040,6 @@ dtrace_consume(dtrace_hdl_t *dtp, FILE *fp,
break;
timestamp = dt_buf_oldest(buf, dtp);
- assert(timestamp >= dtp->dt_last_timestamp);
- dtp->dt_last_timestamp = timestamp;
-
if (timestamp == buf->dtbd_timestamp) {
/*
* We've reached the end of the time covered
@@ -3056,6 +3053,8 @@ dtrace_consume(dtrace_hdl_t *dtp, FILE *fp,
break;
continue;
}
+ assert(timestamp >= dtp->dt_last_timestamp);
+ dtp->dt_last_timestamp = timestamp;
if ((rval = dt_consume_cpu(dtp, fp,
buf->dtbd_cpu, buf, B_TRUE, pf, rf, arg)) != 0)