Commit 505c85e4 authored by Shane Hathaway's avatar Shane Hathaway

Use sys._getframe() only if a transaction error occurs, optimizing

for the common case and reducing the impact of any memory leaks associated
with sys._getframe().
parent ba201924
...@@ -140,14 +140,15 @@ class ZEOStorage: ...@@ -140,14 +140,15 @@ class ZEOStorage:
def _check_tid(self, tid, exc=None): def _check_tid(self, tid, exc=None):
if self.read_only: if self.read_only:
raise ReadOnlyError() raise ReadOnlyError()
caller = sys._getframe().f_back.f_code.co_name
if self.transaction is None: if self.transaction is None:
caller = sys._getframe().f_back.f_code.co_name
self.log("no current transaction: %s()" % caller, zLOG.PROBLEM) self.log("no current transaction: %s()" % caller, zLOG.PROBLEM)
if exc is not None: if exc is not None:
raise exc(None, tid) raise exc(None, tid)
else: else:
return 0 return 0
if self.transaction.id != tid: if self.transaction.id != tid:
caller = sys._getframe().f_back.f_code.co_name
self.log("%s(%s) invalid; current transaction = %s" % self.log("%s(%s) invalid; current transaction = %s" %
(caller, repr(tid), repr(self.transaction.id)), (caller, repr(tid), repr(self.transaction.id)),
zLOG.PROBLEM) zLOG.PROBLEM)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment