Fix shutdown protocol

earthling-amzn · Nov 6, 2024 · 89047a7 · 89047a7
1 parent 2320759
commit 89047a7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.cpp
@@ -63,8 +63,12 @@ void ShenandoahUncommitThread::run_service() {
         last_shrink_time = current;
       }
     }
-    MonitorLocker locker(&_lock, Mutex::_no_safepoint_check_flag);
-    locker.wait((int64_t )shrink_period);
+    {
+      MonitorLocker locker(&_lock, Mutex::_no_safepoint_check_flag);
+      if (!_stop_requested.is_set()) {
+        locker.wait((int64_t )shrink_period);
+      }
+    }
   }
 }
 
@@ -135,3 +139,9 @@ void ShenandoahUncommitThread::uncommit(double shrink_before, size_t shrink_unti
     log_info(gc)("Uncommitted " SIZE_FORMAT " regions, in %.3fs", count, elapsed);
   }
 }
+
+void ShenandoahUncommitThread::stop_service() {
+  MonitorLocker locker(&_lock, Mutex::_no_safepoint_check_flag);
+  _stop_requested.set();
+  locker.notify_all();
+}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.hpp b/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.hpp
@@ -33,6 +33,7 @@ class ShenandoahUncommitThread : public ConcurrentGCThread {
   ShenandoahHeap* _heap;
   ShenandoahSharedFlag _soft_max_changed;
   ShenandoahSharedFlag _explicit_gc_requested;
+  ShenandoahSharedFlag _stop_requested;
   Monitor _lock;
 
   bool has_work(double shrink_before, size_t shrink_until) const;
@@ -50,7 +51,7 @@ class ShenandoahUncommitThread : public ConcurrentGCThread {
   void notify_explicit_gc_requested();
 
 protected:
-  void stop_service() override {};
+  void stop_service() override;
 };