Page MenuHomePhabricator
Files F7159827

No OneTemporary
Actions

View Options

diff --git a/sipsimple/threading/__init__.py b/sipsimple/threading/__init__.py
index adcc8779..179bc577 100644
--- a/sipsimple/threading/__init__.py
+++ b/sipsimple/threading/__init__.py
@@ -1,114 +1,114 @@
# Copyright (C) 2010-2011 AG Projects. See LICENSE for details.
#
"""Thread management"""
__all__ = ["ThreadManager", "run_in_thread", "call_in_thread", "run_in_twisted_thread", "call_in_twisted_thread"]
from application import log
from application.python import Null
from application.python.decorator import decorator, preserve_signature
from application.python.queue import EventQueue
from application.python.types import Singleton
-from threading import Lock, currentThread
+from threading import Lock, current_thread
from twisted.python import threadable
class CallFunctionEvent(object):
def __init__(self, function, args, kw):
self.function = function
self.args = args
self.kw = kw
class ThreadManager(object):
__metaclass__ = Singleton
def __init__(self):
self.threads = {}
self.lock = Lock()
def _event_handler(self, event):
handler = getattr(self, '_EH_%s' % event.__class__.__name__, Null)
handler(event)
def _EH_CallFunctionEvent(self, event):
try:
event.function(*event.args, **event.kw)
except:
- log.error('Exception occured while calling %r in the %r thread' % (event.function, currentThread().getName()))
+ log.error('Exception occured while calling %r in the %r thread' % (event.function, current_thread().name))
log.err()
def start(self):
pass
def stop(self):
with self.lock:
threads = self.threads.values()
self.threads = {}
for thread in threads:
thread.stop()
for thread in threads:
thread.join()
def get_thread(self, thread_id):
with self.lock:
try:
thread = self.threads[thread_id]
except KeyError:
self.threads[thread_id] = thread = EventQueue(handler=self._event_handler, name=thread_id)
thread.start()
return thread
def stop_thread(self, thread_id):
if thread_id == 'thread-ops':
raise RuntimeError("Won't stop internal 'thread-ops' thread")
thread = self.threads.pop(thread_id)
thread.stop()
call_in_thread('thread-ops', thread.join)
@decorator
def run_in_thread(thread_id):
def thread_decorator(function):
@preserve_signature(function)
def wrapper(*args, **kw):
thread_manager = ThreadManager()
thread = thread_manager.get_thread(thread_id)
- if thread is currentThread():
+ if thread is current_thread():
function(*args, **kw)
else:
thread.put(CallFunctionEvent(function, args, kw))
return wrapper
return thread_decorator
def call_in_thread(thread_id, function, *args, **kw):
thread_manager = ThreadManager()
thread = thread_manager.get_thread(thread_id)
- if thread is currentThread():
+ if thread is current_thread():
function(*args, **kw)
else:
thread.put(CallFunctionEvent(function, args, kw))
@decorator
def run_in_twisted_thread(func):
@preserve_signature(func)
def wrapper(*args, **kwargs):
if threadable.isInIOThread():
func(*args, **kwargs)
else:
from twisted.internet import reactor
reactor.callFromThread(func, *args, **kwargs)
return wrapper
def call_in_twisted_thread(func, *args, **kwargs):
if threadable.isInIOThread():
func(*args, **kwargs)
else:
from twisted.internet import reactor
reactor.callFromThread(func, *args, **kwargs)

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 23, 2:03 PM (22 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3409188
Default Alt Text
(3 KB)

Event Timeline