From e98f46cc16b6ba1555409cb3c7e384bdb0792875 Mon Sep 17 00:00:00 2001 From: Adam Leventhal Date: Tue, 5 Feb 2013 10:10:25 -0800 Subject: [PATCH] 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 Reviewed by: Matthew Ahrens Reviewed by: Eric Schrock Reviewed by: Dan Kimmel Reviewed by: Christopher Siden Reviewed by: Richard Lowe Approved by: Robert Mustacchi --- .../cmd/dtrace/test/tst/common/funcs/tst.copyin.d | 9 ++++++- .../cmd/dtrace/test/tst/common/funcs/tst.strjoin.d | 9 ++++++- .../cmd/dtrace/test/tst/common/misc/tst.dynopt.d | 23 +++++++++++------ .../dtrace/test/tst/common/pointers/err.BadAlign.d | 7 ++++-- .../test/tst/common/pointers/err.InvalidAddress2.d | 5 +++- .../test/tst/common/pointers/err.InvalidAddress3.d | 7 ++++-- .../test/tst/common/pointers/err.InvalidAddress4.d | 11 +++++--- .../test/tst/common/print/err.D_PRINT_AGG.bad.d | 29 ++++++++++++++++++++++ .../test/tst/common/print/err.D_PRINT_VOID.bad.d | 7 +++++- .../test/tst/common/print/err.D_PROTO_LEN.bad.d | 7 +++++- .../cmd/dtrace/test/tst/common/safety/tst.copyin.d | 6 +++-- .../dtrace/test/tst/common/scripting/tst.egid.ksh | 6 +++-- .../common/speculation/err.BufSizeVariations2.d | 4 ++- .../test/tst/common/trace/err.D_PROTO_LEN.bad.d | 10 ++++++-- .../test/tst/common/trace/err.D_TRACE_AGG.bad.d | 29 ++++++++++++++++++++++ .../test/tst/common/trace/err.D_TRACE_VOID.bad.d | 9 ++++++- .../cmd/dtrace/test/tst/common/types/tst.const.d | 29 ++++++++++++++++++++++ usr/src/lib/libdtrace/common/dt_cc.c | 6 +++++ usr/src/lib/libdtrace/common/dt_decl.c | 6 +---- usr/src/lib/libdtrace/common/dt_errtags.h | 2 ++ usr/src/pkg/manifests/system-dtrace-tests.mf | 3 +++ 21 files changed, 190 insertions(+), 34 deletions(-) create mode 100644 usr/src/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d create mode 100644 usr/src/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d create mode 100644 usr/src/cmd/dtrace/test/tst/common/types/tst.const.d diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/tst.copyin.d b/usr/src/cmd/dtrace/test/tst/common/funcs/tst.copyin.d index 186b97419e..4ecc23e676 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/tst.copyin.d +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/tst.copyin.d @@ -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) +} diff --git a/usr/src/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d b/usr/src/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d index 392c18a6df..0f23737d38 100644 --- a/usr/src/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d +++ b/usr/src/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d @@ -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); +} diff --git a/usr/src/cmd/dtrace/test/tst/common/misc/tst.dynopt.d b/usr/src/cmd/dtrace/test/tst/common/misc/tst.dynopt.d index cb98d73375..78d96f00a6 100644 --- a/usr/src/cmd/dtrace/test/tst/common/misc/tst.dynopt.d +++ b/usr/src/cmd/dtrace/test/tst/common/misc/tst.dynopt.d @@ -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); } diff --git a/usr/src/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d b/usr/src/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d index ab4106dbee..3923cd910a 100644 --- a/usr/src/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d +++ b/usr/src/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d @@ -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 diff --git a/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d b/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d index 324f40113a..6c79bfa420 100644 --- a/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d +++ b/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d @@ -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 diff --git a/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d b/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d index 39bd1140bd..66c203061d 100644 --- a/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d +++ b/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d @@ -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 diff --git a/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d b/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d index 9d6b144086..f5f49e966f 100644 --- a/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d +++ b/usr/src/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d @@ -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 diff --git a/usr/src/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d b/usr/src/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d new file mode 100644 index 0000000000..5479d00126 --- /dev/null +++ b/usr/src/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d @@ -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); +} diff --git a/usr/src/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d b/usr/src/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d index 902f07272d..4f45885d42 100644 --- a/usr/src/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d +++ b/usr/src/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d @@ -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); +} diff --git a/usr/src/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d b/usr/src/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d index a1d3be1f62..368caebacb 100644 --- a/usr/src/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d +++ b/usr/src/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d @@ -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); +} diff --git a/usr/src/cmd/dtrace/test/tst/common/safety/tst.copyin.d b/usr/src/cmd/dtrace/test/tst/common/safety/tst.copyin.d index 7426d19e1b..beb1c50bba 100644 --- a/usr/src/cmd/dtrace/test/tst/common/safety/tst.copyin.d +++ b/usr/src/cmd/dtrace/test/tst/common/safety/tst.copyin.d @@ -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 diff --git a/usr/src/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh b/usr/src/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh index 9e1955f298..b0d985401c 100644 --- a/usr/src/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh +++ b/usr/src/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh @@ -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 diff --git a/usr/src/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d b/usr/src/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d index f660e9a8f3..5ac7957ced 100644 --- a/usr/src/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d +++ b/usr/src/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d @@ -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: diff --git a/usr/src/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d b/usr/src/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d index a1ec95ccb4..68c11950b5 100644 --- a/usr/src/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d +++ b/usr/src/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d @@ -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); +} diff --git a/usr/src/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d b/usr/src/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d new file mode 100644 index 0000000000..b29b9f1799 --- /dev/null +++ b/usr/src/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d @@ -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(); + trace(@); +} + +BEGIN +{ + exit(0); +} diff --git a/usr/src/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d b/usr/src/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d index eb9f194a73..ed044b2236 100644 --- a/usr/src/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d +++ b/usr/src/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d @@ -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); +} diff --git a/usr/src/cmd/dtrace/test/tst/common/types/tst.const.d b/usr/src/cmd/dtrace/test/tst/common/types/tst.const.d new file mode 100644 index 0000000000..dae3d9041e --- /dev/null +++ b/usr/src/cmd/dtrace/test/tst/common/types/tst.const.d @@ -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); +} diff --git a/usr/src/lib/libdtrace/common/dt_cc.c b/usr/src/lib/libdtrace/common/dt_cc.c index 4163e93994..9661ad9d0b 100644 --- a/usr/src/lib/libdtrace/common/dt_cc.c +++ b/usr/src/lib/libdtrace/common/dt_cc.c @@ -676,6 +676,12 @@ dt_action_trace(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp) "%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); /* diff --git a/usr/src/lib/libdtrace/common/dt_decl.c b/usr/src/lib/libdtrace/common/dt_decl.c index d2a0b29ca8..563c0057da 100644 --- a/usr/src/lib/libdtrace/common/dt_decl.c +++ b/usr/src/lib/libdtrace/common/dt_decl.c @@ -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 @@ -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)); } diff --git a/usr/src/lib/libdtrace/common/dt_errtags.h b/usr/src/lib/libdtrace/common/dt_errtags.h index 0a9e7c029b..0dd34e4525 100644 --- a/usr/src/lib/libdtrace/common/dt_errtags.h +++ b/usr/src/lib/libdtrace/common/dt_errtags.h @@ -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 */ diff --git a/usr/src/pkg/manifests/system-dtrace-tests.mf b/usr/src/pkg/manifests/system-dtrace-tests.mf index b740da5a4f..709b1f6a92 100644 --- a/usr/src/pkg/manifests/system-dtrace-tests.mf +++ b/usr/src/pkg/manifests/system-dtrace-tests.mf @@ -1253,6 +1253,7 @@ file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpifelse.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpifelse.d.out \ mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.withinprobe.d mode=0444 +file path=opt/SUNWdtrt/tst/common/print/err.D_PRINT_AGG.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/print/err.D_PRINT_VOID.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/print/err.D_PROTO_LEN.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/print/tst.array.d mode=0444 @@ -1801,6 +1802,7 @@ file path=opt/SUNWdtrt/tst/common/tick-n/tst.tickus.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/tick-n/tst.tickusec.d mode=0444 file path=opt/SUNWdtrt/tst/common/tick-n/tst.tickusec.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/trace/err.D_PROTO_LEN.bad.d mode=0444 +file path=opt/SUNWdtrt/tst/common/trace/err.D_TRACE_AGG.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/trace/err.D_TRACE_VOID.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/trace/tst.dyn.d mode=0444 file path=opt/SUNWdtrt/tst/common/trace/tst.misc.d mode=0444 @@ -1936,6 +1938,7 @@ file path=opt/SUNWdtrt/tst/common/types/tst.bitops.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/tst.charconstants.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/tst.complex.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/tst.condexpr.d mode=0444 +file path=opt/SUNWdtrt/tst/common/types/tst.const.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/tst.constants.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/tst.conv.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/tst.enum.d mode=0444 -- 2.11.4.GIT