Author: Tim Felgentreff <timfelgentr...@gmail.com>
Branch:
Changeset: r585:702bb4c819e0
Date: 2014-01-17 11:43 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/702bb4c819e0/
Log: fix clock issue
diff --git a/spyvm/constants.py b/spyvm/constants.py
--- a/spyvm/constants.py
+++ b/spyvm/constants.py
@@ -190,4 +190,4 @@
MAX_LOOP_DEPTH = 100
INTERRUPT_COUNTER_SIZE = 10000
-CompileTime = int(time.time() * 1000)
+CompileTime = time.time()
diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -207,7 +207,7 @@
def time_now(self):
import time
from rpython.rlib.rarithmetic import intmask
- return intmask((int(time.time() * 1000) - self.startup_time))
+ return intmask(int((time.time() - self.startup_time) * 1000) &
constants.TAGGED_MASK)
def padding(self, symbol=' '):
return symbol * (self.max_stack_depth - self.remaining_stack_depth)
diff --git a/spyvm/squeakimage.py b/spyvm/squeakimage.py
--- a/spyvm/squeakimage.py
+++ b/spyvm/squeakimage.py
@@ -362,6 +362,8 @@
# ____________________________________________________________
class SqueakImage(object):
+ _immutable_fields_ = ["w_asSymbol", "w_simulateCopyBits", "version",
+ "is_modern", "startup_time"]
def from_reader(self, space, reader):
from spyvm import constants
@@ -378,7 +380,7 @@
self.version = reader.version
self.is_modern = reader.version.magic > 6502
self.run_spy_hacks(space)
- self.startup_time = int(time.time() * 1000)
+ self.startup_time = time.time()
def run_spy_hacks(self, space):
pass
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
