From 53bba50f91bdf3ca61d4058df0a1ca515615c52c Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Fri, 24 Oct 2014 11:39:08 +0200 Subject: [PATCH] Call pingServerIfNecessary in new thread in order to prevent the BroadcastReceiver from timing out. To prevent: 10-24 10:59:35.096 W/BroadcastQueue( 1044): Timeout of broadcast BroadcastRecord{43400df0 u0 org.igniterealtime.smackx.ping.ACTION} - receiver=android.os.BinderProxy@42d37cc0, started 60000ms ago 10-24 10:59:35.096 W/BroadcastQueue( 1044): Receiver during timeout: BroadcastFilter{42cee7b0 u0 ReceiverList{42cfd9f0 16003 org.projectmaxs.transport.xmpp/10149/u0 remote:42d37cc0}} 10-24 10:59:38.201 E/ActivityManager( 1044): ANR in org.projectmaxs.transport.xmpp 10-24 10:59:38.201 E/ActivityManager( 1044): PID: 16003 10-24 10:59:38.201 E/ActivityManager( 1044): Reason: Broadcast of Intent { act=org.igniterealtime.smackx.ping.ACTION flg=0x14 (has extras) } 10-24 10:59:38.201 E/ActivityManager( 1044): Load: 18.97 / 31.7 / 45.71 10-24 10:59:38.201 E/ActivityManager( 1044): CPU usage from 20588ms to 0ms ago: 10-24 10:59:38.201 E/ActivityManager( 1044): 0.4% 1044/system_server: 0.2% user + 0.1% kernel / faults: 188 minor 1 major 10-24 10:59:38.201 E/ActivityManager( 1044): 0.4% 9089/kworker/0:3: 0% user + 0.4% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0.1% 1567/mpdecision: 0% user + 0.1% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0.1% 28507/kworker/u:5: 0% user + 0.1% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 7/kworker/u:0H: 0% user + 0% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 148/mmcqd/0: 0% user + 0% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 14687/com.teslacoilsw.launcher: 0% user + 0% kernel / faults: 6 minor 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 3/ksoftirqd/0: 0% user + 0% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 1111/MC_Thread: 0% user + 0% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 1135/wpa_supplicant: 0% user + 0% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 1283/com.android.phone: 0% user + 0% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 11469/com.getpebble.android: 0% user + 0% kernel / faults: 1 minor 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 14971/com.google.android.apps.unveil: 0% user + 0% kernel / faults: 6 minor 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 28677/watch_server: 0% user + 0% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% 31539/kworker/0:2: 0% user + 0% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 1.2% TOTAL: 0.4% user + 0.5% kernel + 0.2% iowait 10-24 10:59:38.201 E/ActivityManager( 1044): CPU usage from 2536ms to 3060ms later: 10-24 10:59:38.201 E/ActivityManager( 1044): 9.2% 1044/system_server: 1.8% user + 7.4% kernel / faults: 56 minor 10-24 10:59:38.201 E/ActivityManager( 1044): 5.5% 1058/ActivityManager: 0% user + 5.5% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 1.3% 23415/kworker/0:1H: 0% user + 1.3% kernel 10-24 10:59:38.201 E/ActivityManager( 1044): 0% TOTAL: 0% user + 0% kernel + 0% iowait 10-24 10:59:38.208 I/ActivityManager( 1044): Killing 16003:org.projectmaxs.transport.xmpp/u0a149 (adj 0): background ANR --- .../android/ServerPingWithAlarmManager.java | 17 ++++++++++++++++- .../java/org/jivesoftware/smack/util/Async.java | 15 +++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java index 2ac9458fb..fb6c8f4a7 100644 --- a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java +++ b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java @@ -27,6 +27,7 @@ import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; +import org.jivesoftware.smack.util.Async; import org.jivesoftware.smackx.ping.PingManager; import android.app.AlarmManager; @@ -118,7 +119,21 @@ public class ServerPingWithAlarmManager extends Manager { if (ServerPingWithAlarmManager.getInstanceFor(connection).isEnabled()) { LOGGER.fine("Calling pingServerIfNecessary for connection " + connection.getConnectionCounter()); - PingManager.getInstanceFor(connection).pingServerIfNecessary(); + final PingManager pingManager = PingManager.getInstanceFor(connection); + // Android BroadcastReceivers have a timeout of 60 seconds. + // The connections reply timeout may be higher, which causes + // timeouts of the broadcast receiver and a subsequent ANR + // of the App of the broadcast receiver. We therefore need + // to call pingServerIfNecessary() in a new thread to avoid + // this. It could happen that the device gets back to sleep + // until the Thread runs, but that's a risk we are willing + // to take into account as it's unlikely. + Async.go(new Runnable() { + @Override + public void run() { + pingManager.pingServerIfNecessary(); + } + }, "PingServerIfNecessary (" + connection.getConnectionCounter() + ')'); } else { LOGGER.fine("NOT calling pingServerIfNecessary (disabled) on connection " + connection.getConnectionCounter()); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java index 1b4d57673..b6af0204f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java @@ -19,8 +19,19 @@ package org.jivesoftware.smack.util; public class Async { public static void go(Runnable runnable) { - Thread thread = new Thread(runnable); - thread.setDaemon(true); + Thread thread = daemonThreadFrom(runnable); thread.start(); } + + public static void go(Runnable runnable, String threadName) { + Thread thread = daemonThreadFrom(runnable); + thread.setName(threadName); + thread.start(); + } + + public static Thread daemonThreadFrom(Runnable runnable) { + Thread thread = new Thread(runnable); + thread.setDaemon(true); + return thread; + } }