4474 DTrace Userland CTF Support
4475 DTrace userland Keyword
4476 DTrace tests should be better citizens
4479 pid provider types
4480 dof emulation missing checks
Reviewed by: Bryan Cantrill <bryan@joyent.com>

          --- old/usr/src/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh
          +++ new/usr/src/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  
  27   27  if [ $# != 1 ]; then
  28   28          echo expected one argument: '<'dtrace-path'>'
  29   29          exit 2
  30   30  fi
  31   31  
  32   32  dtrace=$1
  33   33  DIR=/var/tmp/dtest.$$
  34   34  
  35   35  mkdir $DIR
  36   36  cd $DIR
  37   37  
  38   38  cat > test.c <<EOF
  39   39  #include <sys/sdt.h>
  40   40  
  41   41  int
  42   42  main(int argc, char **argv)
  43   43  {
  44   44          DTRACE_PROBE(test_prov, entry);
  45   45          DTRACE_PROBE(test_prov, __entry);
  46   46          DTRACE_PROBE(test_prov, foo__entry);
  47   47          DTRACE_PROBE(test_prov, carpentry);
  48   48          DTRACE_PROBE(test_prov, miniatureturn);
  49   49          DTRACE_PROBE(test_prov, foo__return);
  50   50          DTRACE_PROBE(test_prov, __return);
  51   51          /*
  52   52           * Unfortunately, a "return" probe is not currently possible due to
  53   53           * the conflict with a reserved word.
  54   54           */
  55   55          DTRACE_PROBE(test_prov, done);
  56   56  }
  57   57  EOF
  58   58  
  59   59  cat > prov.d <<EOF
  60   60  provider test_prov {
  61   61          probe entry();

  62   62          probe __entry();
  63   63          probe foo__entry();
  64   64          probe carpentry();
  65   65          probe miniatureturn();
  66   66          probe foo__return();
  67   67          probe __return();
  68   68          probe done();
  69   69  };
  70   70  EOF
  71   71  
  72      -gcc -c test.c
       72 +gcc -m32 -c test.c
  73   73  if [ $? -ne 0 ]; then
  74   74          print -u2 "failed to compile test.c"
  75   75          exit 1
  76   76  fi
  77   77  $dtrace -G -32 -s prov.d test.o
  78   78  if [ $? -ne 0 ]; then
  79   79          print -u2 "failed to create DOF"
  80   80          exit 1
  81   81  fi
  82      -gcc -o test test.o prov.o
       82 +gcc -m32 -o test test.o prov.o
  83   83  if [ $? -ne 0 ]; then
  84   84          print -u2 "failed to link final executable"
  85   85          exit 1
  86   86  fi
  87   87  
  88   88  script()
  89   89  {
  90   90          $dtrace -wqZFs /dev/stdin <<EOF
  91   91          BEGIN
  92   92          {

  93   93                  system("$DIR/test");
  94   94                  printf("\n");
  95   95          }
  96   96  
  97   97          test_prov*:::done
  98   98          /progenyof(\$pid)/
  99   99          {
 100  100                  exit(0);
 101  101          }
 102  102  
 103  103          test_prov*:::
 104  104          /progenyof(\$pid)/
 105  105          {
 106  106                  printf("\n");
 107  107          }
 108  108  EOF
 109  109  }
 110  110  
 111  111  script | cut -c5-
 112  112  status=$?
 113  113  
 114  114  cd /
 115  115  /usr/bin/rm -rf $DIR
 116  116  
 117  117  exit $status

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX