oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix shutdown hang

Browse source
This commit is contained in:
shortcutme 2019-12-17 20:36:52 +01:00
parent 87fc8ced5e
commit 77869830c5
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/util/ThreadPool.py
View file

@ -50,7 +50,7 @@ class ThreadPool:
def kill(self): def kill(self):
if self.pool is not None and self.pool.size > 0 and main_loop: if self.pool is not None and self.pool.size > 0 and main_loop:
main_loop.call(self.pool.kill) gevent.spawn(main_loop.call, self.pool.kill)
del self.pool del self.pool
self.pool = None self.pool = None
@ -120,6 +120,7 @@ class MainLoopCaller():
self.pool = gevent.threadpool.ThreadPool(1) self.pool = gevent.threadpool.ThreadPool(1)
self.num_direct = 0 self.num_direct = 0
self.running = True
def caller(self, func, args, kwargs, event_done): def caller(self, func, args, kwargs, event_done):
try: try:
@ -133,13 +134,14 @@ class MainLoopCaller():
time.sleep(0.001) time.sleep(0.001)
def run(self): def run(self):
while 1: while self.running:
if self.queue_call.qsize() == 0: # Get queue in new thread to avoid gevent blocking if self.queue_call.qsize() == 0: # Get queue in new thread to avoid gevent blocking
func, args, kwargs, event_done = self.pool.apply(self.queue_call.get) func, args, kwargs, event_done = self.pool.apply(self.queue_call.get)
else: else:
func, args, kwargs, event_done = self.queue_call.get() func, args, kwargs, event_done = self.queue_call.get()
gevent.spawn(self.caller, func, args, kwargs, event_done) gevent.spawn(self.caller, func, args, kwargs, event_done)
del func, args, kwargs, event_done del func, args, kwargs, event_done
self.running = False
def call(self, func, *args, **kwargs): def call(self, func, *args, **kwargs):
if threading.current_thread().ident == main_thread_id: if threading.current_thread().ident == main_thread_id: