Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
4248 dtrace(1M) should never create DOF with empty probes section
4249 Only probes from the first DTrace object file will be included Reviewed by: Adam Leventhal <ahl@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org>
- Loading branch information
Showing
8 changed files
with
197 additions
and
11 deletions.
There are no files selected for viewing
106 changes: 106 additions & 0 deletions
106
usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| # | ||
| # CDDL HEADER START | ||
| # | ||
| # The contents of this file are subject to the terms of the | ||
| # Common Development and Distribution License (the "License"). | ||
| # You may not use this file except in compliance with the License. | ||
| # | ||
| # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE | ||
| # or http://www.opensolaris.org/os/licensing. | ||
| # See the License for the specific language governing permissions | ||
| # and limitations under the License. | ||
| # | ||
| # When distributing Covered Code, include this CDDL HEADER in each | ||
| # file and include the License file at usr/src/OPENSOLARIS.LICENSE. | ||
| # If applicable, add the following below this CDDL HEADER, with the | ||
| # fields enclosed by brackets "[]" replaced with your own identifying | ||
| # information: Portions Copyright [yyyy] [name of copyright owner] | ||
| # | ||
| # CDDL HEADER END | ||
| # | ||
|
|
||
| # | ||
| # Copyright (c) 2013, Joyent, Inc. All rights reserved. | ||
| # | ||
|
|
||
| if [ $# != 1 ]; then | ||
| echo expected one argument: '<'dtrace-path'>' | ||
| exit 2 | ||
| fi | ||
|
|
||
| dtrace=$1 | ||
| DIR=/var/tmp/dtest.$$ | ||
|
|
||
| mkdir $DIR | ||
| cd $DIR | ||
|
|
||
| echo '#pragma D option quiet' > test.d | ||
| echo '#pragma D option aggsortkey' >> test.d | ||
|
|
||
| cat > test.c <<EOF | ||
| #include <unistd.h> | ||
| void | ||
| main() | ||
| { | ||
| EOF | ||
|
|
||
| objs= | ||
|
|
||
| for oogle in doogle bagnoogle; do | ||
| cat > $oogle.c <<EOF | ||
| #include <sys/sdt.h> | ||
| void | ||
| $oogle() | ||
| { | ||
| DTRACE_PROBE($oogle, knows); | ||
| } | ||
| EOF | ||
|
|
||
| cat > $oogle.d <<EOF | ||
| provider $oogle { | ||
| probe knows(); | ||
| }; | ||
| EOF | ||
|
|
||
| cc -c $oogle.c | ||
|
|
||
| if [ $? -ne 0 ]; then | ||
| print -u2 "failed to compile $oogle.c" | ||
| exit 1 | ||
| fi | ||
|
|
||
| $dtrace -G -32 -s $oogle.d $oogle.o -o $oogle.d.o | ||
|
|
||
| if [ $? -ne 0 ]; then | ||
| print -u2 "failed to process $oogle.d" | ||
| exit 1 | ||
| fi | ||
|
|
||
| objs="$objs $oogle.o $oogle.d.o" | ||
| echo $oogle'();' >> test.c | ||
| echo $oogle'$target:::{@[probefunc] = count()}' >> test.d | ||
| done | ||
| echo "}" >> test.c | ||
| echo 'END{printa("%-10s %@d\\n", @)}' >> test.d | ||
| cc -o test test.c $objs | ||
| if [ $? -ne 0 ]; then | ||
| print -u2 "failed to compile test.c" | ||
| exit 1 | ||
| fi | ||
| $dtrace -s ./test.d -Zc ./test | ||
| if [ $? -ne 0 ]; then | ||
| print -u2 "failed to execute test" | ||
| exit 1 | ||
| fi | ||
| cd / | ||
| /usr/bin/rm -rf $DIR | ||
| exit 0 |
3 changes: 3 additions & 0 deletions
3
usr/src/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| bagnoogle 1 | ||
| doogle 1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| # | ||
| # CDDL HEADER START | ||
| # | ||
| # The contents of this file are subject to the terms of the | ||
| # Common Development and Distribution License (the "License"). | ||
| # You may not use this file except in compliance with the License. | ||
| # | ||
| # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE | ||
| # or http://www.opensolaris.org/os/licensing. | ||
| # See the License for the specific language governing permissions | ||
| # and limitations under the License. | ||
| # | ||
| # When distributing Covered Code, include this CDDL HEADER in each | ||
| # file and include the License file at usr/src/OPENSOLARIS.LICENSE. | ||
| # If applicable, add the following below this CDDL HEADER, with the | ||
| # fields enclosed by brackets "[]" replaced with your own identifying | ||
| # information: Portions Copyright [yyyy] [name of copyright owner] | ||
| # | ||
| # CDDL HEADER END | ||
| # | ||
|
|
||
| # | ||
| # Copyright (c) 2013, Joyent, Inc. All rights reserved. | ||
| # | ||
|
|
||
| if [ $# != 1 ]; then | ||
| echo expected one argument: '<'dtrace-path'>' | ||
| exit 2 | ||
| fi | ||
|
|
||
| dtrace=$1 | ||
| DIR=/var/tmp/dtest.$$ | ||
|
|
||
| mkdir $DIR | ||
| cd $DIR | ||
|
|
||
| cat > test.c <<EOF | ||
| void | ||
| foo() | ||
| {} | ||
| EOF | ||
|
|
||
| cat > doogle.d <<EOF | ||
| provider doogle { | ||
| probe bagnoogle(); | ||
| }; | ||
| EOF | ||
|
|
||
| cc -c test.c | ||
| $dtrace -G -32 -s doogle.d test.o -o doogle.d.o | ||
|
|
||
| if [ $? -eq 0 ]; then | ||
| print -u2 "dtrace succeeded despite having no probe sites" | ||
| exit 1 | ||
| fi | ||
|
|
||
| cd / | ||
| /usr/bin/rm -rf $DIR | ||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54a20abThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just curious, wouldn't it be better to just ignore that provider and do not output it to DOF, instead of erroring?