svn commit: r344364 - vendor/illumos/dist/lib/libdtrace/common

[Rodney W. Grimes]

> Author: markj
> Date: Wed Feb 20 17:05:13 2019
> New Revision: 344364
> URL: https://svnweb.freebsd.org/changeset/base/344364
> 
> Log:
>   9058 postmortem DTrace frequently broken under vmware
>   
>   illumos/illumos-gate at 793bd7e3617ae7d3d24e8c6b7d6befe35f07ec1f
>   
>   Reviewed by: Tim Kordas <tim.kordas at joyent.com>
>   Reviewed by: Patrick Mooney <patrick.mooney at joyent.com>
>   Reviewed by: Yuri Pankov <yuripv at yuripv.net>
>   Reviewed by: Matthew Ahrens <mahrens at delphix.com>
>   Approved by: Matthew Ahrens <mahrens at delphix.com>
>   Author: Sam Gwydir <sam.gwydir at joyent.com>
> 
> Modified:
>   vendor/illumos/dist/lib/libdtrace/common/dt_consume.c
> 
> Modified: vendor/illumos/dist/lib/libdtrace/common/dt_consume.c
> ==============================================================================
> --- vendor/illumos/dist/lib/libdtrace/common/dt_consume.c	Wed Feb 20 14:12:25 2019	(r344363)
> +++ vendor/illumos/dist/lib/libdtrace/common/dt_consume.c	Wed Feb 20 17:05:13 2019	(r344364)
> @@ -24,7 +24,7 @@
>   */
>  
>  /*
> - * Copyright (c) 2013, Joyent, Inc. All rights reserved.
> + * Copyright (c) 2017, Joyent, Inc. All rights reserved.

This change to this copyright is very questionable.
One should always retain the first date of publication
in a copyright statement.

I do understand your just importing a change from illumous,
but I want it on public record that I have raised issue
with this change to a copyright, and this has nothing to
do with you personally, or you wanting to bring this code
over.

>   * 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)
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org