[minion-cvs] Add a recursive read-write lock implementation; move al...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv23353/lib/mixminion/server

Modified Files:
	DNSFarm.py MMTPServer.py ServerMain.py 
Log Message:
Add a recursive read-write lock implementation; move all threading helpers into separate module

Index: DNSFarm.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/DNSFarm.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DNSFarm.py	8 Jan 2004 18:09:50 -0000	1.6
+++ DNSFarm.py	8 Jan 2004 22:33:33 -0000	1.7
@@ -9,8 +9,9 @@
 import threading
 import time
 import sys
-from mixminion.Common import LOG, TimeoutQueue, QueueEmpty
+from mixminion.Common import LOG
 from mixminion.NetUtils import getIP, nameIsStaticIP
+from mixminion.ThreadUtils import TimeoutQueue, QueueEmpty
 
 __all__ = [ 'DNSCache' ]
 

Index: MMTPServer.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/MMTPServer.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- MMTPServer.py	8 Jan 2004 18:09:50 -0000	1.68
+++ MMTPServer.py	8 Jan 2004 22:33:33 -0000	1.69
@@ -29,7 +29,7 @@
 import mixminion.TLSConnection
 import mixminion._minionlib as _ml
 from mixminion.Common import MixError, MixFatalError, MixProtocolError, \
-     LOG, stringContains, MessageQueue, QueueEmpty
+     LOG, stringContains
 from mixminion.Crypto import sha1, getCommonPRNG
 from mixminion.Packet import PACKET_LEN, DIGEST_LEN, IPV4Info, MMTPHostInfo
 from mixminion.MMTPClient import PeerCertificateCache, MMTPClientConnection
@@ -37,6 +37,7 @@
 import mixminion.server.EventStats as EventStats
 from mixminion.Filestore import CorruptedFile
 from mixminion.ServerInfo import displayServer
+from mixminion.ThreadUtils import MessageQueue, QueueEmpty
 
 __all__ = [ 'AsyncServer', 'ListenConnection', 'MMTPServerConnection',
             'MMTPClientConnection' ]

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- ServerMain.py	3 Jan 2004 07:35:24 -0000	1.112
+++ ServerMain.py	8 Jan 2004 22:33:33 -0000	1.113
@@ -50,10 +50,10 @@
 import time
 import threading
 from types import *
-# We pull this from mixminion.Common, just in case somebody still has
+# We pull this from mixminion.ThreadUtils just in case somebody still has
 # a copy of the old "mixminion/server/Queue.py" (since renamed to
 # ServerQueue.py)
-from mixminion.Common import MessageQueue, ClearableQueue, QueueEmpty
+from mixminion.ThreadUtils import MessageQueue, ClearableQueue, QueueEmpty
 
 import mixminion.Config
 import mixminion.Crypto