Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 91211 invoked from network); 22 May 2007 19:04:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 May 2007 19:04:05 -0000 Received: (qmail 85636 invoked by uid 500); 22 May 2007 19:04:10 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 85618 invoked by uid 500); 22 May 2007 19:04:10 -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 85609 invoked by uid 99); 22 May 2007 19:04:10 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 May 2007 12:04:10 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Tue, 22 May 2007 12:04:04 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 17B491A981C; Tue, 22 May 2007 12:03:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r540703 - in /harmony/enhanced/drlvm/trunk/vm/vmcore: include/jvmti_internal.h src/init/harmony.properties src/init/parse_arguments.cpp src/init/vm_properties.cpp src/jvmti/jvmti.cpp Date: Tue, 22 May 2007 19:03:43 -0000 To: commits@harmony.apache.org From: gshimansky@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070522190344.17B491A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gshimansky Date: Tue May 22 12:03:42 2007 New Revision: 540703 URL: http://svn.apache.org/viewvc?view=rev&rev=540703 Log: Applied HARMONY-3931 [drlvm][jvmti] It would be nice to have an option switching on/off reporting compilness of inlined methods Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp 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?view=diff&rev=540703&r1=540702&r2=540703 ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h Tue May 22 12:03:42 2007 @@ -328,6 +328,16 @@ jvmtiError jvmti_single_step_start(void); jvmtiError jvmti_single_step_stop(void); + bool is_cml_report_inlined() + { + return cml_report_inlined; + } + + void set_cml_report_inlined(bool value) + { + cml_report_inlined = value; + } + private: protected: @@ -346,6 +356,7 @@ unsigned prepareListNumber; unsigned global_capabilities; bool single_step_enabled; + bool cml_report_inlined; }; /* end of class DebugUtilsTI */ jvmtiError add_event_to_thread(jvmtiEnv *env, jvmtiEvent event_type, jthread event_thread); Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties?view=diff&rev=540703&r1=540702&r2=540703 ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/harmony.properties Tue May 22 12:03:42 2007 @@ -43,7 +43,7 @@ ECHO025=\ -Xint\n Use interpreter to execute the program\n -Xgc:\n Specify gc specific options\n -Xem:\n Specify em specific options\n -Xdumpstubs\n Writes stubs generated by LIL to disk\n -Xparallel_jit\n Launch compilation in parallel (default)\n -Xno_parallel_jit\n Do not launch compilation in parallel\n -Xdumpfile:\n Specifies a file name for the dump\n -XX:=\n set an internal system property ECHO026=Boolean-valued properties (set to one of {on,true,1,off,false,0} through -XD=):\n\n vm.assert_dialog (default TRUE):\n If false, prevent assertion failures from popping up a dialog box. ECHO027=\ vm.crash_handler (default FALSE):\n Invoke gdb on crashes. -ECHO028=\ vm.finalize (default TRUE):\n Run finalizers.\n vm.jit_may_inline_sync (default TRUE):\n The JIT is allowed to inline part of the synchronization sequence.\n vm.use_interpreter (default FALSE):\n Use interpreter not jit.\n vm.use_verifier (default TRUE):\n Use verifier.\n vm.jvmti.enabled (default FALSE):\n Whether JVMTI mode is enabled.\n vm.bootclasspath.appendclasspath (default FALSE):\n Append classpath to the bootclasspath.\n\nOther properties:\n\n vm.boot.library.path:\n List of directories which contain additional dynamic libraries to load into VM.\n vm.boot.class.path:\n Virtual machine bootclasspath.\n vm.dlls:\n A '{0}'-delimited list of modular dlls (GC/etc.) to load at startup.\n vm.em_dll:\n A '{0}'-execution manager (EM) dll to load at startup.\n vm.other_natives_dlls:\n A '{0}'-delimited list of dll s contained native methods implementations to load at startup.\n vm.components..classpath:\n Part of a 's classpath to append to the JDK booclasspath\n vm.components..startupclass:\n A class to be initialized during startup +ECHO028=\ vm.finalize (default TRUE):\n Run finalizers.\n vm.jit_may_inline_sync (default TRUE):\n The JIT is allowed to inline part of the synchronization sequence.\n vm.use_interpreter (default FALSE):\n Use interpreter not jit.\n vm.use_verifier (default TRUE):\n Use verifier.\n vm.jvmti.enabled (default FALSE):\n Whether JVMTI mode is enabled.\n vm.jvmti.compiled_method_load.inlined (default FALSE):\n Report inlined methods with JVMTI_EVENT_COMPILED_METHOD_LOAD. Makes sense for optimizing jit.\n vm.bootclasspath.appendclasspath (default FALSE):\n Append classpath to the bootclasspath.\n\nOther properties:\n\n vm.boot.library.path:\n List of directories which contain additional dynamic libraries to load into VM.\n vm.boot.class.path:\n Virtual machine bootclasspath.\n vm.dlls:\n A '{0}'-delimited list of modular dlls (GC/etc.) to load at startup.\n vm.em_dll:\n A '{0}'-execution manager (EM) dll to load at startup.\n vm.other_natives_dlls:\n A '{0}'-delimited list of dlls contained native methods implementations to load at startup.\n vm.components..classpath:\n Part of a 's classpath to append to the JDK booclasspath\n vm.components..startupclass:\n A class to be initialized during startup ECHO029=Use {0} -help to get help on command line options ECHO030=Unknown option {0} ECHO031=Unknown argument {0} of -Xhelp: option Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp?view=diff&rev=540703&r1=540702&r2=540703 ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp Tue May 22 12:03:42 2007 @@ -238,6 +238,8 @@ " Use verifier.\n" " vm.jvmti.enabled (default FALSE):\n" " Whether JVMTI mode is enabled.\n" + " vm.jvmti.compiled_method_load.inlined (default FALSE):\n" + " Report inlined methods with JVMTI_EVENT_COMPILED_METHOD_LOAD. Makes sense for optimizing jit.\n" " vm.bootclasspath.appendclasspath (default FALSE):\n" " Append classpath to the bootclasspath.\n" "\nOther properties:\n\n" Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?view=diff&rev=540703&r1=540702&r2=540703 ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Tue May 22 12:03:42 2007 @@ -270,6 +270,7 @@ properties.set_new("vm.jit_may_inline_sync", "true"); properties.set_new("vm.use_verifier", "true"); properties.set_new("vm.jvmti.enabled", "false"); + properties.set_new("vm.jvmti.compiled_method_load.inlined", "false"); properties.set_new("vm.bootclasspath.appendclasspath", "false"); properties.set_new("vm.dlls", PORT_DSO_NAME(GC_DLL)); Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp?view=diff&rev=540703&r1=540702&r2=540703 ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp Tue May 22 12:03:42 2007 @@ -321,7 +321,8 @@ loadListNumber(0), prepareListNumber(0), global_capabilities(0), - single_step_enabled(false) + single_step_enabled(false), + cml_report_inlined(false) { jvmtiError UNUSED res = _allocate( MAX_NOTIFY_LIST * sizeof(Class**), (unsigned char**)¬ifyLoadList ); @@ -634,6 +635,11 @@ else { status = true; + + cml_report_inlined = (bool) get_boolean_property( + "vm.jvmti.compiled_method_load.inlined", + FALSE, VM_PROPERTIES); + // FIXME: workaround to let get_vm_thread_ptr_safe function and other JNI code // to work in OnLoad phase NativeObjectHandles noh; @@ -780,7 +786,8 @@ if (!ti->isEnabled()) return; - flags->exe_notify_compiled_method_load = 1; + if (ti->is_cml_report_inlined()) + flags->exe_notify_compiled_method_load = 1; flags->exe_do_code_mapping = flags->exe_do_local_var_mapping = 1;