Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

add commented out thread assertion

Browse source 
I want to use ReentrantLock instead of my implementation but I'm
breaking its rule that the thread that locks a lock must be the one to
unlock it. Add commented-out assertion for some later time when I might
want to fix this. No change for now.
This commit is contained in:
Eric House 2016-08-10 09:42:19 -07:00
parent dddfa2e269
commit 43b76d24cc
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameLock.java
View file

@ -36,6 +36,7 @@ public class GameLock {
private long m_rowid; private long m_rowid;
private boolean m_isForWrite; private boolean m_isForWrite;
private int m_lockCount; private int m_lockCount;
private Thread m_ownerThread;
private StackTraceElement[] m_lockTrace; private StackTraceElement[] m_lockTrace;
static { static {
@ -76,6 +77,9 @@ public class GameLock {
if ( null == owner ) { // unowned if ( null == owner ) { // unowned
Assert.assertTrue( 0 == m_lockCount ); Assert.assertTrue( 0 == m_lockCount );
s_locks.put( m_rowid, this ); s_locks.put( m_rowid, this );
if ( BuildConfig.DEBUG ) {
m_ownerThread = Thread.currentThread();
}
++m_lockCount; ++m_lockCount;
gotIt = true; gotIt = true;
@ -172,6 +176,10 @@ public class GameLock {
// DbgUtils.logf( "GameLock.unlock(%s)", m_path ); // DbgUtils.logf( "GameLock.unlock(%s)", m_path );
synchronized( s_locks ) { synchronized( s_locks ) {
Assert.assertTrue( this == s_locks.get(m_rowid) ); Assert.assertTrue( this == s_locks.get(m_rowid) );
// Need to get this working before can switch to using ReentrantLock
// if ( BuildConfig.DEBUG ) {
// Assert.assertTrue( Thread.currentThread().equals(m_ownerThread) );
// }
if ( 1 == m_lockCount ) { if ( 1 == m_lockCount ) {
s_locks.remove( m_rowid ); s_locks.remove( m_rowid );
} else { } else {