rev 56044 : imported patch 8230184.patch rev 56046 : v2.00 -> v2.05 (CR5/v2.05/8-for-jdk13) patches combined into one; merge with 8229212.patch; merge with jdk-14+11; merge with 8230184.patch. rev 56048 : Add OM_CACHE_LINE_SIZE so that ObjectMonitor cache line sizes can be experimented with independently of DEFAULT_CACHE_LINE_SIZE; for SPARC and X64 configs that use 128 for DEFAULT_CACHE_LINE_SIZE, we are experimenting with 64; move _previous_owner_tid and _allocation_state fields to share the cache line with ObjectMonitor::_header; put ObjectMonitor::_ref_count on its own cache line after _owner; add 'int* count_p' parameter to deflate_monitor_list() and deflate_monitor_list_using_JT() and push counter updates down to where the ObjectMonitors are actually removed from the in-use lists; monitors_iterate() async deflation check should use negative ref_count; add 'JavaThread* target' param to deflate_per_thread_idle_monitors_using_JT() add deflate_common_idle_monitors_using_JT() to make it clear which JavaThread* is the target of the work and which is the calling JavaThread* (self); g_free_list, g_om_in_use_list and g_om_in_use_count are now static to synchronizer.cpp (reduce scope); add more diagnostic info to some assert()'s; minor code cleanups and code motion; save_om_ptr() should detect a race with a deflating thread that is bailing out and cause a retry when the ref_count field is not positive; merge with jdk-14+11; add special GC support for TestHumongousClassLoader.java; merge with 8230184.patch. rev 56049 : Merge the remainder of the lock-free monitor list changes from v2.06 with v2.06a and v2.06b after running the changes through the edit scripts; merge pieces from dcubed.monitor_deflate_conc.v2.06d in dcubed.monitor_deflate_conc.v2.06[ac]; merge pieces from dcubed.monitor_deflate_conc.v2.06e into dcubed.monitor_deflate_conc.v2.06c; merge with jdk-14+11; test work around for test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java should not been needed anymore.
893 nonstatic_field(ciField, _constant_value, ciConstant) \
894 \
895 nonstatic_field(ciObjectFactory, _ci_metadata, GrowableArray<ciMetadata*>*) \
896 nonstatic_field(ciObjectFactory, _symbols, GrowableArray<ciSymbol*>*) \
897 nonstatic_field(ciObjectFactory, _unloaded_methods, GrowableArray<ciMethod*>*) \
898 \
899 nonstatic_field(ciConstant, _type, BasicType) \
900 nonstatic_field(ciConstant, _value._int, jint) \
901 nonstatic_field(ciConstant, _value._long, jlong) \
902 nonstatic_field(ciConstant, _value._float, jfloat) \
903 nonstatic_field(ciConstant, _value._double, jdouble) \
904 nonstatic_field(ciConstant, _value._object, ciObject*) \
905 \
906 /************/ \
907 /* Monitors */ \
908 /************/ \
909 \
910 volatile_nonstatic_field(ObjectMonitor, _header, markWord) \
911 unchecked_nonstatic_field(ObjectMonitor, _object, sizeof(void *)) /* NOTE: no type */ \
912 unchecked_nonstatic_field(ObjectMonitor, _owner, sizeof(void *)) /* NOTE: no type */ \
913 nonstatic_field(ObjectMonitor, _next_om, ObjectMonitor*) \
914 volatile_nonstatic_field(BasicLock, _displaced_header, markWord) \
915 volatile_nonstatic_field(ObjectMonitor, _contentions, jint) \
916 volatile_nonstatic_field(ObjectMonitor, _waiters, jint) \
917 volatile_nonstatic_field(ObjectMonitor, _recursions, intptr_t) \
918 nonstatic_field(BasicObjectLock, _lock, BasicLock) \
919 nonstatic_field(BasicObjectLock, _obj, oop) \
920 static_ptr_volatile_field(ObjectSynchronizer, g_block_list, PaddedObjectMonitor*) \
921 \
922 /*********************/ \
923 /* Matcher (C2 only) */ \
924 /*********************/ \
925 \
926 unchecked_c2_static_field(Matcher, _regEncode, sizeof(Matcher::_regEncode)) /* NOTE: no type */ \
927 \
928 c2_nonstatic_field(Node, _in, Node**) \
929 c2_nonstatic_field(Node, _out, Node**) \
930 c2_nonstatic_field(Node, _cnt, node_idx_t) \
931 c2_nonstatic_field(Node, _max, node_idx_t) \
932 c2_nonstatic_field(Node, _outcnt, node_idx_t) \
933 c2_nonstatic_field(Node, _outmax, node_idx_t) \
|
893 nonstatic_field(ciField, _constant_value, ciConstant) \
894 \
895 nonstatic_field(ciObjectFactory, _ci_metadata, GrowableArray<ciMetadata*>*) \
896 nonstatic_field(ciObjectFactory, _symbols, GrowableArray<ciSymbol*>*) \
897 nonstatic_field(ciObjectFactory, _unloaded_methods, GrowableArray<ciMethod*>*) \
898 \
899 nonstatic_field(ciConstant, _type, BasicType) \
900 nonstatic_field(ciConstant, _value._int, jint) \
901 nonstatic_field(ciConstant, _value._long, jlong) \
902 nonstatic_field(ciConstant, _value._float, jfloat) \
903 nonstatic_field(ciConstant, _value._double, jdouble) \
904 nonstatic_field(ciConstant, _value._object, ciObject*) \
905 \
906 /************/ \
907 /* Monitors */ \
908 /************/ \
909 \
910 volatile_nonstatic_field(ObjectMonitor, _header, markWord) \
911 unchecked_nonstatic_field(ObjectMonitor, _object, sizeof(void *)) /* NOTE: no type */ \
912 unchecked_nonstatic_field(ObjectMonitor, _owner, sizeof(void *)) /* NOTE: no type */ \
913 volatile_nonstatic_field(ObjectMonitor, _next_om, ObjectMonitor*) \
914 volatile_nonstatic_field(BasicLock, _displaced_header, markWord) \
915 volatile_nonstatic_field(ObjectMonitor, _contentions, jint) \
916 volatile_nonstatic_field(ObjectMonitor, _waiters, jint) \
917 volatile_nonstatic_field(ObjectMonitor, _recursions, intptr_t) \
918 nonstatic_field(BasicObjectLock, _lock, BasicLock) \
919 nonstatic_field(BasicObjectLock, _obj, oop) \
920 static_ptr_volatile_field(ObjectSynchronizer, g_block_list, PaddedObjectMonitor*) \
921 \
922 /*********************/ \
923 /* Matcher (C2 only) */ \
924 /*********************/ \
925 \
926 unchecked_c2_static_field(Matcher, _regEncode, sizeof(Matcher::_regEncode)) /* NOTE: no type */ \
927 \
928 c2_nonstatic_field(Node, _in, Node**) \
929 c2_nonstatic_field(Node, _out, Node**) \
930 c2_nonstatic_field(Node, _cnt, node_idx_t) \
931 c2_nonstatic_field(Node, _max, node_idx_t) \
932 c2_nonstatic_field(Node, _outcnt, node_idx_t) \
933 c2_nonstatic_field(Node, _outmax, node_idx_t) \
|