[DTrace-devel] [PATCH REVIEW 3/6] errors: invalid probe IDs should return EDT_BADID, as in v1

[Kris Van Hees]

Reviewed-by: Kris Van Hees (kris.van.hees at oracle.com>

... and I added it to the 'dev' branch already.

On Thu, Sep 09, 2021 at 12:13:42PM +0100, Nick Alcock wrote:
> They were returning EDT_NOPROBE, causing several tests for -i to fail.
> 
> Signed-off-by: Nick Alcock <nick.alcock at oracle.com>
> ---
>  libdtrace/dt_probe.c                                 | 4 ++--
>  test/unittest/dtrace-util/tst.InvalidTraceID1.sh     | 1 -
>  test/unittest/dtrace-util/tst.InvalidTraceID3.sh     | 1 -
>  test/unittest/dtrace-util/tst.InvalidTraceID7.sh     | 1 -
>  test/unittest/dtrace-util/tst.ZeroProbeIdentifier.sh | 1 -
>  5 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/libdtrace/dt_probe.c b/libdtrace/dt_probe.c
> index 330b3f40bc75..d41253748f03 100644
> --- a/libdtrace/dt_probe.c
> +++ b/libdtrace/dt_probe.c
> @@ -1423,11 +1423,11 @@ dtrace_id2desc(dtrace_hdl_t *dtp, dtrace_id_t id, dtrace_probedesc_t *pdp)
>  	dt_probe_t	*prp;
>  
>  	if (id >= dtp->dt_probe_id)
> -		return dt_set_errno(dtp, EDT_NOPROBE);
> +		return dt_set_errno(dtp, EDT_BADID);
>  
>  	prp = dtp->dt_probes[id];
>  	if (!prp)
> -		return dt_set_errno(dtp, EDT_NOPROBE);
> +		return dt_set_errno(dtp, EDT_BADID);
>  
>  	memcpy(pdp, prp->desc, sizeof(dtrace_probedesc_t));
>  
> diff --git a/test/unittest/dtrace-util/tst.InvalidTraceID1.sh b/test/unittest/dtrace-util/tst.InvalidTraceID1.sh
> index 16bcb4c07e5f..65fba0ece483 100755
> --- a/test/unittest/dtrace-util/tst.InvalidTraceID1.sh
> +++ b/test/unittest/dtrace-util/tst.InvalidTraceID1.sh
> @@ -5,7 +5,6 @@
>  # Licensed under the Universal Permissive License v 1.0 as shown at
>  # http://oss.oracle.com/licenses/upl.
>  #
> -# @@xfail: dtv2
>  
>  ##
>  #
> diff --git a/test/unittest/dtrace-util/tst.InvalidTraceID3.sh b/test/unittest/dtrace-util/tst.InvalidTraceID3.sh
> index 93e542a3d150..04890ec97a97 100755
> --- a/test/unittest/dtrace-util/tst.InvalidTraceID3.sh
> +++ b/test/unittest/dtrace-util/tst.InvalidTraceID3.sh
> @@ -5,7 +5,6 @@
>  # Licensed under the Universal Permissive License v 1.0 as shown at
>  # http://oss.oracle.com/licenses/upl.
>  #
> -# @@xfail: dtv2
>  
>  ##
>  #
> diff --git a/test/unittest/dtrace-util/tst.InvalidTraceID7.sh b/test/unittest/dtrace-util/tst.InvalidTraceID7.sh
> index f350b5e1025c..b43f4bf5ce18 100755
> --- a/test/unittest/dtrace-util/tst.InvalidTraceID7.sh
> +++ b/test/unittest/dtrace-util/tst.InvalidTraceID7.sh
> @@ -5,7 +5,6 @@
>  # Licensed under the Universal Permissive License v 1.0 as shown at
>  # http://oss.oracle.com/licenses/upl.
>  #
> -# @@xfail: dtv2
>  
>  ##
>  #
> diff --git a/test/unittest/dtrace-util/tst.ZeroProbeIdentifier.sh b/test/unittest/dtrace-util/tst.ZeroProbeIdentifier.sh
> index 0862e90b24e9..1593691b9b8b 100755
> --- a/test/unittest/dtrace-util/tst.ZeroProbeIdentifier.sh
> +++ b/test/unittest/dtrace-util/tst.ZeroProbeIdentifier.sh
> @@ -5,7 +5,6 @@
>  # Licensed under the Universal Permissive License v 1.0 as shown at
>  # http://oss.oracle.com/licenses/upl.
>  #
> -# @@xfail: dtv2
>  
>  ##
>  #
> -- 
> 2.33.0.256.gb827f06fa9
> 
> 
> _______________________________________________
> DTrace-devel mailing list
> DTrace-devel at oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/dtrace-devel