voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify pool.join logic by just calling each job's join.

Browse source
This commit is contained in:
Ethan Dalool 2020-02-12 17:29:29 -08:00
parent a1f26200fa
commit b7a2c3b19b
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
voussoirkit/threadpool.py
View file

@ -70,8 +70,9 @@ class ThreadPool:
''' '''
When a job finishes, it will call here. When a job finishes, it will call here.
''' '''
if self.closed or self.paused: if self.paused:
return return
self.clear_done_and_start_jobs() self.clear_done_and_start_jobs()
def assert_not_closed(self): def assert_not_closed(self):
@ -136,15 +137,9 @@ class ThreadPool:
and block until all jobs are complete. and block until all jobs are complete.
''' '''
self.closed = True self.closed = True
self.job_manager_lock.acquire() self.clear_done_and_start_jobs()
while self.unfinished_count() > 0: for job in self.jobs:
print('round') job.join()
for job in self.jobs:
if job.thread:
print(job)
job.thread.join()
self._clear_done_and_start_jobs()
self.job_manager_lock.release()
def running_count(self): def running_count(self):
return sum(1 for job in list(self.jobs) if job.status is RUNNING) return sum(1 for job in list(self.jobs) if job.status is RUNNING)