d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r344364:

Browse Source 
9058 postmortem DTrace frequently broken under vmware

illumos/illumos-gate@793bd7e361

MFC after:	1 week
This commit is contained in:
Mark Johnston 2019-02-20 17:10:30 +00:00
commit 9747bd8e02
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
View File

@ -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. * Copyright (c) 2012 by Delphix. All rights reserved.
*/ */
@ -3040,9 +3040,6 @@ dtrace_consume(dtrace_hdl_t *dtp, FILE *fp,
break; break;
timestamp = dt_buf_oldest(buf, dtp); timestamp = dt_buf_oldest(buf, dtp);
assert(timestamp >= dtp->dt_last_timestamp);
dtp->dt_last_timestamp = timestamp;
if (timestamp == buf->dtbd_timestamp) { if (timestamp == buf->dtbd_timestamp) {
/* /*
* We've reached the end of the time covered * We've reached the end of the time covered
@ -3056,6 +3053,8 @@ dtrace_consume(dtrace_hdl_t *dtp, FILE *fp,
break; break;
continue; continue;
} }
assert(timestamp >= dtp->dt_last_timestamp);
dtp->dt_last_timestamp = timestamp;
if ((rval = dt_consume_cpu(dtp, fp, if ((rval = dt_consume_cpu(dtp, fp,
buf->dtbd_cpu, buf, B_TRUE, pf, rf, arg)) != 0) buf->dtbd_cpu, buf, B_TRUE, pf, rf, arg)) != 0)