X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fsession.py;h=3b2b2b29cc98dfbf435544ffb842e3af9b05d32c;hp=d088ad7387d60dd9c8cc209c7ca44a19ca20e8ac;hb=b9e22c33901b627684450411477f6c459fc302da;hpb=fed807e31c96fef8d941b34a25a1f5044b2d4e8d

diff --git a/wrw/session.py b/wrw/session.py
index d088ad7..3b2b2b2 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,5 +1,5 @@
 import threading, time, pickle, random, os
-from . import cookie
+import cookie, env
 
 __all__ = ["db", "get"]
 
@@ -16,10 +16,10 @@ def gennonce(length):
     return nonce
 
 class session(object):
-    def __init__(self, expire = 86400 * 7):
+    def __init__(self, lock, expire = 86400 * 7):
         self.id = hexencode(gennonce(16))
         self.dict = {}
-        self.lock = threading.Lock()
+        self.lock = lock
         self.ctime = self.atime = self.mtime = int(time.time())
         self.expire = expire
         self.dctl = set()
@@ -68,33 +68,52 @@ class session(object):
     def __setstate__(self, st):
         for k, v in st:
             self.__dict__[k] = v
-        self.lock = threading.Lock()
+        # The proper lock is set by the thawer
+
+    def __repr__(self):
+        return "<session %s>" % self.id
 
 class db(object):
-    def __init__(self, cookiename = "wrwsess", path = "/"):
+    def __init__(self, backdb = None, cookiename = "wrwsess", path = "/"):
         self.live = {}
         self.cookiename = cookiename
         self.path = path
         self.lock = threading.Lock()
         self.cthread = None
         self.freezetime = 3600
+        self.backdb = backdb
 
     def clean(self):
         now = int(time.time())
         with self.lock:
-            dlist = []
-            for sess in self.live.itervalues():
-                if sess.atime + self.freezetime < now:
-                    try:
-                        if sess.dirty():
-                            self.freeze(sess)
-                    except:
-                        if sess.atime + sess.expire < now:
-                            dlist.append(sess)
-                    else:
-                        dlist.append(sess)
-            for sess in dlist:
-                del self.live[sess.id]
+            clist = self.live.keys()
+        for sessid in clist:
+            with self.lock:
+                try:
+                    entry = self.live[sessid]
+                except KeyError:
+                    continue
+            with entry[0]:
+                rm = False
+                if entry[1] == "retired":
+                    pass
+                elif entry[1] is None:
+                    pass
+                else:
+                    sess = entry[1]
+                    if sess.atime + self.freezetime < now:
+                        try:
+                            if sess.dirty():
+                                self.freeze(sess)
+                        except:
+                            if sess.atime + sess.expire < now:
+                                rm = True
+                        else:
+                            rm = True
+                if rm:
+                    entry[1] = "retired"
+                    with self.lock:
+                        del self.live[sessid]
 
     def cleanloop(self):
         try:
@@ -107,55 +126,70 @@ class db(object):
             with self.lock:
                 self.cthread = None
 
+    def _fetch(self, sessid):
+        while True:
+            now = int(time.time())
+            with self.lock:
+                if sessid in self.live:
+                    entry = self.live[sessid]
+                else:
+                    entry = self.live[sessid] = [threading.RLock(), None]
+            with entry[0]:
+                if isinstance(entry[1], session):
+                    entry[1].atime = now
+                    return entry[1]
+                elif entry[1] == "retired":
+                    continue
+                elif entry[1] is None:
+                    try:
+                        thawed = self.thaw(sessid)
+                        if thawed.atime + thawed.expire < now:
+                            raise KeyError()
+                        thawed.lock = entry[0]
+                        thawed.atime = now
+                        entry[1] = thawed
+                        return thawed
+                    finally:
+                        if entry[1] is None:
+                            entry[1] = "retired"
+                            with self.lock:
+                                del self.live[sessid]
+                else:
+                    raise Exception("Illegal session entry: " + repr(entry[1]))
+
     def fetch(self, req):
         now = int(time.time())
         sessid = cookie.get(req, self.cookiename)
+        new = False
         with self.lock:
             if self.cthread is None:
                 self.cthread = threading.Thread(target = self.cleanloop)
                 self.cthread.setDaemon(True)
                 self.cthread.start()
-            try:
-                if sessid is None:
-                    raise KeyError()
-                elif sessid in self.live:
-                    sess = self.live[sessid]
-                else:
-                    sess = self.thaw(sessid)
-                    self.live[sessid] = sess
-                if sess.atime + sess.expire < now:
-                    raise KeyError()
-                sess.atime = now
-            except KeyError:
-                sess = session()
-                self.live[sess.id] = sess
-                sess.new = True
-        req.oncommit(self.ckfreeze)
-        return sess
-
-    def ckfreeze(self, req):
-        sess = req.item(self.fetch)
-        if sess.dirty():
-            try:
-                if getattr(sess, "new", False):
+        try:
+            if sessid is None:
+                raise KeyError()
+            sess = self._fetch(sessid)
+        except KeyError:
+            sess = session(threading.RLock())
+            new = True
+
+        def ckfreeze(req):
+            if sess.dirty():
+                if new:
                     cookie.add(req, self.cookiename, sess.id, self.path)
-                    del sess.new
-                self.freeze(sess)
-            except:
-                pass
-
-    def thaw(self, sessid):
-        raise KeyError()
-
-    def freeze(self, sess):
-        raise TypeError()
-
-class backeddb(db):
-    def __init__(self, backdb, *args, **kw):
-        super(backeddb, self).__init__(*args, **kw)
-        self.backdb = backdb
+                    with self.lock:
+                        self.live[sess.id] = [sess.lock, sess]
+                try:
+                    self.freeze(sess)
+                except:
+                    pass
+        req.oncommit(ckfreeze)
+        return sess
 
     def thaw(self, sessid):
+        if self.backdb is None:
+            raise KeyError()
         data = self.backdb[sessid]
         try:
             return pickle.loads(data)
@@ -163,9 +197,16 @@ class backeddb(db):
             raise KeyError()
 
     def freeze(self, sess):
-        self.backdb[sess.id] = pickle.dumps(sess)
+        if self.backdb is None:
+            raise TypeError()
+        with sess.lock:
+            data = pickle.dumps(sess, -1)
+        self.backdb[sess.id] = data
         sess.frozen()
 
+    def get(self, req):
+        return req.item(self.fetch)
+
 class dirback(object):
     def __init__(self, path):
         self.path = path
@@ -183,7 +224,7 @@ class dirback(object):
         with open(os.path.join(self.path, key), "w") as out:
             out.write(value)
 
-default = backeddb(dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
+default = env.var(db(backdb = dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid())))))
 
 def get(req):
-    return req.item(default.fetch)
+    return default.val.get(req)