harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r572688 - in /harmony/enhanced/drlvm/trunk/vm: include/open/vm.h vmcore/include/jvmti_internal.h vmcore/src/jvmti/jvmti_event.cpp vmcore/src/jvmti/jvmti_method.cpp
Date Tue, 04 Sep 2007 14:22:19 GMT
Author: gshimansky
Date: Tue Sep  4 07:22:17 2007
New Revision: 572688

URL: http://svn.apache.org/viewvc?rev=572688&view=rev
Log:
Applied patch from HARMONY-4732
[drlvm][jvmti] Not all expected MethodExit events are reported in release mode.


Modified:
    harmony/enhanced/drlvm/trunk/vm/include/open/vm.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm.h?rev=572688&r1=572687&r2=572688&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm.h Tue Sep  4 07:22:17 2007
@@ -1111,7 +1111,7 @@
 /**
  * Returns the address of the global flag that specifies whether
  * MethodExit event is enabled. JIT should call this function in case
- * a method is compiled with exe_notify_method_entry flag set.
+ * a method is compiled with exe_notify_method_exit flag set.
  */
 VMEXPORT char *get_method_exit_flag_address();
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h?rev=572688&r1=572687&r2=572688&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h Tue Sep  4 07:22:17 2007
@@ -363,7 +363,7 @@
             method_entry_enabled_flag = value;
         }
 
-        void get_method_exit_flag(char value)
+        void set_method_exit_flag(char value)
         {
             method_exit_enabled_flag = value;
         }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp?rev=572688&r1=572687&r2=572688&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Tue Sep  4 07:22:17 2007
@@ -405,16 +405,16 @@
                 if (JVMTI_ENABLE == mode)
                 {
                     TRACE2("jvmti.event.method.exit", "ENABLED global method exit flag");
-                    ti->set_method_entry_flag(1);
+                    ti->set_method_exit_flag(1);
                 }
-                else if (JVMTI_DISABLE == mode && ti->get_method_entry_flag()
!= 0)
+                else if (JVMTI_DISABLE == mode && ti->get_method_exit_flag() !=
0)
                 {
                     LMAutoUnlock lock(&ti->TIenvs_lock);
                     bool disable = check_event_is_disable(JVMTI_EVENT_METHOD_EXIT, ti) ||
                         check_event_is_disable(JVMTI_EVENT_FRAME_POP, ti);
                     if (disable) {
-                        TRACE2("jvmti.event.method.entry", "DISABLED global method entry
flag");
-                        ti->set_method_entry_flag(0);
+                        TRACE2("jvmti.event.method.exit", "DISABLED global method exit flag");
+                        ti->set_method_exit_flag(0);
                     }
                 }
             }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp?rev=572688&r1=572687&r2=572688&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp Tue Sep  4 07:22:17
2007
@@ -691,7 +691,7 @@
 {
     BEGIN_RAISE_AREA;
 
-    TRACE2("jvmti.event.method.entry", "MethodExit: " <<
+    TRACE2("jvmti.event.method.exit", "MethodExit: " <<
         class_get_name(method_get_class(method)) << "." <<
         method_get_name(method) << method_get_descriptor(method));
 



Mime
View raw message