Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

grab the GameLock in synchronized code

Browse source 
I'm seeing unreproducible crashes trying to double-dispose jni game
instances and think it's a race condition involving JNIThread. Forcing
it to hold the lock in the constructor, access to which is synchronized,
is an improvement and may well fix it.
This commit is contained in:
Eric House 2016-08-04 06:48:39 -07:00
parent d2edbaff37
commit aad97c7c23
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
View file

@ -146,8 +146,6 @@ public class JNIThread extends Thread {
private CurGameInfo m_gi;
private Handler m_handler;
private SyncedDraw m_drawer;
private static final int kMinDivWidth = 10;
private int m_connsIconID = 0;
private String m_newDict = null;
private long m_rowid;
private int m_refCount;
@ -166,9 +164,10 @@ public class JNIThread extends Thread {
Object[] m_args;
}
private JNIThread( long rowid )
private JNIThread( GameLock lock )
{
m_rowid = rowid;
m_lock = lock;
m_rowid = lock.getRowid();
m_queue = new LinkedBlockingQueue<QueueElem>();
}
@ -181,12 +180,6 @@ public class JNIThread extends Thread {
m_drawer = drawer;
m_handler = handler;
if ( null == m_lock ) {
m_lock = new GameLock( m_rowid, true ).lock();
} else {
m_jniGamePtr.release(); // let the old game copy go
}
// If this isn't true then the queue has to be allowed to empty,
// working on the old game state, before we can re-use any of this.
Assert.assertTrue( 0 == m_queue.size() );
@ -785,7 +778,7 @@ public class JNIThread extends Thread {
synchronized( s_instances ) {
result = s_instances.get( rowid );
if ( null == result && makeNew ) {
result = new JNIThread( rowid );
result = new JNIThread( new GameLock( rowid, true ).lock() );
s_instances.put( rowid, result );
}
if ( null != result ) {