Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
ZODB
Commits
0ed7579d
Commit
0ed7579d
authored
Jun 19, 2016
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
de-obfuscated some delicate locking code
parent
532fd78a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
16 deletions
+26
-16
src/ZODB/MappingStorage.py
src/ZODB/MappingStorage.py
+20
-16
src/ZODB/utils.py
src/ZODB/utils.py
+6
-0
No files found.
src/ZODB/MappingStorage.py
View file @
0ed7579d
...
@@ -261,24 +261,28 @@ class MappingStorage(object):
...
@@ -261,24 +261,28 @@ class MappingStorage(object):
self
.
_commit_lock
.
release
()
self
.
_commit_lock
.
release
()
# ZODB.interfaces.IStorage
# ZODB.interfaces.IStorage
@
ZODB
.
utils
.
locked
(
opened
)
def
tpc_begin
(
self
,
transaction
,
tid
=
None
):
def
tpc_begin
(
self
,
transaction
,
tid
=
None
):
# The tid argument exists to support testing.
with
self
.
_lock
:
if
transaction
is
self
.
_transaction
:
raise
ZODB
.
POSException
.
StorageTransactionError
(
ZODB
.
utils
.
check_precondition
(
self
.
opened
)
"Duplicate tpc_begin calls for same transaction"
)
self
.
_lock
.
release
()
# The tid argument exists to support testing.
if
transaction
is
self
.
_transaction
:
raise
ZODB
.
POSException
.
StorageTransactionError
(
"Duplicate tpc_begin calls for same transaction"
)
self
.
_commit_lock
.
acquire
()
self
.
_commit_lock
.
acquire
()
self
.
_lock
.
acquire
()
self
.
_transaction
=
transaction
with
self
.
_lock
:
self
.
_tdata
=
{}
self
.
_transaction
=
transaction
if
tid
is
None
:
self
.
_tdata
=
{}
if
self
.
_transactions
:
if
tid
is
None
:
old_tid
=
self
.
_transactions
.
maxKey
()
if
self
.
_transactions
:
else
:
old_tid
=
self
.
_transactions
.
maxKey
()
old_tid
=
None
else
:
tid
=
ZODB
.
utils
.
newTid
(
old_tid
)
old_tid
=
None
self
.
_tid
=
tid
tid
=
ZODB
.
utils
.
newTid
(
old_tid
)
self
.
_tid
=
tid
# ZODB.interfaces.IStorage
# ZODB.interfaces.IStorage
@
ZODB
.
utils
.
locked
(
opened
)
@
ZODB
.
utils
.
locked
(
opened
)
...
...
src/ZODB/utils.py
View file @
0ed7579d
...
@@ -268,6 +268,12 @@ def mktemp(dir=None, prefix='tmp'):
...
@@ -268,6 +268,12 @@ def mktemp(dir=None, prefix='tmp'):
os
.
close
(
handle
)
os
.
close
(
handle
)
return
filename
return
filename
def
check_precondition
(
precondition
):
if
not
precondition
():
raise
AssertionError
(
"Failed precondition: "
,
precondition
.
__doc__
.
strip
())
class
Locked
(
object
):
class
Locked
(
object
):
def
__init__
(
self
,
func
,
inst
=
None
,
class_
=
None
,
preconditions
=
()):
def
__init__
(
self
,
func
,
inst
=
None
,
class_
=
None
,
preconditions
=
()):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment