Skip to content

Commit 5260d9f

Browse files
author
duke
committed
Added webrev for jdk/9048
1 parent 63de742 commit 5260d9f

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

jdk/9048/01/commits.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"commit":{"message":"Add a newline"},"files":[{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSetNMethod.cpp"}],"sha":"b4ef6d638bf943a6f72c14fb3093cf8f3170d638"},{"commit":{"message":"Merge branch 'master' into 8287818-nmethod-arming"},"files":[{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahThreadLocalData.hpp"}],"sha":"1330572c6e979d6ed66875fb184a7cbb0cc4459b"},{"commit":{"message":"8287818: Shenandoah: adapt nmethod arming from Loom"},"files":[{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSet.cpp"},{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSetNMethod.hpp"},{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahThreadLocalData.hpp"}],"sha":"30a2f41bbe80f87550737fc11a88697b68b33f58"},{"commit":{"message":"Merge branch 'master' into migrate_nmethod_arming_shenandoah"},"files":[],"sha":"f2adfdcdb445ca7a10e85dc6b9483713563d5123"},{"commit":{"message":"v0"},"files":[{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSet.cpp"},{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSetNMethod.cpp"},{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSetNMethod.hpp"},{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahCodeRoots.cpp"},{"filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahThreadLocalData.hpp"}],"sha":"b9e36502db7c7d0ce951f024eef19d3f0f0e9a33"}]

jdk/9048/01/comparison.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"files":[{"patch":"@@ -2,1 +2,1 @@\n- * Copyright (c) 2013, 2021, Red Hat, Inc. All rights reserved.\n+ * Copyright (c) 2013, 2022, Red Hat, Inc. All rights reserved.\n@@ -26,1 +26,1 @@\n-#include \"gc\/shenandoah\/shenandoahBarrierSet.hpp\"\n+#include \"gc\/shared\/barrierSetNMethod.hpp\"\n@@ -102,1 +102,5 @@\n- ShenandoahThreadLocalData::set_disarmed_value(thread, ShenandoahCodeRoots::disarmed_value());\n+\n+ BarrierSetNMethod* bs_nm = barrier_set_nmethod();\n+ if (bs_nm != NULL) {\n+ thread->set_nmethod_disarm_value(bs_nm->disarmed_value());\n+ }\n","filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSet.cpp","additions":7,"deletions":3,"binary":false,"changes":10,"status":"modified"},{"patch":"@@ -73,12 +73,0 @@\n-\n-int ShenandoahBarrierSetNMethod::disarmed_value() const {\n- return ShenandoahCodeRoots::disarmed_value();\n-}\n-\n-ByteSize ShenandoahBarrierSetNMethod::thread_disarmed_offset() const {\n- return ShenandoahThreadLocalData::disarmed_value_offset();\n-}\n-\n-int* ShenandoahBarrierSetNMethod::disarmed_value_address() const {\n- return ShenandoahCodeRoots::disarmed_value_address();\n-}\n","filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSetNMethod.cpp","additions":0,"deletions":12,"binary":false,"changes":12,"status":"modified"},{"patch":"@@ -2,1 +2,1 @@\n- * Copyright (c) 2019, Red Hat, Inc. All rights reserved.\n+ * Copyright (c) 2019, 2022, Red Hat, Inc. All rights reserved.\n@@ -38,4 +38,0 @@\n-protected:\n- virtual int disarmed_value() const;\n- virtual bool nmethod_entry_barrier(nmethod* nm);\n-\n@@ -46,2 +42,1 @@\n- virtual ByteSize thread_disarmed_offset() const;\n- virtual int* disarmed_value_address() const;\n+ virtual bool nmethod_entry_barrier(nmethod* nm);\n","filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahBarrierSetNMethod.hpp","additions":2,"deletions":7,"binary":false,"changes":9,"status":"modified"},{"patch":"@@ -129,11 +129,1 @@\n- assert(SafepointSynchronize::is_at_safepoint(), \"Must be at a safepoint\");\n- _disarmed_value ++;\n- \/\/ 0 is reserved for new nmethod\n- if (_disarmed_value == 0) {\n- _disarmed_value = 1;\n- }\n-\n- JavaThreadIteratorWithHandle jtiwh;\n- for (JavaThread *thr = jtiwh.next(); thr != NULL; thr = jtiwh.next()) {\n- ShenandoahThreadLocalData::set_disarmed_value(thr, _disarmed_value);\n- }\n+ BarrierSet::barrier_set()->barrier_set_nmethod()->arm_all_nmethods();\n","filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahCodeRoots.cpp","additions":1,"deletions":11,"binary":false,"changes":12,"status":"modified"},{"patch":"@@ -2,1 +2,1 @@\n- * Copyright (c) 2018, 2020, Red Hat, Inc. All rights reserved.\n+ * Copyright (c) 2018, 2022, Red Hat, Inc. All rights reserved.\n@@ -47,1 +47,0 @@\n- int _disarmed_value;\n@@ -57,1 +56,0 @@\n- _disarmed_value(0),\n@@ -59,4 +57,0 @@\n-\n- \/\/ At least on x86_64, nmethod entry barrier encodes _disarmed_value offset\n- \/\/ in instruction as disp8 immed\n- assert(in_bytes(disarmed_value_offset()) < 128, \"Offset range check\");\n@@ -132,4 +126,0 @@\n- static void set_disarmed_value(Thread* thread, int value) {\n- data(thread)->_disarmed_value = value;\n- }\n-\n@@ -185,4 +175,0 @@\n-\n- static ByteSize disarmed_value_offset() {\n- return Thread::gc_data_offset() + byte_offset_of(ShenandoahThreadLocalData, _disarmed_value);\n- }\n","filename":"src\/hotspot\/share\/gc\/shenandoah\/shenandoahThreadLocalData.hpp","additions":1,"deletions":15,"binary":false,"changes":16,"status":"modified"}]}

jdk/9048/01/metadata.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"head":{"repo":{"full_name":"zhengyu123\/jdk","html_url":"https:\/\/github.com\/zhengyu123\/jdk"},"sha":"b4ef6d638bf943a6f72c14fb3093cf8f3170d638"},"created_at":"2022-06-23T19:02:23.782716267Z","base":{"repo":{"full_name":"openjdk\/jdk","html_url":"https:\/\/git.openjdk.org\/jdk"},"sha":"26c03c1860c6da450b5cd6a46576c78bea682f96"}}

0 commit comments

Comments
 (0)