You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2007/02/23 00:58:56 UTC
svn commit: r510721 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti:
jvmti_break_intf.cpp jvmti_step.cpp
Author: gshimansky
Date: Thu Feb 22 15:58:55 2007
New Revision: 510721
URL: http://svn.apache.org/viewvc?view=rev&rev=510721
Log:
Applied HARMONY-3212 [drlvm][jvmti] JVMTI tries to single step through native method
Tests passed on Ubuntu6 x86, Windows XP x86 and SuSE9 x86_64
Modified:
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp?view=diff&rev=510721&r1=510720&r2=510721
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp Thu Feb 22 15:58:55 2007
@@ -1385,9 +1385,6 @@
if (!ti->isEnabled())
return;
- if( !method->get_pending_breakpoints() )
- return;
-
VMBreakPoints* vm_brpt = ti->vm_brpt;
LMAutoUnlock lock(vm_brpt->get_lock());
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp?view=diff&rev=510721&r1=510720&r2=510721
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp Thu Feb 22 15:58:55 2007
@@ -466,6 +466,9 @@
{
if (ti->isEnabled() && ti->is_single_step_enabled())
{
+ if (method->is_native()) // Must not single step through native methods
+ return;
+
LMAutoUnlock lock(ti->vm_brpt->get_lock());
if (NULL != vm_thread->ss_state)
{