TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix double-lock detection

Browse Source
This commit is contained in:
David Rose 2007-06-03 15:47:14 +00:00
parent ad6e2116cc
commit 2719a277e5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panda/src/pipeline/mutexDebug.cxx
View File

@ -91,13 +91,12 @@ do_lock() {
} else if (_locking_thread == this_thread) { } else if (_locking_thread == this_thread) {
// The mutex is already locked by this thread. Increment the lock // The mutex is already locked by this thread. Increment the lock
// count. // count.
nassertv(_lock_count >= 0); nassertv(_lock_count > 0);
if (!_allow_recursion && _lock_count == 0) { if (!_allow_recursion) {
ostringstream ostr; ostringstream ostr;
ostr << *_locking_thread << " attempted to re-lock non-reentrant " ostr << *_locking_thread << " attempted to double-lock non-reentrant "
<< *this; << *this;
nassert_raise(ostr.str()); nassert_raise(ostr.str());
return;
} }
++_lock_count; ++_lock_count;