fix: Replaced mutex with recursive_mutex (hoffstadt#1985)

v-ein · Jan 6, 2023 · a82f84c · a82f84c
1 parent 7901915
commit a82f84c
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 122 deletions.
diff --git a/src/dearpygui_commands.h b/src/dearpygui_commands.h
diff --git a/src/mvContext.cpp b/src/mvContext.cpp
@@ -194,7 +194,7 @@ Render()
     mvToolManager::Draw();
 
     {
-        std::lock_guard<std::mutex> lk(GContext->mutex);
+        std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
         if (GContext->resetTheme)
         {
             SetDefaultTheme();

diff --git a/src/mvContext.h b/src/mvContext.h
@@ -102,9 +102,8 @@ struct mvIO
 struct mvContext
 {
     std::atomic_bool    waitOneFrame       = false;
-    std::atomic_bool    manualMutexControl = false;
     std::atomic_bool    started            = false;
-    std::mutex          mutex;
+    std::recursive_mutex mutex;
     std::future<bool>   future;
     float               deltaTime = 0.0f;   // time since last frame
     double              time      = 0.0;    // total time since starting

diff --git a/src/mvItemRegistry.cpp b/src/mvItemRegistry.cpp
@@ -1365,7 +1365,7 @@ AddItemWithRuntimeChecks(mvItemRegistry& registry, std::shared_ptr<mvAppItem> it
     };
     AddTechnique technique = AddTechnique::NONE;
 
-    if (!GContext->manualMutexControl) std::lock_guard<std::mutex> lk(GContext->mutex);
+    std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
     //---------------------------------------------------------------------------
     // STEP 2: handle root case

diff --git a/src/mvLayoutWindow.cpp b/src/mvLayoutWindow.cpp
@@ -119,7 +119,7 @@ void mvLayoutWindow::renderTreeNode(std::shared_ptr<mvAppItem>& item)
 void mvLayoutWindow::drawWidgets()
 {
 
-    std::lock_guard<std::mutex> lk(GContext->mutex);
+    std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
 	mvUUID parentName = 0;
 

diff --git a/src/mvToolWindow.cpp b/src/mvToolWindow.cpp
@@ -38,7 +38,7 @@ void mvToolWindow::draw()
         GContext->input.mousePos.x = (int)x;
         GContext->input.mousePos.y = (int)y;
 
-        std::lock_guard<std::mutex> lk(GContext->mutex);
+        std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
         if (GContext->itemRegistry->activeWindow != getUUID())
             GContext->itemRegistry->activeWindow = getUUID();

diff --git a/src/mvViewport_win32.cpp b/src/mvViewport_win32.cpp
@@ -46,7 +46,7 @@ mvPrerender(mvViewport& viewport)
 
 	{
 		// TODO: we probably need a separate mutex for this
-		std::lock_guard<std::mutex> lk(GContext->mutex);
+		std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
 		if (viewport.posDirty)
 		{
@@ -103,7 +103,7 @@ mvPrerender(mvViewport& viewport)
 
 	{
 		// Font manager is thread-unsafe, so we'd better sync it
-		std::lock_guard<std::mutex> lk(GContext->mutex);
+		std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
 		if (mvToolManager::GetFontManager().isInvalid())
 		{
@@ -157,7 +157,7 @@ mvHandleMsg(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) noexcept
 			}
 
 			{
-				std::lock_guard<std::mutex> lk(GContext->mutex);
+				std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
 					viewport->actualWidth = awidth;
 					viewport->actualHeight = aheight;
@@ -208,7 +208,7 @@ mvHandleMsg(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) noexcept
 
 	case WM_MOVING:
 	{
-		std::lock_guard<std::mutex> lk(GContext->mutex);
+		std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
 		int horizontal_shift = get_horizontal_shift(viewportData->handle);
 		RECT rect = *(RECT*)(lParam);
@@ -239,7 +239,7 @@ mvHandleMsg(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) noexcept
 				cheight = crect.bottom - crect.top;
 			}
 
-			std::lock_guard<std::mutex> lk(GContext->mutex);
+			std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
 			viewport->actualWidth = awidth;
 			viewport->actualHeight = aheight;