United StatesChange Country, Oracle Worldwide Web Sites Communities I am a... I want to...
Bug ID: 6985848 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
6985848 : fix for 6561870 causes sa-jdi.jar to be rebuilt every time

Details
Type:
Bug
Submit Date:
2010-09-17
Status:
Closed
Updated Date:
2011-04-23
Project Name:
JDK
Resolved Date:
2011-04-23
Component:
hotspot
OS:
solaris
Sub-Component:
svc
CPU:
generic
Priority:
P3
Resolution:
Fixed
Affected Versions:
hs20
Fixed Versions:
hs20

Related Reports
Backport:
Backport:
Relates:

Sub Tasks

Description
The fix for 6561870 adds an agent_files_preclean target and adds that
new target as a dependency of sa-jdi.jar. Because the agent_files_preclean
itself does not have any dependencies, it always "executes" and causes
sa-jdi.jar to always be rebuilt.

                                    

Comments
EVALUATION

http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/2966dab85b3e
                                     
2010-10-09
SUGGESTED FIX

Attached 6985848-webrev-cr3.tgz with a (hopefully) final version
of the comments.
                                     
2010-09-21
EVALUATION

http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/2966dab85b3e
                                     
2010-09-21
SUGGESTED FIX

Attached 6985848-webrev-cr2.tgz with a revised version of the
comments for the fix.
                                     
2010-09-20
SUGGESTED FIX

Attached 6985848-webrev-cr1.tgz with a revised version of the fix.
                                     
2010-09-18
SUGGESTED FIX

Here are the context diffs for the tweak to the fix for 6561870:

diff -r 4094f07967ca make/linux/makefiles/sa.make
--- a/make/linux/makefiles/sa.make      Wed Sep 15 16:28:19 2010 -0400
+++ b/make/linux/makefiles/sa.make      Fri Sep 17 13:32:00 2010 -0600
@@ -68,7 +68,7 @@
           $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
        fi
 
-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
+$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
        $(QUIETLY) echo "Making $@"
        $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
          echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -83,6 +83,7 @@
          mkdir -p $(SA_CLASSDIR);        \
        fi
        
+       $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
        $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
        $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
        
@@ -104,9 +105,6 @@
        $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
        $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
 
-agent_files_preclean:
-       rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
-
 clean:
        rm -rf $(SA_CLASSDIR)
        rm -rf $(GENERATED)/sa-jdi.jar
diff -r 4094f07967ca make/solaris/makefiles/sa.make
--- a/make/solaris/makefiles/sa.make    Wed Sep 15 16:28:19 2010 -0400
+++ b/make/solaris/makefiles/sa.make    Fri Sep 17 13:32:00 2010 -0600
@@ -59,7 +59,7 @@
           $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
        fi
 
-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
+$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
        $(QUIETLY) echo "Making $@";
        $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
           echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -74,6 +74,7 @@
          mkdir -p $(SA_CLASSDIR);        \
        fi
        
+       $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
        $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
        $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
        
@@ -92,9 +93,6 @@
        $(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
        $(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
 
-agent_files_preclean:
-       rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
-
 clean:
        rm -rf $(SA_CLASSDIR)
        rm -rf $(GENERATED)/sa-jdi.jar
                                     
2010-09-17
EVALUATION

See description and suggested fix.
                                     
2010-09-17
SUGGESTED FIX

Also attached 6985848-webrev-cr0.tgz for those that like to see
things in webrev format.
                                     
2010-09-17



Hardware and Software, Engineered to Work Together