X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=pdm%2Fperf.py;h=7a16ab3f372b65d643f8125cc0a0e50fb61966d9;hb=afd9f04cccf1a49bc6dc6dcf16ec90ab80cb5b6a;hp=de2dba5450a3d7f25c2e1fe9cafea43cfbe7410e;hpb=87b07b36f1db22383d75ad59f6bf8e48bf03f54f;p=pdm.git

diff --git a/pdm/perf.py b/pdm/perf.py
index de2dba5..7a16ab3 100644
--- a/pdm/perf.py
+++ b/pdm/perf.py
@@ -86,7 +86,7 @@ class staticdir(perfobj):
         return self.map.get(name, default)
 
     def listdir(self):
-        return self.map.keys()
+        return list(self.map.keys())
 
     def lookup(self, name):
         return self.map[name]
@@ -100,21 +100,32 @@ class event(object):
 
 idlock = threading.Lock()
 procevid = 0
-class startevent(event):
+
+def getprocid():
+    global procevid
+    idlock.acquire()
+    try:
+        ret = procevid
+        procevid += 1
+        return ret
+    finally:
+        idlock.release()
+
+class procevent(event):
+    def __init__(self, id):
+        super(procevent, self).__init__()
+        if isinstance(id, procevent):
+            self.id = id.id
+        else:
+            self.id = id
+
+class startevent(procevent):
     def __init__(self):
-        super(startevent, self).__init__()
-        global procevid
-        idlock.acquire()
-        try:
-            self.id = procevid
-            procevid += 1
-        finally:
-            idlock.release()
-
-class finishevent(event):
+        super(startevent, self).__init__(getprocid())
+
+class finishevent(procevent):
     def __init__(self, start, aborted):
-        super(finishevent, self).__init__()
-        self.id = start.id
+        super(finishevent, self).__init__(start)
         self.aborted = aborted
 
 sysres = staticdir()