Print this page
4719 Common patchset for jdk1.7 support preparation

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java
          +++ new/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java
↓ open down ↓ 41 lines elided ↑ open up ↑
  42   42          Consumer consumer = new LocalConsumer();
  43   43  
  44   44          // Test for deadlock (bug 6419880)
  45   45          try {
  46   46              consumer.open();
  47   47              consumer.compile("syscall:::entry { @[execname] = count(); } " +
  48   48                      "tick-101ms { printa(@); }");
  49   49              consumer.enable();
  50   50              consumer.go();
  51   51              try {
  52      -                Thread.currentThread().sleep(1000);
       52 +                Thread.sleep(1000);
  53   53              } catch (InterruptedException e) {
  54   54                  e.printStackTrace();
  55   55                  System.exit(1);
  56   56              }
  57   57              consumer.close();
  58   58          } catch (DTraceException e) {
  59   59              e.printStackTrace();
  60   60              System.exit(1);
  61   61          }
  62   62  
↓ open down ↓ 7 lines elided ↑ open up ↑
  70   70                      aborted = true;
  71   71                  }
  72   72              });
  73   73              consumer.abort();
  74   74              consumer.open();
  75   75              consumer.compile("syscall:::entry { @[execname] = count(); } " +
  76   76                      "tick-101ms { printa(@); }");
  77   77              consumer.enable();
  78   78              consumer.go();
  79   79              try {
  80      -                Thread.currentThread().sleep(1000);
       80 +                Thread.sleep(1000);
  81   81              } catch (InterruptedException e) {
  82   82                  e.printStackTrace();
  83   83                  System.exit(1);
  84   84              }
  85   85              if (!aborted) {
  86   86                  throw new IllegalStateException("consumer not aborted");
  87   87              }
  88   88              consumer.close();
  89   89          } catch (Exception e) {
  90   90              e.printStackTrace();
↓ open down ↓ 31 lines elided ↑ open up ↑
 122  122  
 123  123          // Tests that close() throws expected exception when called on
 124  124          // synchronized consumer.
 125  125          try {
 126  126              consumer.open();
 127  127              consumer.compile("syscall:::entry { @[execname] = count(); } " +
 128  128                      "tick-101ms { printa(@); }");
 129  129              consumer.enable();
 130  130              consumer.go();
 131  131              try {
 132      -                Thread.currentThread().sleep(1000);
      132 +                Thread.sleep(1000);
 133  133              } catch (InterruptedException e) {
 134  134                  e.printStackTrace();
 135  135                  System.exit(1);
 136  136              }
 137  137              try {
 138  138                  synchronized (consumer) {
 139  139                      consumer.close();
 140  140                  }
 141  141              } catch (IllegalThreadStateException e) {
 142  142                  try {
↓ open down ↓ 16 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX