Date: Wed, 6 Feb 2013 08:26:56 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r246393 - in vendor/illumos/dist: cmd/dtrace/test/tst/common/funcs cmd/dtrace/test/tst/common/misc cmd/dtrace/test/tst/common/pointers cmd/dtrace/test/tst/common/print cmd/dtrace/test/t... Message-ID: <201302060826.r168QuCC042323@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Wed Feb 6 08:26:55 2013 New Revision: 246393 URL: http://svnweb.freebsd.org/changeset/base/246393 Log: Update vendor/illumos/dist to illumos-gate version 13944:bbcbb468dc37 Illumos dtrace issues: 3519 DTrace fails to resolve const types from fbt 3520 dtrace internal error -- token type 316 is not a valid D compilation token 3521 clean up dtrace unit tests Added: vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d vendor/illumos/dist/cmd/dtrace/test/tst/common/types/tst.const.d Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/funcs/tst.copyin.d vendor/illumos/dist/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d vendor/illumos/dist/cmd/dtrace/test/tst/common/misc/tst.dynopt.d vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d vendor/illumos/dist/cmd/dtrace/test/tst/common/safety/tst.copyin.d vendor/illumos/dist/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh vendor/illumos/dist/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d vendor/illumos/dist/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d vendor/illumos/dist/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d vendor/illumos/dist/lib/libdtrace/common/dt_cc.c vendor/illumos/dist/lib/libdtrace/common/dt_decl.c vendor/illumos/dist/lib/libdtrace/common/dt_errtags.h Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/funcs/tst.copyin.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/funcs/tst.copyin.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/funcs/tst.copyin.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: @@ -52,3 +54,8 @@ BEGIN printf("envp[0] = \"%s\"", copyinstr(envp)); exit(0); } + +BEGIN +{ + exit(1) +} Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ #pragma D option quiet @@ -36,3 +38,8 @@ BEGIN printf("%s\n", strjoin("", "")); exit(0); } + +BEGIN +{ + exit(1); +} Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/misc/tst.dynopt.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/misc/tst.dynopt.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/misc/tst.dynopt.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,38 +24,45 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ #pragma D option quiet #pragma D option switchrate=1ms #pragma D option aggrate=1ms -tick-100ms +tick-50ms { i++; } -tick-100ms -/i > 1/ +tick-50ms +/!(i & 1) && i > 1/ { setopt("quiet", "no"); setopt("quiet"); setopt("quiet"); setopt("quiet", "yes"); @["abc"] = count(); +} + +tick-50ms +/(i & 1) && i > 1/ +{ printa("%@d\n", @); } -tick-100ms -/i == 5/ +tick-50ms +/i == 10/ { setopt("switchrate", "5sec"); setopt("aggrate", "5sec"); } -tick-100ms -/i == 31/ +tick-50ms +/i == 61/ { exit(0); } Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: This test reproduces the alignment error. @@ -39,9 +41,10 @@ BEGIN { - x = (int *) 64; + x = (int *)64; y = *x; trace(y); + exit(0); } ERROR Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: D pointers do not allow invalid pointer accesses. @@ -44,6 +46,7 @@ BEGIN y = (int *) (x - 3300778156056); *y = 3; trace(*y); + exit(0); } ERROR Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: D pointers do not allow invalid pointer accesses. @@ -39,9 +41,10 @@ BEGIN { - y = (int *) (-33007); + y = (int *)-33007; *y = 3; trace(*y); + exit(0); } ERROR Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: Demonstrating valid memory access. @@ -40,10 +42,11 @@ BEGIN { x = (int *)alloca(sizeof (int)); - printf("Address x: %x\n", (int) x); - y = (int *) (x - 2); + printf("Address x: %x\n", (int)x); + y = (int *)(x - 2); *y = 3; - printf("Address y: %x\tValue: %d\n", (int) y, *y); + printf("Address y: %x\tValue: %d\n", (int)y, *y); + exit(0); } ERROR Added: vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d Wed Feb 6 08:26:55 2013 (r246393) @@ -0,0 +1,29 @@ +/* + * CDDL HEADER START + * + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ + +BEGIN +{ + @ = count(); + print(@); +} + +BEGIN +{ + exit(0); +} Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d Wed Feb 6 08:26:55 2013 (r246393) @@ -20,10 +20,15 @@ */ /* - * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ BEGIN { print((void)`p0); } + +BEGIN +{ + exit(0); +} Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d Wed Feb 6 08:26:55 2013 (r246393) @@ -20,10 +20,15 @@ */ /* - * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ BEGIN { print(); } + +BEGIN +{ + exit(0); +} Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/safety/tst.copyin.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/safety/tst.copyin.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/safety/tst.copyin.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: @@ -39,7 +41,7 @@ */ -#pragma D option bufsize=16 +#pragma D option bufsize=32 #pragma D option bufpolicy=ring #pragma D option statusrate=1nsec Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh Wed Feb 6 08:26:55 2013 (r246393) @@ -25,7 +25,9 @@ # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# +# Copyright (c) 2012 by Delphix. All rights reserved. +# ############################################################################ # ASSERTION: @@ -70,7 +72,7 @@ EOF #chmod 555 the .d file chmod 555 $dfilename >/dev/null 2>&1 -if [ &? -ne 0 ]; then +if [ $? -ne 0 ]; then print -u2 "chmod $dfilename failed" exit 1 fi Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,8 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: @@ -39,3 +40,8 @@ BEGIN trace(); } + +BEGIN +{ + exit(0); +} Modified: vendor/illumos/dist/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d ============================================================================== --- vendor/illumos/dist/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d Wed Feb 6 08:26:55 2013 (r246393) @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * ASSERTION: @@ -37,3 +39,8 @@ BEGIN { trace((void)`kmem_flags); } + +BEGIN +{ + exit(0); +} Added: vendor/illumos/dist/cmd/dtrace/test/tst/common/types/tst.const.d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/illumos/dist/cmd/dtrace/test/tst/common/types/tst.const.d Wed Feb 6 08:26:55 2013 (r246393) @@ -0,0 +1,29 @@ +/* + * CDDL HEADER START + * + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ + +/* + * Make sure we can scope types with modifiers. + */ + +BEGIN +{ + trace((D`int *)0); + trace((const D`int *)0); + exit(0); +} Modified: vendor/illumos/dist/lib/libdtrace/common/dt_cc.c ============================================================================== --- vendor/illumos/dist/lib/libdtrace/common/dt_cc.c Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/lib/libdtrace/common/dt_cc.c Wed Feb 6 08:26:55 2013 (r246393) @@ -676,6 +676,12 @@ dt_action_trace(dtrace_hdl_t *dtp, dt_no "%s( ) may not be applied to a translated pointer\n", act); } + if (dnp->dn_args->dn_kind == DT_NODE_AGG) { + dnerror(dnp->dn_args, istrace ? D_TRACE_AGG : D_PRINT_AGG, + "%s( ) may not be applied to an aggregation%s\n", act, + istrace ? "" : " -- did you mean printa()?"); + } + dt_cg(yypcb, dnp->dn_args); /* Modified: vendor/illumos/dist/lib/libdtrace/common/dt_decl.c ============================================================================== --- vendor/illumos/dist/lib/libdtrace/common/dt_decl.c Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/lib/libdtrace/common/dt_decl.c Wed Feb 6 08:26:55 2013 (r246393) @@ -21,6 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ #include <strings.h> @@ -251,11 +252,6 @@ dt_decl_spec(ushort_t kind, char *name) ddp->dd_kind = kind; ddp->dd_name = name; - if (name != NULL && strchr(name, '`') != NULL) { - xyerror(D_DECL_SCOPE, "D scoping operator may not be used " - "in a type name\n"); - } - return (dt_decl_check(ddp)); } Modified: vendor/illumos/dist/lib/libdtrace/common/dt_errtags.h ============================================================================== --- vendor/illumos/dist/lib/libdtrace/common/dt_errtags.h Wed Feb 6 08:21:40 2013 (r246392) +++ vendor/illumos/dist/lib/libdtrace/common/dt_errtags.h Wed Feb 6 08:26:55 2013 (r246393) @@ -190,8 +190,10 @@ typedef enum { D_PRINTA_AGGPROTO, /* printa() aggregation mismatch */ D_TRACE_VOID, /* trace() argument has void type */ D_TRACE_DYN, /* trace() argument has dynamic type */ + D_TRACE_AGG, /* trace() argument is an aggregation */ D_PRINT_VOID, /* print() argument has void type */ D_PRINT_DYN, /* print() argument has dynamic type */ + D_PRINT_AGG, /* print() argument is an aggregation */ D_TRACEMEM_ADDR, /* tracemem() address bad type */ D_TRACEMEM_SIZE, /* tracemem() size bad type */ D_TRACEMEM_ARGS, /* tracemem() illegal number of args */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302060826.r168QuCC042323>