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/pid/tst.provregex4.ksh
          +++ new/usr/src/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh

   1    1  #!/bin/ksh -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
  28   28  #
  29   29  # This test verifies that USDT probes will be picked up after a dlopen(3C)
  30   30  # when a regex in the provider name matches both USDT probes and pid probes
  31   31  # (e.g., p*d$target matches both pid$target and pyramid$target.)
  32   32  #
  33   33  
  34   34  if [ $# != 1 ]; then
  35   35          echo expected one argument: '<'dtrace-path'>'
  36   36          exit 2
  37   37  fi
  38   38  

  39   39  dtrace=$1
  40   40  DIR=${TMPDIR:-/tmp}/dtest.$$
  41   41  
  42   42  mkdir $DIR
  43   43  cd $DIR
  44   44  
  45   45  cat > Makefile <<EOF
  46   46  all: main altlib.so
  47   47  
  48   48  main: main.o provmain.o
  49      -        gcc -o main main.o provmain.o
       49 +        gcc -m32 -o main main.o provmain.o
  50   50  
  51   51  main.o: main.c prov.h
  52      -        gcc -c main.c
       52 +        gcc -m32 -c main.c
  53   53  
  54   54  prov.h: prov.d
  55   55          $dtrace -h -s prov.d
  56   56  
  57   57  provmain.o: prov.d main.o
  58   58          $dtrace -G -32 -o provmain.o -s prov.d main.o
  59   59  
  60   60  altlib.so: altlib.o provalt.o
  61      -        gcc -shared -o altlib.so altlib.o provalt.o -lc
       61 +        gcc -m32 -shared -o altlib.so altlib.o provalt.o -lc
  62   62  
  63   63  altlib.o: altlib.c prov.h
  64      -        gcc -c altlib.c
       64 +        gcc -m32 -c altlib.c
  65   65  
  66   66  provalt.o: prov.d altlib.o
  67   67          $dtrace -G -32 -o provalt.o -s prov.d altlib.o
  68   68  EOF
  69   69  
  70   70  cat > prov.d <<EOF
  71   71  provider pyramid {
  72   72          probe entry();
  73   73  };
  74   74  EOF

  75   75  
  76   76  cat > altlib.c <<EOF
  77   77  #include <sys/sdt.h>
  78   78  #include "prov.h"
  79   79  
  80   80  void
  81   81  go(void)
  82   82  {
  83   83          PYRAMID_ENTRY();
  84   84  }
  85   85  EOF
  86   86  
  87   87  cat > main.c <<EOF
  88   88  #include <dlfcn.h>
  89   89  #include <unistd.h>
  90   90  #include <stdio.h>
  91   91  #include <sys/sdt.h>
  92   92  #include "prov.h"
  93   93  
  94   94  void
  95   95  go(void)
  96   96  {
  97   97          PYRAMID_ENTRY();
  98   98  }
  99   99  
 100  100  int
 101  101  main(int argc, char **argv)
 102  102  {
 103  103          void *alt;
 104  104          void *alt_go;
 105  105  
 106  106          go();
 107  107  
 108  108          if ((alt = dlopen("./altlib.so", RTLD_LAZY | RTLD_LOCAL)) 
 109  109              == NULL) {
 110  110                  printf("dlopen of altlib.so failed: %s\n", dlerror());
 111  111                  return (1);
 112  112          }
 113  113  
 114  114          if ((alt_go = dlsym(alt, "go")) == NULL) {
 115  115                  printf("failed to lookup 'go' in altlib.so\n");
 116  116                  return (1);
 117  117          }
 118  118  
 119  119          ((void (*)(void))alt_go)();
 120  120  
 121  121          return (0);
 122  122  }
 123  123  EOF
 124  124  
 125  125  make > /dev/null
 126  126  if [ $? -ne 0 ]; then
 127  127          print -u2 "failed to build"
 128  128          exit 1
 129  129  fi
 130  130  
 131  131  cat > main.d <<'EOF'
 132  132  p*d$target::go:entry
 133  133  {
 134  134          @foo[probemod, probefunc, probename] = count();
 135  135  }
 136  136  
 137  137  END
 138  138  {
 139  139          printa("%s:%s:%s %@u\n",@foo);
 140  140  }
 141  141  EOF
 142  142  
 143  143  script() {
 144  144          $dtrace -q -s ./main.d -c ./main
 145  145  }
 146  146  
 147  147  script
 148  148  status=$?
 149  149  
 150  150  cd /tmp
 151  151  /usr/bin/rm -rf $DIR
 152  152  
 153  153  exit $status

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX