Mercurial > unleashed > wips
changeset 20589:aa25cce74feb
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>
| author | Sam Gwydir <sam.gwydir@joyent.com> |
|---|---|
| date | Tue, 12 Dec 2017 21:21:08 +0000 |
| parents | 984557463fd0 |
| children | 2e72e1807428 |
| files | usr/src/lib/libdtrace/common/dt_consume.c |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/libdtrace/common/dt_consume.c Wed Jan 09 14:00:14 2019 +0000 +++ b/usr/src/lib/libdtrace/common/dt_consume.c Tue Dec 12 21:21:08 2017 +0000 @@ -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 @@ 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 @@ 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)