aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2019-02-20 17:05:13 +0000
committerMark Johnston <markj@FreeBSD.org>2019-02-20 17:05:13 +0000
commitd287d23427d1fe4f198a47538a219ea4ec6b0c04 (patch)
tree10c29fff387b5b2972f194512fae7af7b88413eb /lib
parent207bd3fed67f7228191c53a2bdadb135476271b0 (diff)
downloadsrc-d287d23427d1fe4f198a47538a219ea4ec6b0c04.tar.gz
src-d287d23427d1fe4f198a47538a219ea4ec6b0c04.zip
9058 postmortem DTrace frequently broken under vmware
illumos/illumos-gate@793bd7e3617ae7d3d24e8c6b7d6befe35f07ec1f 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> Author: Sam Gwydir <sam.gwydir@joyent.com>
Notes
Notes: svn path=/vendor/illumos/dist/; revision=344364
Diffstat (limited to 'lib')
-rw-r--r--lib/libdtrace/common/dt_consume.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libdtrace/common/dt_consume.c b/lib/libdtrace/common/dt_consume.c
index fff0616e23dd..fe2f4c697006 100644
--- a/lib/libdtrace/common/dt_consume.c
+++ b/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.
*/
@@ -3010,9 +3010,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
@@ -3026,6 +3023,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)