Fixes #12 memory leak in ThreadPoolExecutor

vegardit · Sep 10, 2021 · 9518520 · 9518520
1 parent 4f2fa0e
commit 9518520
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+### Fixed
+- [Issue #12](https://github.com/vegardit/haxe-concurrent/issues/12) memory leak in ThreadPoolExecutor
+
+
 ## [3.0.1] - 2021-08-01
 
 ### Fixed

diff --git a/src/hx/concurrent/executor/ThreadPoolExecutor.hx b/src/hx/concurrent/executor/ThreadPoolExecutor.hx
@@ -72,10 +72,14 @@ class ThreadPoolExecutor extends Executor {
             /*
              * purge done tasks from list
              */
-            if (doneTasks.length > 0)
+            if (doneTasks.length > 0) {
                for (t in doneTasks)
                   _scheduledTasks.remove(t);
 
+               #if python @:nullSafety(Off) #end // null-safety false positive
+               doneTasks.resize(0);
+            }
+
             /*
              * process newly scheduled tasks or sleep
              */
@@ -123,7 +127,10 @@ class ThreadPoolExecutor extends Executor {
          if (state != RUNNING)
             throw 'Cannot accept new tasks. Executor is not in state [RUNNING] but [$state].';
 
-         final future = new TaskFutureImpl<T>(this, task, schedule == null ? Executor.NOW_ONCE : schedule);
+         if (schedule == null)
+            schedule = Executor.NOW_ONCE;
+
+         final future = new TaskFutureImpl<T>(this, task, schedule);
 
          // skip round-trip via scheduler for one-shot tasks that should be executed immediately
          switch(schedule) {