Use time.time() instead of time.millitimer()

diff --git a/Demo/classes/Range.py b/Demo/classes/Range.py
index c958f5aad856f6626a0efa779187d1378c4e4103..18f626f45816de1553e05e9338ad80b07b874ea6 100755 (executable)
--- a/Demo/classes/Range.py
+++ b/Demo/classes/Range.py
@@ -57,15 +57,15 @@ def test():
        print range(10), range(-10, 10), range(0, 10, 2)
        for i in range(100, -100, -10): print i,
        print
-       t1 = time.millitimer()
+       t1 = time.time()
        for i in range(1000):
                pass
-       t2 = time.millitimer()
+       t2 = time.time()
        for i in __builtin__.range(1000):
                pass
-       t3 = time.millitimer()
-       print t2-t1, 'msec (class)'
-       print t3-t2, 'msec (built-in)'
+       t3 = time.time()
+       print t2-t1, 'sec (class)'
+       print t3-t2, 'sec (built-in)'
 
 
 test()

diff --git a/Demo/rpc/T.py b/Demo/rpc/T.py
index 475372bfff62e012e8a5de6139dc9b646683d0df..abf3a06d056a23c7eaf4039fb58fe962395162f1 100644 (file)
--- a/Demo/rpc/T.py
+++ b/Demo/rpc/T.py
@@ -6,17 +6,17 @@ import sys, os, time
 def TSTART():
        global t0, t1
        u, s, cu, cs = os.times()
-       t0 = u+cu, s+cs, time.millitimer()
+       t0 = u+cu, s+cs, time.time()
 
 def TSTOP(*label):
        global t0, t1
        u, s, cu, cs = os.times()
-       t1 = u+cu, s+cs, time.millitimer()
+       t1 = u+cu, s+cs, time.time()
        tt = []
        for i in range(3):
                tt.append(t1[i] - t0[i])
        [u, s, r] = tt
        msg = ''
        for x in label: msg = msg + (x + ' ')
-       msg = msg + `u` + ' user, ' + `s` + ' sys, ' + `r*0.001` + ' real\n'
+       msg = msg + `u` + ' user, ' + `s` + ' sys, ' + `r` + ' real\n'
        sys.stderr.write(msg)

diff --git a/Demo/threads/find.py b/Demo/threads/find.py
index e97bd99be0b98f33ddd5169088b9a290e78de998..3bc54feba0adff6ee08dc6f72268f0eaed8f3706 100644 (file)
--- a/Demo/threads/find.py
+++ b/Demo/threads/find.py
@@ -110,11 +110,11 @@ def main():
        for dir in args:
                wq.addwork(find, (dir, selector, wq))
 
-       t1 = time.millitimer()
+       t1 = time.time()
        wq.run(nworkers)
-       t2 = time.millitimer()
+       t2 = time.time()
 
-       sys.stderr.write('Total time ' + `t2-t1` + ' msec.\n')
+       sys.stderr.write('Total time ' + `t2-t1` + ' sec.\n')
 
 
 # The predicate -- defines what files we look for.