Changeset 1025

Timestamp:

01/22/12 08:59:56 (4 months ago)

Author:

hodgestar

Message:

Add synclock implementation.

Files:

• hodgestar/PythonCode/Twistify/twistify.py (modified) (4 diffs)

hodgestar/PythonCode/Twistify/twistify.py

@@ -5 +5 @@
 from functools import partial
 
-from twisted.internet.defer import inlineCallbacks
+from twisted.internet.defer import inlineCallbacks, DeferredLock
 from twisted.internet.threads import deferToThread
 from twisted.internet import reactor
@@ -23 +23 @@
     :param whitelist:
         Names of attributes that don't need to be wrapped.
+        Default: []
     :type blacklist: list
     :param blacklist:
         Names of attributes that should themselves be
         wrapped by a Twistify object.
+        Default: []
+    :type synclock: bool
+    :param synclock:
+        If True, only allow one method to execute in a thread
+        at a time (later calls only begin one earlier calls are done).
+        Default: False
     """
 
-    def __init__(self, wrapped, whitelist=(), blacklist=()):
+    def __init__(self, wrapped, whitelist=(), blacklist=(), synclock=False):
         self.__wrapped = wrapped
         self.__whitelist = set(whitelist)
         self.__blacklist = set(blacklist)
+        self.__synclock = None if not synclock else DeferredLock()
 
     def __call_in_thread(self, f, *args, **kwargs):
-        return deferToThread(f, *args, **kwargs)
+        if self.__synclock is None:
+            return deferToThread(f, *args, **kwargs)
+        else:
+
+            def call_f(lock):
+                return deferToThread(f, *args, **kwargs)
+
+            def release_lock(result):
+                self.__synclock.release()
+                return result
+
+            locked = self.__synclock.acquire()
+            locked.addCallback(call_f)
+            locked.addBoth(release_lock)
+            return locked
 
     def __getattr__(self, name):
@@ -76 +98 @@
     print "Test object awake."
 
+    print "---"
+
     print "Testing return of a value ..."
     d = proxy.echo("Echo echo echo.")
@@ -81 +105 @@
     print "Got back: %r." % (v,)
 
+    print "---"
+
+    SyncTestObject = twistify_type(TestObject, synclock=True)
+    synced_proxy = SyncTestObject()
+
+    print "Testing synclock ..."
+    d1 = synced_proxy.sleep(2)
+    d2 = synced_proxy.echo("Echo ...")
+    v = yield d2
+    print "Got back: %r." % (v,)
+    print "Sleep done:", d1.called
+
+    print "---"
+
+
+def stop_reactor(result):
+    reactor.stop()
+    return result
 
 if __name__ == "__main__":
-    main().addBoth(lambda result: reactor.stop())
+    main().addBoth(stop_reactor)
     reactor.run()