Adopted GOSoundGroupWorkItem for breaking with Panic on Waiting Grand…

…Orgue#762
oleg68 · Oct 15, 2021 · fe6b957 · fe6b957
1 parent 751b794
commit fe6b957
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/grandorgue/GOSoundGroupWorkItem.cpp b/src/grandorgue/GOSoundGroupWorkItem.cpp
@@ -90,7 +90,11 @@ void GOSoundGroupWorkItem::Run(GOSoundThread *pThread)
 		return;
 	CheckPoint(pThread, "GOSoundGroupWorkItem::Run.10");
 	{
-		GOMutexLocker locker(m_Mutex);
+		GOMutexLocker locker(m_Mutex, false, "GOSoundGroupWorkItem::Run.beforeProcess", pThread);
+
+		if (! locker.IsLocked())
+		  return;
+
 		if (m_Done == 0)
 		{
 			m_Active.Move();
@@ -113,7 +117,11 @@ void GOSoundGroupWorkItem::Run(GOSoundThread *pThread)
 	ProcessReleaseList(m_Release, buffer);
 	CheckPoint(pThread, "GOSoundGroupWorkItem::Run.50");
 	{
-		GOMutexLocker locker(m_Mutex);
+		GOMutexLocker locker(m_Mutex, false, "GOSoundGroupWorkItem::Run.afterProcess", pThread);
+
+		if (! locker.IsLocked())
+		  return;
+
 		if (m_Done == 1)
 		{
 			memcpy(m_Buffer, buffer, m_SamplesPerBuffer * 2 * sizeof(float));
@@ -152,10 +160,11 @@ void GOSoundGroupWorkItem::Finish(bool stop, GOSoundThread *pThread)
 
 	{
 		CheckPoint(pThread, "GOSoundGroupWorkItem::Finish.30");
-		GOMutexLocker locker(m_Mutex);
+		GOMutexLocker locker(m_Mutex, false, "GOSoundGroupWorkItem::Finish", pThread);
+
 		CheckPoint(pThread, "GOSoundGroupWorkItem::Finish.40");
-		if (m_Done != 3)
-			m_Condition.Wait();
+		if (locker .IsLocked() && m_Done != 3)
+			m_Condition.WaitOrStop(pThread);
 		CheckPoint(pThread, "GOSoundGroupWorkItem::Finish.50");
 	}
 }
diff --git a/src/grandorgue/GOSoundGroupWorkItem.h b/src/grandorgue/GOSoundGroupWorkItem.h
@@ -12,6 +12,7 @@
 #include "GOSoundWorkItem.h"
 #include "threading/GOCondition.h"
 #include "threading/GOMutex.h"
+#include "GOSoundThread.h"
 
 class GOSoundEngine;
 

diff --git a/src/grandorgue/GOSoundThread.cpp b/src/grandorgue/GOSoundThread.cpp
@@ -40,9 +40,12 @@ void GOSoundThread::Entry()
 		if (shouldStop)
 			break;
 
-		GOMutexLocker lock(m_Mutex);
+		GOMutexLocker lock(m_Mutex, false, "GOSoundThread::Entry", this);
 
-		m_Condition.Wait();
+		if (! lock.IsLocked() || ShouldStop())
+		  break;
+		if (! m_Condition.WaitOrStop(this))
+		  break;
 	}
 	return;
 }