v0.3.7 [upload run][save artifact]

hoffstadt · Sep 15, 2020 · 18f60df · 18f60df
1 parent 69e4d01
commit 18f60df
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(MV37DIST ${MV37DIST})
 
 add_definitions(-D_USE_MATH_DEFINES)
 
-add_definitions(-DMV_SANDBOX_VERSION="0.3.6")
+add_definitions(-DMV_SANDBOX_VERSION="0.3.7")
 
 if(MV37DIST)
     add_definitions(-DMV_PYTHON_VERSION=37)

diff --git a/DearPyGui/src/Core/mvThreadPool.h b/DearPyGui/src/Core/mvThreadPool.h
@@ -300,8 +300,6 @@ namespace Marvel {
 
         typedef mvFunctionWrapper task_type;
 
-        std::atomic_bool ready_to_delete = false;
-
     public:
 
         explicit mvThreadPool(unsigned threadcount) :
@@ -333,7 +331,7 @@ namespace Marvel {
 
         ~mvThreadPool() { m_done = true; }
 
-        bool isReadyToDelete() const { return ready_to_delete; }
+        bool isReadyToDelete() const { return m_taskCount == 0; }
 
         void setDone() { m_done = true; }
 
@@ -372,19 +370,16 @@ namespace Marvel {
                 pop_task_from_pool_queue(task) ||
                 pop_task_from_other_thread_queue(task))
             {
+                m_taskCount++;
                 task();
+                m_taskCount--;
 
-                if (m_done)
-                    ready_to_delete = true;
             }
 
             else
-            {
                 std::this_thread::yield();
 
-                if (m_done)
-                    ready_to_delete = true;
-            }
+
         }
 
         bool pop_task_from_local_queue(task_type& task)
@@ -418,6 +413,7 @@ namespace Marvel {
         mvThreadJoiner                                     m_joiner;
         static thread_local mvWorkStealingQueue*           m_local_work_queue;
         static thread_local unsigned                       m_index;
+        std::atomic_int                                    m_taskCount = 0;
 
     };
 

diff --git a/DearSandbox/Demo.py b/DearSandbox/Demo.py
@@ -432,7 +432,7 @@ def UpdateDrawing(sender, data):
     def LongCallback2(sender, data):
         for i in range(0, 10000000):
             pass
-        log_info("Done with process from " + data)
+        #log_info("Done with process from " + data)
         return 42
 
     def ReturnFromLongProcess(sender, data):

diff --git a/Scripts/BuildForWin64.bat b/Scripts/BuildForWin64.bat
@@ -10,5 +10,5 @@ cd Distribution
 call "%dir%..\Dependencies\cpython\PCbuild\amd64\python.exe" "BuildPythonWheel.py" ../cmake-build-release/DearPyGui/Release/dearpygui.pyd dearpygui.pyd
 call "%dir%..\Dependencies\cpython\PCbuild\amd64\python.exe" -m setup bdist_wheel --plat-name win_amd64 --dist-dir ../dist
 call "%dir%..\Dependencies\cpython\PCbuild\amd64\python.exe" BuildPythonWheel.py ../cmake-build-release/DearPyGui/Release/dearpygui.pyd dearpygui.pyd
-call python -m pip install "%dir%../dist/dearpygui-0.3.6b0-cp38-cp38-win_amd64.whl"
+call python -m pip install "%dir%../dist/dearpygui-0.3.8b0-cp38-cp38-win_amd64.whl"
 pause
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -23,7 +23,7 @@ HOW TO UPDATE?
 - Please report any issue!
 
 -----------------------------------------------------------------------
- VERSION 0.3.6 (9/14/2020)
+ VERSION 0.3.7 (9/14/2020)
 -----------------------------------------------------------------------
 
 Decorated log: https://github.com/hoffstadt/DearPyGui/releases/tag/v0.3.6