Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 29172 invoked from network); 26 Nov 2007 20:52:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Nov 2007 20:52:39 -0000 Received: (qmail 67323 invoked by uid 500); 26 Nov 2007 20:52:27 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 67307 invoked by uid 500); 26 Nov 2007 20:52:27 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 67298 invoked by uid 99); 26 Nov 2007 20:52:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Nov 2007 12:52:27 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Nov 2007 20:52:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD54D1A9832; Mon, 26 Nov 2007 12:52:18 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r598423 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Date: Mon, 26 Nov 2007 20:52:18 -0000 To: commits@harmony.apache.org From: gshimansky@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071126205218.BD54D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gshimansky Date: Mon Nov 26 12:52:17 2007 New Revision: 598423 URL: http://svn.apache.org/viewvc?rev=598423&view=rev Log: Applied patch from HARMONY-5188 [drlvm][jvmti] Failed VTSVM JVMTI tests IsInterfaceXXXX Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp 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=598423&r1=598422&r2=598423&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 Mon Nov 26 12:52:17 2007 @@ -471,29 +471,30 @@ // Switch phase to VM_Start and sent VMStart event ti->nextPhase(JVMTI_PHASE_START); - if(!jvmti_should_report_event(JVMTI_EVENT_VM_START)) - return; - - // Send VM_Start TI events - TIEnv *ti_env = ti->getEnvironments(); - TIEnv *next_env; - while (NULL != ti_env) + if(jvmti_should_report_event(JVMTI_EVENT_VM_START)) { - next_env = ti_env->next; - if (ti_env->global_events[JVMTI_EVENT_VM_START - JVMTI_MIN_EVENT_TYPE_VAL]) + // Send VM_Start TI events + TIEnv *ti_env = ti->getEnvironments(); + TIEnv *next_env; + while (NULL != ti_env) { - jvmtiEventVMStart func = (jvmtiEventVMStart)ti_env->get_event_callback(JVMTI_EVENT_VM_START); - if (NULL != func) + next_env = ti_env->next; + if (ti_env->global_events[JVMTI_EVENT_VM_START - JVMTI_MIN_EVENT_TYPE_VAL]) { - TRACE2("jvmti.event.vs", "Callback JVMTI_PHASE_START called"); - func((jvmtiEnv*)ti_env, jni_env); - TRACE2("jvmti.event.vs", "Callback JVMTI_PHASE_START finished"); + jvmtiEventVMStart func = (jvmtiEventVMStart)ti_env->get_event_callback(JVMTI_EVENT_VM_START); + if (NULL != func) + { + TRACE2("jvmti.event.vs", "Callback JVMTI_PHASE_START called"); + func((jvmtiEnv*)ti_env, jni_env); + TRACE2("jvmti.event.vs", "Callback JVMTI_PHASE_START finished"); + } } - } - ti_env = next_env; + ti_env = next_env; + } } - // send notify events + + // send pending notify events unsigned index; if(jvmti_should_report_event(JVMTI_EVENT_CLASS_LOAD)) { for( index = 0; index < env->TI->GetNumberPendingNotifyLoadClass(); index++ ) {