tMerge pull request #1194 from kyuupichan/if-cleanup5 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8eaa1565959d49531754e15b4ea27d0c704f585d
DIR parent 583d36a763090e175d720138d42def0e51411980
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Tue, 5 May 2015 14:54:51 +0200
Merge pull request #1194 from kyuupichan/if-cleanup5
Send requests only from the interface thread.
Diffstat:
M lib/interface.py | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
---
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -60,6 +60,7 @@ class TcpInterface(threading.Thread):
self.debug = False # dump network messages. can be changed at runtime using the console
self.message_id = 0
self.response_queue = response_queue
+ self.request_queue = Queue.Queue()
self.unanswered_requests = {}
# are we waiting for a pong?
self.is_ping = False
t@@ -249,22 +250,26 @@ class TcpInterface(threading.Thread):
return s
-
- def send_request(self, request, queue=None):
- _id = request.get('id')
- method = request.get('method')
- params = request.get('params')
- with self.lock:
+ def send_request(self, request, response_queue = None):
+ '''Queue a request. Blocking only if called from other threads.'''
+ self.request_queue.put((request, response_queue), threading.current_thread() != self)
+
+ def send_requests(self):
+ '''Sends all queued requests'''
+ while self.is_connected() and not self.request_queue.empty():
+ request, response_queue = self.request_queue.get()
+ method = request.get('method')
+ params = request.get('params')
+ r = {'id': self.message_id, 'method': method, 'params': params}
try:
- r = {'id':self.message_id, 'method':method, 'params':params}
self.pipe.send(r)
- if self.debug:
- self.print_error("-->", r)
except socket.error, e:
- self.print_error("socked error:", e)
+ self.print_error("socket error:", e)
self.connected = False
return
- self.unanswered_requests[self.message_id] = method, params, _id, queue
+ if self.debug:
+ self.print_error("-->", r)
+ self.unanswered_requests[self.message_id] = method, params, request.get('id'), response_queue
self.message_id += 1
def is_connected(self):
t@@ -304,6 +309,7 @@ class TcpInterface(threading.Thread):
request_time = False
while self.connected:
self.maybe_ping()
+ self.send_requests()
if not self.connected:
break
try: