diff --git a/runtime/makelib/targets.mk.ftl b/runtime/makelib/targets.mk.ftl index 839910dc0df..87f613efd8a 100644 --- a/runtime/makelib/targets.mk.ftl +++ b/runtime/makelib/targets.mk.ftl @@ -537,21 +537,13 @@ CLANG_CXXFLAGS+=-std=c++0x -D_CRT_SUPPRESS_RESTRICT -DVS12AndHigher CLANG_CXXFLAGS+=-D_M_X64 endif -# special handling MHInterpreterFull.cpp, MHInterpreterCompressed.cpp, BytecodeInterpreterFull.cpp, BytecodeInterpreterCompressed.cpp, CRIUBytecodeInterpreterFull.cpp, CRIUBytecodeInterpreterCompressed.cpp, DebugBytecodeInterpreterFull.cpp and DebugBytecodeInterpreterCompressed.cpp +# special handling MHInterpreterFull.cpp, MHInterpreterCompressed.cpp, BytecodeInterpreterFull.cpp, BytecodeInterpreterCompressed.cpp, DebugBytecodeInterpreterFull.cpp and DebugBytecodeInterpreterCompressed.cpp BytecodeInterpreterFull$(UMA_DOT_O):BytecodeInterpreterFull.cpp $(CLANG_CXX) $(CLANG_CXXFLAGS) -c $< -o $@ BytecodeInterpreterCompressed$(UMA_DOT_O):BytecodeInterpreterCompressed.cpp $(CLANG_CXX) $(CLANG_CXXFLAGS) -c $< -o $@ -ifneq ($(J9VM_OPT_CRIU_SUPPORT),) -CRIUBytecodeInterpreterFull$(UMA_DOT_O):CRIUBytecodeInterpreterFull.cpp - $(CLANG_CXX) $(CLANG_CXXFLAGS) -c $< -o $@ - -CRIUBytecodeInterpreterCompressed$(UMA_DOT_O):CRIUBytecodeInterpreterCompressed.cpp - $(CLANG_CXX) $(CLANG_CXXFLAGS) -c $< -o $@ -endif - DebugBytecodeInterpreterFull$(UMA_DOT_O):DebugBytecodeInterpreterFull.cpp $(CLANG_CXX) $(CLANG_CXXFLAGS) -c $< -o $@ @@ -582,7 +574,7 @@ SharedService$(UMA_DOT_O):SharedService.c <#if uma.spec.processor.ppc> ifndef USE_PPC_GCC -# special handling BytecodeInterpreterFull.cpp, BytecodeInterpreterCompressed.cpp, CRIUBytecodeInterpreterFull.cpp, CRIUBytecodeInterpreterCompressed.cpp, DebugBytecodeInterpreterFull.cpp and DebugBytecodeInterpreterCompressed.cpp +# special handling BytecodeInterpreterFull.cpp, BytecodeInterpreterCompressed.cpp, DebugBytecodeInterpreterFull.cpp and DebugBytecodeInterpreterCompressed.cpp FLAGS_TO_REMOVE += -O3 NEW_OPTIMIZATION_FLAG=-O2 -qdebug=lincomm:ptranl:tfbagg <#if uma.spec.type.linux> @@ -597,14 +589,6 @@ BytecodeInterpreterFull$(UMA_DOT_O):BytecodeInterpreterFull.cpp BytecodeInterpreterCompressed$(UMA_DOT_O):BytecodeInterpreterCompressed.cpp $(CXX) $(SPECIALCXXFLAGS) $(NEW_OPTIMIZATION_FLAG) -c $< -ifneq ($(J9VM_OPT_CRIU_SUPPORT),) -CRIUBytecodeInterpreterFull$(UMA_DOT_O):CRIUBytecodeInterpreterFull.cpp - $(CXX) $(SPECIALCXXFLAGS) $(NEW_OPTIMIZATION_FLAG) -c $< - -CRIUBytecodeInterpreterCompressed$(UMA_DOT_O):CRIUBytecodeInterpreterCompressed.cpp - $(CXX) $(SPECIALCXXFLAGS) $(NEW_OPTIMIZATION_FLAG) -c $< -endif - DebugBytecodeInterpreterFull$(UMA_DOT_O):DebugBytecodeInterpreterFull.cpp $(CXX) $(SPECIALCXXFLAGS) $(NEW_OPTIMIZATION_FLAG) -c $< diff --git a/runtime/makelib/targets.mk.linux.inc.ftl b/runtime/makelib/targets.mk.linux.inc.ftl index bbabc7e531f..81058cc20b3 100644 --- a/runtime/makelib/targets.mk.linux.inc.ftl +++ b/runtime/makelib/targets.mk.linux.inc.ftl @@ -532,7 +532,7 @@ bcverify$(UMA_DOT_O) : bcverify.c ifdef USE_PPC_GCC -# special handling MHInterpreterFull.cpp, MHInterpreterCompressed.cpp, BytecodeInterpreterFull.cpp, BytecodeInterpreterCompressed.cpp, CRIUBytecodeInterpreterFull.cpp, CRIUBytecodeInterpreterCompressed.cpp, DebugBytecodeInterpreterFull.cpp and DebugBytecodeInterpreterCompressed.cpp +# special handling MHInterpreterFull.cpp, MHInterpreterCompressed.cpp, BytecodeInterpreterFull.cpp, BytecodeInterpreterCompressed.cpp, DebugBytecodeInterpreterFull.cpp and DebugBytecodeInterpreterCompressed.cpp BytecodeInterpreterFull$(UMA_DOT_O) : BytecodeInterpreterFull.cpp $(PPC_GCC_CXX) $(PPC_GCC_CXXFLAGS) -c $< @@ -540,14 +540,6 @@ BytecodeInterpreterFull$(UMA_DOT_O) : BytecodeInterpreterFull.cpp BytecodeInterpreterCompressed$(UMA_DOT_O) : BytecodeInterpreterCompressed.cpp $(PPC_GCC_CXX) $(PPC_GCC_CXXFLAGS) -c $< -ifneq ($(J9VM_OPT_CRIU_SUPPORT),) -CRIUBytecodeInterpreterFull$(UMA_DOT_O) : CRIUBytecodeInterpreterFull.cpp - $(PPC_GCC_CXX) $(PPC_GCC_CXXFLAGS) -c $< - -CRIUBytecodeInterpreterCompressed$(UMA_DOT_O) : CRIUBytecodeInterpreterCompressed.cpp - $(PPC_GCC_CXX) $(PPC_GCC_CXXFLAGS) -c $< -endif - DebugBytecodeInterpreterFull$(UMA_DOT_O) : DebugBytecodeInterpreterFull.cpp $(PPC_GCC_CXX) $(PPC_GCC_CXXFLAGS) -c $< diff --git a/runtime/nls/j9vm/j9vm.nls b/runtime/nls/j9vm/j9vm.nls index e0ea2b03ae6..08933f1c45a 100644 --- a/runtime/nls/j9vm/j9vm.nls +++ b/runtime/nls/j9vm/j9vm.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=The check for the transition to the debug interpreter failed -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Value specified to --sun-misc-unsafe-memory-access not recognized: '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_ca.nls b/runtime/nls/j9vm/j9vm_ca.nls index a83a57d09a2..272f7903b27 100644 --- a/runtime/nls/j9vm/j9vm_ca.nls +++ b/runtime/nls/j9vm/j9vm_ca.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=La comprovaci\u00f3 de la transici\u00f3 a l'int\u00e8rpret de depuraci\u00f3 ha fallat -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Valor especificat a --sun-misc-unsafe-memory-access no reconegut: ' %s ' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_cs.nls b/runtime/nls/j9vm/j9vm_cs.nls index 0efbd9cd4af..dfca0444478 100644 --- a/runtime/nls/j9vm/j9vm_cs.nls +++ b/runtime/nls/j9vm/j9vm_cs.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=Kontrola p\u0159echodu na interpret lad\u011bn\u00ed se nezda\u0159ila -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Hodnota ur\u010den\u00e1 pro --sun-misc-unsafe-memory-access nebyla rozpozn\u00e1na: ' %s ' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_de.nls b/runtime/nls/j9vm/j9vm_de.nls index 76363fd5fbb..6233f6ec474 100644 --- a/runtime/nls/j9vm/j9vm_de.nls +++ b/runtime/nls/j9vm/j9vm_de.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=Die Pr\u00fcfung auf den \u00dcbergang zum Debug-Interpreter ist fehlgeschlagen -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Der f\u00fcr --sun-misc-unsafe-memory-access angegebene Wert wurde nicht erkannt: '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_es.nls b/runtime/nls/j9vm/j9vm_es.nls index 81d7400ef7a..8b986ed0701 100644 --- a/runtime/nls/j9vm/j9vm_es.nls +++ b/runtime/nls/j9vm/j9vm_es.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=Fall\u00f3 la comprobaci\u00f3n de la transici\u00f3n al int\u00e9rprete de depuraci\u00f3n -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Valor especificado a --sun-misc-unsafe-memory-access no reconocido: '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_fr.nls b/runtime/nls/j9vm/j9vm_fr.nls index 560ef0ae00e..5e513cf504a 100644 --- a/runtime/nls/j9vm/j9vm_fr.nls +++ b/runtime/nls/j9vm/j9vm_fr.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=La v\u00e9rification du passage \u00e0 l'interpr\u00e9teur de d\u00e9bogage a \u00e9chou\u00e9 -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Valeur sp\u00e9cifi\u00e9e dans --sun-misc-unsafe-memory-access non reconnue : '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_hu.nls b/runtime/nls/j9vm/j9vm_hu.nls index d91096ad13d..6a5faac6699 100644 --- a/runtime/nls/j9vm/j9vm_hu.nls +++ b/runtime/nls/j9vm/j9vm_hu.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=A hibakeres\u0151 \u00e9rtelmez\u0151re val\u00f3 \u00e1t\u00e1ll\u00e1s ellen\u0151rz\u00e9se nem siker\u00fclt -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=--sun-misc-unsafe-memory-access nem ismeri fel a megadott \u00e9rt\u00e9ket: ' %s ' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_it.nls b/runtime/nls/j9vm/j9vm_it.nls index 606f414b457..b2030223b01 100644 --- a/runtime/nls/j9vm/j9vm_it.nls +++ b/runtime/nls/j9vm/j9vm_it.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=Il controllo per il passaggio all'interprete di debug \u00e8 fallito -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Valore specificato per --sun-misc-unsafe-memory-access non riconosciuto: '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_ja.nls b/runtime/nls/j9vm/j9vm_ja.nls index 21afa36e72e..5f255b273ee 100644 --- a/runtime/nls/j9vm/j9vm_ja.nls +++ b/runtime/nls/j9vm/j9vm_ja.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=\u30c7\u30d0\u30c3\u30b0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d7\u30ea\u30bf\u3078\u306e\u79fb\u884c\u30c1\u30a7\u30c3\u30af\u306b\u5931\u6557 -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=--sun-misc-unsafe-memory-access\u306b\u6307\u5b9a\u3055\u308c\u305f\u5024\u304c\u8a8d\u8b58\u3055\u308c\u307e\u305b\u3093: '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_ko.nls b/runtime/nls/j9vm/j9vm_ko.nls index 17efeeb2e24..83ec1dceb07 100644 --- a/runtime/nls/j9vm/j9vm_ko.nls +++ b/runtime/nls/j9vm/j9vm_ko.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=\ub514\ubc84\uadf8 \uc778\ud130\ud504\ub9ac\ud130\ub85c\uc758 \uc804\ud658 \ud655\uc778\uc5d0 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4 -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=--sun-misc-unsafe-memory-access\uc5d0 \uc9c0\uc815\ub41c \uac12\uc774 \uc778\uc2dd\ub418\uc9c0 \uc54a\uc74c: '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_pl.nls b/runtime/nls/j9vm/j9vm_pl.nls index be2edb92834..03d3531ec36 100644 --- a/runtime/nls/j9vm/j9vm_pl.nls +++ b/runtime/nls/j9vm/j9vm_pl.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=Sprawdzenie przej\u015bcia do interpretera debugowania nie powiod\u0142o si\u0119 -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Warto\u015b\u0107 okre\u015blona w --sun-misc-unsafe-memory-access nie zosta\u0142a rozpoznana: ' %s ' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_pt_BR.nls b/runtime/nls/j9vm/j9vm_pt_BR.nls index d5b268e1dc6..20b87455efe 100644 --- a/runtime/nls/j9vm/j9vm_pt_BR.nls +++ b/runtime/nls/j9vm/j9vm_pt_BR.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=A verifica\u00e7\u00e3o da transi\u00e7\u00e3o para o interpretador de depura\u00e7\u00e3o falhou -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Valor especificado para --sun-misc-unsafe-memory-access n\u00e3o reconhecido: '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_ru.nls b/runtime/nls/j9vm/j9vm_ru.nls index fe9ba67f839..e4e338cb31a 100644 --- a/runtime/nls/j9vm/j9vm_ru.nls +++ b/runtime/nls/j9vm/j9vm_ru.nls @@ -2396,13 +2396,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0430 \u043a \u043e\u0442\u043b\u0430\u0434\u043e\u0447\u043d\u043e\u043c\u0443 \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0442\u043e\u0440\u0443 \u043d\u0435 \u0443\u0434\u0430\u043b\u0430\u0441\u044c -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435, \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0435 \u0434\u043b\u044f --sun-misc-unsafe-memory-access \u043d\u0435 \u0440\u0430\u0441\u043f\u043e\u0437\u043d\u0430\u043d\u043e: ' %s ' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_sk.nls b/runtime/nls/j9vm/j9vm_sk.nls index b25889d5e5a..7e79f4d098a 100644 --- a/runtime/nls/j9vm/j9vm_sk.nls +++ b/runtime/nls/j9vm/j9vm_sk.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=Kontrola prechodu na interpret ladenia zlyhala -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Hodnota zadan\u00e1 pre --sun-misc-unsafe-memory-access nebola rozpoznan\u00e1: ' %s ' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_sl.nls b/runtime/nls/j9vm/j9vm_sl.nls index 407a9ce4c2a..272858a5c2b 100644 --- a/runtime/nls/j9vm/j9vm_sl.nls +++ b/runtime/nls/j9vm/j9vm_sl.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=Preverjanje prehoda na tolma\u010d za odpravljanje napak ni uspelo -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=Vrednost, dolo\u010dena za --sun-misc-unsafe-memory-access ni prepoznana: ' %s ' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_tr.nls b/runtime/nls/j9vm/j9vm_tr.nls index 48981b1ddb8..af29974866d 100644 --- a/runtime/nls/j9vm/j9vm_tr.nls +++ b/runtime/nls/j9vm/j9vm_tr.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=Hata ay\u0131klama yorumlay\u0131c\u0131s\u0131na ge\u00e7i\u015f denetimi ba\u015far\u0131s\u0131z oldu -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=--sun-misc-unsafe-memory-access i\u00e7in belirtilen de\u011fer tan\u0131nm\u0131yor: ' %s ' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_zh.nls b/runtime/nls/j9vm/j9vm_zh.nls index 8bcfa3863a1..472707a1677 100644 --- a/runtime/nls/j9vm/j9vm_zh.nls +++ b/runtime/nls/j9vm/j9vm_zh.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=\u8fc7\u6e21\u5230\u8c03\u8bd5\u89e3\u91ca\u5668\u7684\u68c0\u67e5\u5931\u8d25 -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=\u4e3a --sun-misc-unsafe-memory-access \u6307\u5b9a\u7684\u503c\u672a\u88ab\u8bc6\u522b\uff1a '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_zh_CN.nls b/runtime/nls/j9vm/j9vm_zh_CN.nls index 8bcfa3863a1..472707a1677 100644 --- a/runtime/nls/j9vm/j9vm_zh_CN.nls +++ b/runtime/nls/j9vm/j9vm_zh_CN.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=\u8fc7\u6e21\u5230\u8c03\u8bd5\u89e3\u91ca\u5668\u7684\u68c0\u67e5\u5931\u8d25 -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=\u4e3a --sun-misc-unsafe-memory-access \u6307\u5b9a\u7684\u503c\u672a\u88ab\u8bc6\u522b\uff1a '%s' # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/nls/j9vm/j9vm_zh_TW.nls b/runtime/nls/j9vm/j9vm_zh_TW.nls index ccdc8633807..26cf2666170 100644 --- a/runtime/nls/j9vm/j9vm_zh_TW.nls +++ b/runtime/nls/j9vm/j9vm_zh_TW.nls @@ -2395,13 +2395,6 @@ J9NLS_VM_DEPRECATED_OPTION.system_action=The JVM will print a deprecation warnin J9NLS_VM_DEPRECATED_OPTION.user_response=Remove the command line option from the command line. # END NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED=\u6aa2\u67e5\u5230\u8abf\u8a66\u89e3\u91cb\u5668\u7684\u8f49\u63db\u5931\u6557 -# START NON-TRANSLATABLE -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.explanation=checkTransitionToDebugInterpreter failed. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.system_action=The JVM will throw a JVMRestoreException. -J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED.user_response=View CRIU documentation to determine how to resolve the error. -# END NON-TRANSLATABLE - J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE=\u7121\u6cd5\u8fa8\u8b58\u6307\u5b9a\u7d66--sun-misc-unsafe-memory-access\u7684\u503c\uff1a\u201c %s \u201d # START NON-TRANSLATABLE J9NLS_VM_UNRECOGNISED_SUN_MISC_UNSAFE_MEMORY_ACCESS_VALUE.sample_input_1=disallow diff --git a/runtime/oti/j9nonbuilder.h b/runtime/oti/j9nonbuilder.h index a70d6891173..95a72f86613 100644 --- a/runtime/oti/j9nonbuilder.h +++ b/runtime/oti/j9nonbuilder.h @@ -4311,6 +4311,7 @@ typedef struct J9DelayedLockingOpertionsRecord { #define J9VM_CRIU_ENABLE_CRIU_SEC_PROVIDER 0x40 #define J9VM_CRAC_IS_CHECKPOINT_ENABLED 0x80 #define J9VM_CRIU_SUPPORT_DEBUG_ON_RESTORE 0x100 +#define J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER 0x200 /* matches maximum count defined by JDWP in threadControl.c */ #define J9VM_CRIU_MAX_DEBUG_THREADS_STORED 10 diff --git a/runtime/vm/CMakeLists.txt b/runtime/vm/CMakeLists.txt index 93e568deee3..780f3862ae6 100644 --- a/runtime/vm/CMakeLists.txt +++ b/runtime/vm/CMakeLists.txt @@ -217,13 +217,6 @@ set(interpreter_sources DebugBytecodeInterpreterFull.cpp ) -if(J9VM_OPT_CRIU_SUPPORT) - list(APPEND interpreter_sources - CRIUBytecodeInterpreterCompressed.cpp - CRIUBytecodeInterpreterFull.cpp - ) -endif() - if(J9VM_OPT_METHOD_HANDLE) list(APPEND interpreter_sources MHInterpreterCompressed.cpp diff --git a/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp b/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp deleted file mode 100644 index 5012e80e1f4..00000000000 --- a/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright IBM Corp. and others 2023 - * - * This program and the accompanying materials are made available under - * the terms of the Eclipse Public License 2.0 which accompanies this - * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ - * or the Apache License, Version 2.0 which accompanies this distribution and - * is available at https://www.apache.org/licenses/LICENSE-2.0. - * - * This Source Code may also be made available under the following - * Secondary Licenses when the conditions for such availability set - * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU - * General Public License, version 2 with the GNU Classpath - * Exception [1] and GNU General Public License, version 2 with the - * OpenJDK Assembly Exception [2]. - * - * [1] https://www.gnu.org/software/classpath/license.html - * [2] https://openjdk.org/legal/assembly-exception.html - * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 - *******************************************************************************/ - -#include "j9cfg.h" - -#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(J9VM_OPT_CRIU_SUPPORT) -#define DO_HOOKS -#define OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES 1 -#define LOOP_NAME criuBytecodeLoopCompressed -#define INTERPRETER_CLASS VM_CRIUBytecodeInterpreterCompressed -#include "BytecodeInterpreter.inc" -#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(J9VM_OPT_CRIU_SUPPORT) */ diff --git a/runtime/vm/CRIUBytecodeInterpreterFull.cpp b/runtime/vm/CRIUBytecodeInterpreterFull.cpp deleted file mode 100644 index 27b3a93f5fa..00000000000 --- a/runtime/vm/CRIUBytecodeInterpreterFull.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright IBM Corp. and others 2023 - * - * This program and the accompanying materials are made available under - * the terms of the Eclipse Public License 2.0 which accompanies this - * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ - * or the Apache License, Version 2.0 which accompanies this distribution and - * is available at https://www.apache.org/licenses/LICENSE-2.0. - * - * This Source Code may also be made available under the following - * Secondary Licenses when the conditions for such availability set - * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU - * General Public License, version 2 with the GNU Classpath - * Exception [1] and GNU General Public License, version 2 with the - * OpenJDK Assembly Exception [2]. - * - * [1] https://www.gnu.org/software/classpath/license.html - * [2] https://openjdk.org/legal/assembly-exception.html - * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 - *******************************************************************************/ - -#include "j9cfg.h" - -#if defined(OMR_GC_FULL_POINTERS) && defined(J9VM_OPT_CRIU_SUPPORT) -#define DO_HOOKS -#define OMR_OVERRIDE_COMPRESS_OBJECT_REFERENCES 0 -#define LOOP_NAME criuBytecodeLoopFull -#define INTERPRETER_CLASS VM_CRIUBytecodeInterpreterFull -#include "BytecodeInterpreter.inc" -#endif /* defined(OMR_GC_FULL_POINTERS) && defined(J9VM_OPT_CRIU_SUPPORT) */ diff --git a/runtime/vm/CRIUHelpers.cpp b/runtime/vm/CRIUHelpers.cpp index aa1de62e09e..26f5a6b356d 100644 --- a/runtime/vm/CRIUHelpers.cpp +++ b/runtime/vm/CRIUHelpers.cpp @@ -58,6 +58,7 @@ static BOOLEAN criuRestoreInitializeTrace(J9VMThread *currentThread, void *userD static BOOLEAN criuRestoreInitializeXrs(J9VMThread *currentThread, void *userData, const char **nlsMsgFormat); static BOOLEAN criuRestoreDisableSharedClassCache(J9VMThread *currentThread, void *userData, const char **nlsMsgFormat); static BOOLEAN criuRestoreInitializeDump(J9VMThread *currentThread, void *userData, const char **nlsMsgFormat); +static BOOLEAN criuRestoreCheckForDebugInterpreterRequest(J9VMThread *currentThread, void *userData, const char **nlsMsgFormat); static jvmtiIterationControl objectIteratorCallback(J9JavaVM *vm, J9MM_IterateObjectDescriptor *objectDesc, void *userData); #if defined(OMR_GC_FULL_POINTERS) UDATA debugBytecodeLoopFull(J9VMThread *currentThread); @@ -185,6 +186,12 @@ isDebugOnRestoreEnabled(J9VMThread *currentThread) return J9_ARE_ALL_BITS_SET(currentThread->javaVM->checkpointState.flags, J9VM_CRIU_SUPPORT_DEBUG_ON_RESTORE) && isCRaCorCRIUSupportEnabled(currentThread); } +BOOLEAN +isTransitionToDebugInterpreterRequested(J9VMThread *currentThread) +{ + return J9_ARE_ALL_BITS_SET(currentThread->javaVM->checkpointState.flags, J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER) && isCRaCorCRIUSupportEnabled(currentThread); +} + void setRequiredGhostFileLimit(J9VMThread *currentThread, U_32 ghostFileLimit) { @@ -319,6 +326,8 @@ criuRestoreInitializeTrace(J9VMThread *currentThread, void *userData, const char *nlsMsgFormat = j9nls_lookup_message(J9NLS_DO_NOT_PRINT_MESSAGE_TAG | J9NLS_DO_NOT_APPEND_NEWLINE, J9NLS_VM_CRIU_RESTORE_INITIALIZE_TRACE_FAILED, NULL); result = FALSE; + } else { + vm->checkpointState.flags |= J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER; } } } @@ -425,12 +434,41 @@ criuRestoreInitializeDump(J9VMThread *currentThread, void *userData, const char *nlsMsgFormat = j9nls_lookup_message(J9NLS_DO_NOT_PRINT_MESSAGE_TAG | J9NLS_DO_NOT_APPEND_NEWLINE, J9NLS_VM_CRIU_RESTORE_INITIALIZE_DUMP_FAILED, NULL); result = FALSE; + } else { + vm->checkpointState.flags |= J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER; } } } return result; } +/** + * An internal JVM checkpoint hook to check for the debug interpreter VMOPT after restore. + * + * @param[in] currentThread vmThread token + * @param[in] userData J9InternalHookRecord pointer + * @param[in/out] nlsMsgFormat an NLS message + * + * @return BOOLEAN TRUE + */ +static BOOLEAN +criuRestoreCheckForDebugInterpreterRequest(J9VMThread *currentThread, void *userData, const char **nlsMsgFormat) +{ + J9JavaVM *vm = currentThread->javaVM; + + if (NULL != vm->checkpointState.restoreArgsList) { + J9VMInitArgs *restoreArgsList = vm->checkpointState.restoreArgsList; + IDATA debugOn = FIND_AND_CONSUME_ARG(restoreArgsList, EXACT_MATCH, VMOPT_XXDEBUGINTERPRETER, NULL); + IDATA debugOff = FIND_AND_CONSUME_ARG(restoreArgsList, EXACT_MATCH, VMOPT_XXNODEBUGINTERPRETER, NULL); + if (debugOn > debugOff) { + vm->checkpointState.flags |= J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER; + } else { + vm->checkpointState.flags &= ~(UDATA)J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER; + } + } + return TRUE; +} + /** * This cleans up the instanceObjects associated with each J9JavaVM->checkpointState.hookRecords, * the hookRecords and classIterationRestoreHookRecords as well if checkpointState.isNonPortableRestoreMode is TRUE. @@ -536,6 +574,7 @@ initializeCriuHooks(J9VMThread *currentThread) addInternalJVMCheckpointHook(currentThread, TRUE, NULL, FALSE, criuRestoreInitializeTrace); addInternalJVMCheckpointHook(currentThread, TRUE, NULL, FALSE, criuRestoreInitializeXrs); addInternalJVMCheckpointHook(currentThread, TRUE, NULL, FALSE, criuRestoreInitializeDump); + addInternalJVMCheckpointHook(currentThread, TRUE, NULL, FALSE, criuRestoreCheckForDebugInterpreterRequest); } addInternalJVMCheckpointHook(currentThread, TRUE, NULL, FALSE, criuRestoreDisableSharedClassCache); @@ -1483,28 +1522,14 @@ transitionToDebugInterpreter(J9JavaVM *vm) } } -static BOOLEAN +static void checkTransitionToDebugInterpreter(J9VMThread *currentThread) { - BOOLEAN result = TRUE; J9JavaVM *vm = currentThread->javaVM; - if (NULL != vm->checkpointState.restoreArgsList) { - J9VMInitArgs *restoreArgsList = vm->checkpointState.restoreArgsList; - IDATA debugOn = FIND_AND_CONSUME_ARG(restoreArgsList, EXACT_MATCH, VMOPT_XXDEBUGINTERPRETER, NULL); - IDATA debugOff = FIND_AND_CONSUME_ARG(restoreArgsList, EXACT_MATCH, VMOPT_XXNODEBUGINTERPRETER, NULL); - if (debugOn > debugOff) { - /* - * The transition to the debug interpreter currently only works with -Xint, - * and the null check for vm->jitConfig will be removed when the jit changes are completed. - */ - if (isDebugOnRestoreEnabled(currentThread) && (NULL == vm->jitConfig)) { - transitionToDebugInterpreter(vm); - } else { - result = FALSE; - } - } + + if (isTransitionToDebugInterpreterRequested(currentThread)) { + transitionToDebugInterpreter(vm); } - return result; } void JNICALL @@ -1912,15 +1937,6 @@ criuCheckpointJVMImpl(JNIEnv *env, case RESTORE_ARGS_RETURN_OK: break; } - - if (!checkTransitionToDebugInterpreter(currentThread)) { - currentExceptionClass = vm->checkpointState.criuJVMRestoreExceptionClass; - nlsMsgFormat = j9nls_lookup_message( - J9NLS_DO_NOT_PRINT_MESSAGE_TAG | J9NLS_DO_NOT_APPEND_NEWLINE, - J9NLS_VM_CRIU_CHECK_TRANSITION_TO_DEBUG_INTERPRETER_FAILED, - NULL); - goto wakeJavaThreadsWithExclusiveVMAccess; - } } if (hasDumpSucceeded) { @@ -1934,6 +1950,9 @@ criuCheckpointJVMImpl(JNIEnv *env, currentExceptionClass = vm->checkpointState.criuJVMRestoreExceptionClass; goto wakeJavaThreadsWithExclusiveVMAccess; } + if (hasDumpSucceeded) { + checkTransitionToDebugInterpreter(currentThread); + } if (J9_ARE_ANY_BITS_SET(vm->checkpointState.flags, J9VM_CRIU_IS_JDWP_ENABLED)) { /* Resuming the threads marked with J9_PRIVATE_FLAGS2_DELAY_HALT_FOR_CHECKPOINT * is only required for JDWP threads. diff --git a/runtime/vm/jvminit.c b/runtime/vm/jvminit.c index 044efbb20d7..2993bb3493f 100644 --- a/runtime/vm/jvminit.c +++ b/runtime/vm/jvminit.c @@ -326,17 +326,11 @@ J9_DECLARE_CONSTANT_UTF8(j9_dispatch, "dispatch"); /* The appropriate bytecodeLoop is selected based on interpreter mode */ #if defined(OMR_GC_FULL_POINTERS) UDATA bytecodeLoopFull(J9VMThread *currentThread); -#if defined(J9VM_OPT_CRIU_SUPPORT) -UDATA criuBytecodeLoopFull(J9VMThread *currentThread); -#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */ UDATA debugBytecodeLoopFull(J9VMThread *currentThread); #endif /* defined(OMR_GC_FULL_POINTERS) */ #if defined(OMR_GC_COMPRESSED_POINTERS) UDATA bytecodeLoopCompressed(J9VMThread *currentThread); -#if defined(J9VM_OPT_CRIU_SUPPORT) -UDATA criuBytecodeLoopCompressed(J9VMThread *currentThread); -#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */ UDATA debugBytecodeLoopCompressed(J9VMThread *currentThread); #endif /* defined(OMR_GC_COMPRESSED_POINTERS) */ @@ -2998,21 +2992,7 @@ VMInitStages(J9JavaVM *vm, IDATA stage, void* reserved) vm->bytecodeLoop = debugBytecodeLoopFull; #endif /* defined(OMR_GC_FULL_POINTERS) */ } - } else -#if defined(J9VM_OPT_CRIU_SUPPORT) - if (J9_ARE_ALL_BITS_SET(vm->checkpointState.flags, J9VM_CRIU_IS_CHECKPOINT_ALLOWED)) { - if (J9JAVAVM_COMPRESS_OBJECT_REFERENCES(vm)) { -#if defined(OMR_GC_COMPRESSED_POINTERS) - vm->bytecodeLoop = criuBytecodeLoopCompressed; -#endif /* defined(OMR_GC_COMPRESSED_POINTERS) */ - } else { -#if defined(OMR_GC_FULL_POINTERS) - vm->bytecodeLoop = criuBytecodeLoopFull; -#endif /* defined(OMR_GC_FULL_POINTERS) */ - } - } else -#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */ - { + } else { if (J9JAVAVM_COMPRESS_OBJECT_REFERENCES(vm)) { #if defined(OMR_GC_COMPRESSED_POINTERS) vm->bytecodeLoop = bytecodeLoopCompressed; @@ -3823,8 +3803,14 @@ processVMArgsFromFirstToLast(J9JavaVM * vm) IDATA noDebugInterpreter = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXNODEBUGINTERPRETER, NULL); if (debugInterpreter > noDebugInterpreter) { vm->extendedRuntimeFlags |= J9_EXTENDED_RUNTIME_DEBUG_MODE; +#if defined(J9VM_OPT_CRIU_SUPPORT) + vm->checkpointState.flags |= J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER; +#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */ } else if (debugInterpreter < noDebugInterpreter) { vm->extendedRuntimeFlags &= ~(UDATA)J9_EXTENDED_RUNTIME_DEBUG_MODE; +#if defined(J9VM_OPT_CRIU_SUPPORT) + vm->checkpointState.flags &= ~(UDATA)J9VM_CRIU_TRANSITION_TO_DEBUG_INTERPRETER; +#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */ } }