wait() via method

jdksjolen · Feb 11, 2025 · c1c2ee7 · c1c2ee7
1 parent 9a923d6
commit c1c2ee7
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/hotspot/share/logging/logAsyncWriter.cpp b/src/hotspot/share/logging/logAsyncWriter.cpp
@@ -42,10 +42,16 @@ class AsyncLogWriter::AsyncLogLocker : public StackObj {
   }
 
   ~AsyncLogLocker() {
-    assert(_holder == Thread::current_or_null(), "must be");
+    assert(_holder == nullptr || _holder == Thread::current_or_null(), "must be");
     _holder = nullptr;
     _instance->_lock.unlock();
   }
+
+  void wait() {
+    _holder = nullptr;
+    _instance->_lock.wait(0/* no timeout */);
+    _holder = Thread::current_or_null();
+  }
 };
 
 Thread* AsyncLogWriter::AsyncLogLocker::_holder = nullptr;
@@ -205,7 +211,7 @@ void AsyncLogWriter::run() {
       AsyncLogLocker locker;
 
       while (!_data_available) {
-        _lock.wait(0/* no timeout */);
+        locker.wait();
       }
       // Only doing a swap and statistics under the lock to
       // guarantee that I/O jobs don't block logsites.