4719 Common patchset for jdk1.7 support preparation

          --- old/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestClose.java
          +++ new/usr/src/cmd/dtrace/test/tst/common/java_api/src/TestClose.java

   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 2006 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   *
  26   26   * ident        "%Z%%M% %I%     %E% SMI"
  27   27   */
  28   28  
  29   29  import org.opensolaris.os.dtrace.*;
  30   30  
  31   31  /**
  32   32   * Regression for bug 6419880 close() hangs running consumer.
  33   33   */
  34   34  public class TestClose {
  35   35      public static void
  36   36      main(String[] args)

  37   37      {
  38   38          Consumer consumer = new LocalConsumer();
  39   39  
  40   40          try {
  41   41              consumer.open();
  42   42              consumer.compile("syscall:::entry { @[execname] = count(); } " +
  43   43                      "tick-101ms { printa(@); }");
  44   44              consumer.enable();
  45   45              consumer.go();
  46   46              try {
  47      -                Thread.currentThread().sleep(1000);
       47 +                Thread.sleep(1000);
  48   48              } catch (InterruptedException e) {
  49   49                  e.printStackTrace();
  50   50                  System.exit(1);
  51   51              }
  52   52              consumer.close();
  53   53          } catch (DTraceException e) {
  54   54              e.printStackTrace();
  55   55              System.exit(1);
  56   56          }
  57   57  
  58   58          consumer = new LocalConsumer();
  59   59  
  60   60          try {
  61   61              consumer.open();
  62   62              consumer.compile("syscall:::entry { @[execname] = count(); } " +
  63   63                      "tick-101ms { printa(@); }");
  64   64              consumer.enable();
  65   65              consumer.go();
  66   66              try {
  67      -                Thread.currentThread().sleep(1000);
       67 +                Thread.sleep(1000);
  68   68              } catch (InterruptedException e) {
  69   69                  e.printStackTrace();
  70   70                  System.exit(1);
  71   71              }
  72   72              try {
  73   73                  // Test new rule that close() is illegal while holding
  74   74                  // lock on consumer.
  75   75                  synchronized (consumer) {
  76   76                      consumer.close();
  77   77                  }

  78   78              } catch (IllegalThreadStateException e) {
  79   79                  consumer.close();
  80   80                  System.out.println("Successful");
  81   81                  System.exit(0);
  82   82              }
  83   83          } catch (DTraceException e) {
  84   84              e.printStackTrace();
  85   85              System.exit(1);
  86   86          }
  87   87          System.err.println("Failed");
  88   88          System.exit(1);
  89   89      }
  90   90  }

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX