summaryrefslogtreecommitdiff
path: root/usr/src/lib/libdtrace
diff options
context:
space:
mode:
authorSam Gwydir <sam.gwydir@joyent.com>2017-12-12 21:21:08 +0000
committerRobert Mustacchi <rm@joyent.com>2019-01-11 17:09:26 +0000
commit793bd7e3617ae7d3d24e8c6b7d6befe35f07ec1f (patch)
tree3c99fab2a02a82549cb2e0d4d021d0fbe851fcc6 /usr/src/lib/libdtrace
parent33d05bc1b89915cf87dec3f6f9f2d5743fc9ea70 (diff)
downloadillumos-gate-793bd7e3617ae7d3d24e8c6b7d6befe35f07ec1f.tar.gz
9058 postmortem DTrace frequently broken under vmware
Reviewed by: Tim Kordas <tim.kordas@joyent.com> Reviewed by: Patrick Mooney <patrick.mooney@joyent.com> Reviewed by: Yuri Pankov <yuripv@yuripv.net> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Matthew Ahrens <mahrens@delphix.com>
Diffstat (limited to 'usr/src/lib/libdtrace')
-rw-r--r--usr/src/lib/libdtrace/common/dt_consume.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/lib/libdtrace/common/dt_consume.c b/usr/src/lib/libdtrace/common/dt_consume.c
index 7f8c673dbe..549abb2e75 100644
--- a/usr/src/lib/libdtrace/common/dt_consume.c
+++ b/usr/src/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.
*/
@@ -3013,9 +3013,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
@@ -3029,6 +3026,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)