Changeset d45adcf

Timestamp:

2010-12-24T12:21:16Z (14 years ago)

Author:

unknown <pcfeb0009@…>

Branches:

master

Children:

1130561

Parents:

9c51166

Message:

Add locking to ensure only one thread accesses the socket

The Skype API calls the OnNotify callback in a separate thread: see
​http://skype4py.sourceforge.net/doc/html/Skype4Py.utils.EventHandlingBase-class.html

Tested informally (chatting with another person for > 15 min)

File:

• skype/skyped.py (modified) (9 diffs)

skype/skyped.py

@@ -34 +34 @@
 import ssl
 import select
+import threading
 
 __version__ = "0.1.1"
@@ -51 +52 @@
 
 sys.excepthook = eh
+
+def wait_for_lock(lock, timeout_to_print, timeout, msg):
+        start = time.time()
+        locked = lock.acquire(0)
+        while not(locked):
+                time.sleep(0.5)
+                if timeout_to_print and (time.time() - timeout_to_print > start):
+                        dprint("%s: Waited %f seconds" % \
+                                        (msg, time.time() - start))
+                        timeout_to_print = False
+                if timeout and (time.time() - timeout > start):
+                        dprint("%s: Waited %f seconds, giving up" % \
+                                        (msg, time.time() - start))
+                        return False
+                locked = lock.acquire(0)
+        return True
 
 def input_handler(fd):
@@ -61 +78 @@
                 return True
         else:
-                try:
-                        input = fd.recv(1024)
-                except Exception, s:
-                        dprint("Warning, receiving 1024 bytes failed (%s)." % s)
-                        fd.close()
-                        options.conn = False
-                        return False
-                for i in input.split("\n"):
-                        skype.send(i.strip())
+                if wait_for_lock(options.lock, 3, 10, "input_handler"):
+                        try:
+                                        input = fd.recv(1024)
+                                        options.lock.release()
+                        except Exception, s:
+                                dprint("Warning, receiving 1024 bytes failed (%s)." % s)
+                                fd.close()
+                                options.conn = False
+                                options.lock.release()
+                                return False
+                        for i in input.split("\n"):
+                                skype.send(i.strip())
                 return True
 
@@ -85 +105 @@
         done = False
         while (not done) and (count < 10):
-                try:
-                        sock.send(txt)
-                        done = True
-                except Exception, s:
-                        count += 1
-                        dprint("Warning, sending '%s' failed (%s). count=%d" % (txt, s, count))
-                        time.sleep(1)
+                if wait_for_lock(options.lock, 3, 10, "socket send"):
+                        try:
+                                sock.send(txt)
+                                options.lock.release()
+                                done = True
+                        except Exception, s:
+                                options.lock.release()
+                                count += 1
+                                dprint("Warning, sending '%s' failed (%s). count=%d" % (txt, s, count))
+                                time.sleep(1)
         if not done:
                 if options.conn: options.conn.close()
@@ -123 +146 @@
 def listener(sock, skype):
         global options
+        if not(wait_for_lock(options.lock, 3, 10, "listener")): return False
         rawsock, addr = sock.accept()
         options.conn = ssl.wrap_socket(rawsock,
@@ -133 +157 @@
                         options.conn.handshake()
                 except Exception:
+                        options.lock.release()
                         dprint("Warning, handshake failed, closing connection.")
                         return False
@@ -147 +172 @@
                 options.conn.close()
                 options.conn = False
+                options.lock.release()
                 return False
         if ret == 2:
                 dprint("Username and password OK.")
                 options.conn.send("PASSWORD OK\n")
+                options.lock.release()
                 serverloop(options, skype)
                 return True
@@ -158 +185 @@
                 options.conn.close()
                 options.conn = False
+                options.lock.release()
                 return False
 
@@ -384 +412 @@
         while 1:
                 options.conn = False
+                options.lock = threading.Lock()
                 server(options.host, options.port, skype)