Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use an RLock in the completion worker, just in case

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-16 08:34:19 +05:30
parent 496e98b7ae
commit 51c4ee2343
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
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/calibre/gui2/tweak_book/completion/worker.py
View File

@ -7,7 +7,7 @@ __license__ = 'GPL v3'
__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
import cPickle, os, sys import cPickle, os, sys
from threading import Thread, Event, Lock from threading import Thread, Event, RLock
from Queue import Queue from Queue import Queue
from contextlib import closing from contextlib import closing
from collections import namedtuple from collections import namedtuple
@ -37,7 +37,7 @@ class CompletionWorker(Thread):
self.current_completion_request = None self.current_completion_request = None
self.latest_completion_request_id = None self.latest_completion_request_id = None
self.request_count = 0 self.request_count = 0
self.lock = Lock() self.lock = RLock()
def launch_worker_process(self): def launch_worker_process(self):
from calibre.utils.ipc.server import create_listener from calibre.utils.ipc.server import create_listener
@ -159,6 +159,7 @@ class CompletionWorker(Thread):
self.worker_process.kill() self.worker_process.kill()
return self.worker_process.returncode return self.worker_process.returncode
_completion_worker = None _completion_worker = None
@ -175,6 +176,7 @@ def run_main(func):
with closing(Client(address, authkey=key)) as control_conn, closing(Client(address, authkey=key)) as data_conn: with closing(Client(address, authkey=key)) as control_conn, closing(Client(address, authkey=key)) as data_conn:
func(control_conn, data_conn) func(control_conn, data_conn)
Result = namedtuple('Result', 'request_id ans traceback query') Result = namedtuple('Result', 'request_id ans traceback query')