Merge pull request #14 from crystian/dev

Potential fix to loop thread deadlock issue
crystian · Jan 11, 2024 · d3b6607 · d3b6607
2 parents c4ff152 + fbd499c
commit d3b6607
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -513,6 +513,9 @@ You have predefined switches (string, latent, image, conditioning) but you can u
 
 ### Crystools
 
+### 1.6.0 (11/01/2024)
+- Fix issue [#7](https://github.com/crystian/ComfyUI-Crystools/issues/7) to the loop deadlock on concurrency
+
 ### 1.5.0 (10/01/2024)
 - Improvements on the resources monitor and how handle the threads
 - Some fixes 

diff --git a/__init__.py b/__init__.py
@@ -2,7 +2,7 @@
 @author: Crystian
 @title: Crystools
 @nickname: Crystools
-@version: 1.5.0
+@version: 1.6.0
 @project: "https://github.com/crystian/ComfyUI-Crystools",
 @description: Plugins for multiples uses, mainly for debugging, you need them! IG: https://www.instagram.com/crystian.ia
 """

diff --git a/core/version.py b/core/version.py
@@ -1 +1 @@
-version = "1.5.0"
+version = "1.6.0"
diff --git a/general/monitor.py b/general/monitor.py
@@ -6,7 +6,7 @@
 
 from ..core import logger
 
-# lock = threading.Lock()
+lock = threading.Lock()
 
 
 class CMonitor:
@@ -47,7 +47,9 @@ def startMonitor(self):
         self.threadController.clear()
 
         if self.monitorThread is None or not self.monitorThread.is_alive():
+            lock.acquire()
             self.monitorThread = threading.Thread(target=self.monitorLoop)
+            lock.release()
             self.monitorThread.daemon = True
             self.monitorThread.start()
 

diff --git a/version b/version
@@ -1 +1 @@
-1.5.0
+1.6.0