Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8074841: Resolve disabled warnings for the JVMTI demo compiledMethodLoad
authorsla
Wed, 11 Mar 2015 08:09:35 +0100
changeset 29392 89636c9b09d0
parent 29391 b4fad461f2b5
child 29393 133fbf15b9e5
child 29521 6962c169e541
8074841: Resolve disabled warnings for the JVMTI demo compiledMethodLoad 8074842: Resolve disabled warnings for the JVMTI demo waiters Reviewed-by: alanb, ihse, dsamersoff
jdk/make/CompileDemos.gmk file | annotate | diff | comparison | revisions
jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c file | annotate | diff | comparison | revisions
jdk/src/demo/share/jvmti/waiters/Agent.cpp file | annotate | diff | comparison | revisions 
--- a/jdk/make/CompileDemos.gmk	Wed Mar 11 14:33:14 2015 +0900
+++ b/jdk/make/CompileDemos.gmk	Wed Mar 11 08:09:35 2015 +0100
@@ -316,13 +316,13 @@
   endif
 endef
 
-$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util, , , , , , , , pointer-to-int-cast format, , format))
+$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util))
 $(eval $(call SetupJVMTIDemo,gctest, agent_util))
 $(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
 $(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
 $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
 $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
-$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++, , , , , , , 4101))
+$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++))
 $(eval $(call SetupJVMTIDemo,versionCheck, agent_util))
 
 ##################################################################################################
--- a/jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c	Wed Mar 11 14:33:14 2015 +0900
+++ b/jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c	Wed Mar 11 08:09:35 2015 +0100
@@ -143,7 +143,7 @@
 
         for (i = 0; i < numpcs; i++) {
             PCStackInfo pcrecord = (record->pcinfo[i]);
-            fprintf(fp, "PcDescriptor(pc=0x%lx):\n", (jint)(pcrecord.pc));
+            fprintf(fp, "PcDescriptor(pc=%p):\n", pcrecord.pc);
             print_stack_frames(&pcrecord, jvmti, fp);
         }
     }
--- a/jdk/src/demo/share/jvmti/waiters/Agent.cpp	Wed Mar 11 14:33:14 2015 +0900
+++ b/jdk/src/demo/share/jvmti/waiters/Agent.cpp	Wed Mar 11 08:09:35 2015 +0100
@@ -111,8 +111,6 @@
 /* VM initialization and VM death calls to Agent */
 Agent::Agent(jvmtiEnv *jvmti, JNIEnv *env, jthread thread)
 {
-    jvmtiError err;
-
     stdout_message("Agent created..\n");
     stdout_message("VMInit...\n");
     /* Start monitor list */
@@ -129,8 +127,6 @@
 
 void Agent::vm_death(jvmtiEnv *jvmti, JNIEnv *env)
 {
-    jvmtiError err;
-
     /* Delete all Monitors we allocated */
     for ( int i = 0; i < (int)monitor_count; i++ ) {
         delete monitor_list[i];
jdk-sandbox