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

add another DeadlockWatch (and import already)

Browse source
This commit is contained in:
Eric House 2019-02-20 12:20:39 -08:00
parent 614b4d3610
commit 156c05d54c
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
View file

@ -34,10 +34,11 @@ import android.os.Handler;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import org.eehouse.android.xw4.DbgUtils.DeadlockWatch;
import org.eehouse.android.xw4.MultiService.DictFetchOwner; import org.eehouse.android.xw4.MultiService.DictFetchOwner;
import org.eehouse.android.xw4.MultiService.MultiEvent; import org.eehouse.android.xw4.MultiService.MultiEvent;
import org.eehouse.android.xw4.jni.CommsAddrRec;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType; import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
import org.eehouse.android.xw4.jni.CommsAddrRec;
import org.eehouse.android.xw4.jni.XwJNI; import org.eehouse.android.xw4.jni.XwJNI;
import org.eehouse.android.xw4.loc.LocUtils; import org.eehouse.android.xw4.loc.LocUtils;
@ -1229,7 +1230,7 @@ public class BTService extends XWJIService {
{ {
long waitFromNow; long waitFromNow;
// Log.d( TAG, "getNextReadyMS() IN" ); // Log.d( TAG, "getNextReadyMS() IN" );
try ( DbgUtils.DeadlockWatch dw = new DbgUtils.DeadlockWatch( this ) ) { try ( DeadlockWatch dw = new DeadlockWatch( this ) ) {
synchronized ( this ) { synchronized ( this ) {
if ( 0 == mElems.size() ) { // nothing to send if ( 0 == mElems.size() ) { // nothing to send
waitFromNow = Long.MAX_VALUE; waitFromNow = Long.MAX_VALUE;
@ -1248,7 +1249,7 @@ public class BTService extends XWJIService {
void setNoHost() void setNoHost()
{ {
try ( DbgUtils.DeadlockWatch dw = new DbgUtils.DeadlockWatch( this ) ) { try ( DeadlockWatch dw = new DeadlockWatch( this ) ) {
synchronized ( this ) { synchronized ( this ) {
mLastFailTime = System.currentTimeMillis(); mLastFailTime = System.currentTimeMillis();
++mFailCount; ++mFailCount;
@ -1280,7 +1281,7 @@ public class BTService extends XWJIService {
Assert.assertNotNull( dos ); Assert.assertNotNull( dos );
List<MsgElem> localElems = new ArrayList<>(); List<MsgElem> localElems = new ArrayList<>();
try ( DbgUtils.DeadlockWatch dw = new DbgUtils.DeadlockWatch( this ) ) { try ( DeadlockWatch dw = new DeadlockWatch( this ) ) {
synchronized ( this ) { synchronized ( this ) {
if ( 0 < mLength ) { if ( 0 < mLength ) {
try { try {
@ -1476,7 +1477,7 @@ public class BTService extends XWJIService {
OutputPair op ) throws IOException OutputPair op ) throws IOException
{ {
boolean haveSpace; boolean haveSpace;
try ( DbgUtils.DeadlockWatch dw = new DbgUtils.DeadlockWatch( this ) ) { try ( DeadlockWatch dw = new DeadlockWatch( this ) ) {
synchronized ( this ) { synchronized ( this ) {
MsgElem newElem = new MsgElem( cmd, gameID, msgID, op ); MsgElem newElem = new MsgElem( cmd, gameID, msgID, op );
haveSpace = mLength + newElem.size() < MAX_PACKET_LEN; haveSpace = mLength + newElem.size() < MAX_PACKET_LEN;
@ -1509,7 +1510,7 @@ public class BTService extends XWJIService {
private void unappend( int nToRemove ) private void unappend( int nToRemove )
{ {
Assert.assertTrue( nToRemove <= mElems.size() ); Assert.assertTrue( nToRemove <= mElems.size() );
try ( DbgUtils.DeadlockWatch dw = new DbgUtils.DeadlockWatch( this ) ) { try ( DeadlockWatch dw = new DeadlockWatch( this ) ) {
synchronized ( this ) { synchronized ( this ) {
for ( int ii = 0; ii < nToRemove; ++ii ) { for ( int ii = 0; ii < nToRemove; ++ii ) {
MsgElem elem = mElems.remove(0); MsgElem elem = mElems.remove(0);
@ -1526,7 +1527,7 @@ public class BTService extends XWJIService {
void resetBackoff() void resetBackoff()
{ {
// Log.d( TAG, "resetBackoff() IN" ); // Log.d( TAG, "resetBackoff() IN" );
try ( DbgUtils.DeadlockWatch dw = new DbgUtils.DeadlockWatch( this ) ) { try ( DeadlockWatch dw = new DeadlockWatch( this ) ) {
synchronized ( this ) { synchronized ( this ) {
mFailCount = 0; mFailCount = 0;
} }
@ -1548,7 +1549,7 @@ public class BTService extends XWJIService {
private void tellSomebody() private void tellSomebody()
{ {
// Log.d( TAG, "tellSomebody() IN" ); // Log.d( TAG, "tellSomebody() IN" );
try ( DbgUtils.DeadlockWatch dw = new DbgUtils.DeadlockWatch( sBlocker ) ) { try ( DeadlockWatch dw = new DeadlockWatch( sBlocker ) ) {
synchronized ( sBlocker ) { synchronized ( sBlocker ) {
sBlocker.notifyAll(); sBlocker.notifyAll();
} }
@ -1681,7 +1682,7 @@ public class BTService extends XWJIService {
List<PacketAccumulator> result = new ArrayList<>(); List<PacketAccumulator> result = new ArrayList<>();
while ( 0 == result.size() ) { while ( 0 == result.size() ) {
long newMin = 60 * 60 * 1000; // longest wait: 1 hour long newMin = 60 * 60 * 1000; // longest wait: 1 hour
try ( DbgUtils.DeadlockWatch dw = new DbgUtils.DeadlockWatch( sSenders ) ) { try ( DeadlockWatch dw = new DeadlockWatch( sSenders ) ) {
synchronized ( sSenders ) { synchronized ( sSenders ) {
for ( String addr : sSenders.keySet() ) { for ( String addr : sSenders.keySet() ) {
PacketAccumulator pa = sSenders.get( addr ); PacketAccumulator pa = sSenders.get( addr );
@ -1715,12 +1716,16 @@ public class BTService extends XWJIService {
private static PacketAccumulator getSenderFor( String addr, boolean create ) private static PacketAccumulator getSenderFor( String addr, boolean create )
{ {
synchronized ( sSenders ) { PacketAccumulator result;
if ( create && !sSenders.containsKey( addr ) ) { try ( DeadlockWatch dw = new DeadlockWatch( sSenders ) ) {
sSenders.put( addr, new PacketAccumulator( addr ) ); synchronized ( sSenders ) {
if ( create && !sSenders.containsKey( addr ) ) {
sSenders.put( addr, new PacketAccumulator( addr ) );
}
result = sSenders.get( addr );
} }
return sSenders.get( addr );
} }
return result;
} }
private static void resetSenderFor( BluetoothSocket socket ) private static void resetSenderFor( BluetoothSocket socket )