Mercurial > hg > truffle
annotate make/solaris/makefiles/sa.make @ 17716:cdb71841f4bc
6498581: ThreadInterruptTest3 produces wrong output on Windows
Summary: There is race condition between os::interrupt and os::is_interrupted on Windows. In JVM_Sleep(Thread.sleep), check if thread gets interrupted, it may see interrupted but not really interrupted so cause spurious waking up (early return from sleep). Fix by checking if interrupt event really gets set thus prevent false return. For intrinsic of _isInterrupted, on Windows, go fastpath only on bit not set.
Reviewed-by: acorn, kvn
Contributed-by: david.holmes@oracle.com, yumin.qi@oracle.com
author | minqi |
---|---|
date | Wed, 26 Feb 2014 15:20:41 -0800 |
parents | 5a98bf7d847b |
children |
rev | line source |
---|---|
0 | 1 # |
6782 | 2 # Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. |
0 | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | |
5 # This code is free software; you can redistribute it and/or modify it | |
6 # under the terms of the GNU General Public License version 2 only, as | |
7 # published by the Free Software Foundation. | |
8 # | |
9 # This code is distributed in the hope that it will be useful, but WITHOUT | |
10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 # version 2 for more details (a copy is included in the LICENSE file that | |
13 # accompanied this code). | |
14 # | |
15 # You should have received a copy of the GNU General Public License version | |
16 # 2 along with this work; if not, write to the Free Software Foundation, | |
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 # | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
20 # or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
21 # questions. |
0 | 22 # |
23 # | |
24 | |
25 # This makefile (sa.make) is included from the sa.make in the | |
26 # build directories. | |
27 | |
28 # This makefile is used to build Serviceability Agent java code | |
29 # and generate JNI header file for native methods. | |
30 | |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
31 include $(GAMMADIR)/make/solaris/makefiles/rules.make |
0 | 32 AGENT_DIR = $(GAMMADIR)/agent |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
33 include $(GAMMADIR)/make/sa.files |
0 | 34 GENERATED = ../generated |
35 | |
36 # tools.jar is needed by the JDI - SA binding | |
37 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar | |
38 | |
1642 | 39 # TODO: if it's a modules image, check if SA module is installed. |
40 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules | |
41 | |
3963
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
42 AGENT_FILES_LIST := $(GENERATED)/agent.classes.list |
1774
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
43 |
0 | 44 SA_CLASSDIR = $(GENERATED)/saclasses |
45 | |
46 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" | |
47 | |
48 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties | |
49 | |
50 # if $(AGENT_DIR) does not exist, we don't build SA. | |
51 all: | |
52 $(QUIETLY) if [ -d $(AGENT_DIR) ] ; then \ | |
53 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ | |
54 fi | |
55 | |
3963
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
56 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES) |
0 | 57 $(QUIETLY) echo "Making $@"; |
58 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ | |
59 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ | |
60 exit 1; \ | |
61 fi | |
1642 | 62 $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \ |
0 | 63 echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\ |
64 echo ""; \ | |
65 exit 1; \ | |
66 fi | |
67 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ | |
68 mkdir -p $(SA_CLASSDIR); \ | |
69 fi | |
1804
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
70 # Note: When indented, make tries to execute the '$(shell' comment. |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
71 # In some environments, cmd processors have limited line length. |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
72 # To prevent the javac invocation in the next block from using |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
73 # a very long cmd line, we use javac's @file-list option. We |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
74 # generate the file lists using make's built-in 'foreach' control |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
75 # flow which also avoids cmd processor line length issues. Since |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
76 # the 'foreach' is done as part of make's macro expansion phase, |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
77 # the initialization of the lists is also done in the same phase |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
78 # using '$(shell rm ...' instead of using the more traditional |
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
79 # 'rm ...' rule. |
3963
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
80 $(shell rm -rf $(AGENT_FILES_LIST)) |
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
81 # gnumake 3.78.1 does not accept the *'s that |
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
82 # are in AGENT_FILES, so use the shell to expand them. |
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
83 # Be extra carefull to not produce too long command lines in the shell! |
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
84 $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST))) |
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
85 $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) |
0 | 86 $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer |
87 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) | |
311 | 88 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js |
89 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql | |
90 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources | |
91 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/* | |
92 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/ | |
93 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/ | |
0 | 94 $(QUIETLY) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ . |
95 $(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector | |
96 $(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal | |
6782 | 97 $(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.asm.Disassembler |
0 | 98 |
99 clean: | |
100 rm -rf $(SA_CLASSDIR) | |
101 rm -rf $(GENERATED)/sa-jdi.jar | |
3963
098acdf97f09
7096016: SA build still produces "arg list too long" errors
never
parents:
2471
diff
changeset
|
102 rm -rf $(AGENT_FILES_LIST) |