status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use thread pool instead of new threads on Android. Closes #3690 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
pacamara 2018-04-16 17:06:46 +01:00 committed by Pedro Pombeiro
parent a521cc7039
commit ef8d5dca6c
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
4 changed files with 65 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/app/src/main/java/im/status/ethereum/MainActivity.java
View File

@ -27,6 +27,7 @@ import com.testfairy.TestFairy;
import com.instabug.library.Instabug; import com.instabug.library.Instabug;
import java.util.Properties; import java.util.Properties;
import im.status.ethereum.module.StatusThreadPoolExecutor;
public class MainActivity extends ReactActivity public class MainActivity extends ReactActivity
implements ActivityCompat.OnRequestPermissionsResultCallback{ implements ActivityCompat.OnRequestPermissionsResultCallback{
@ -40,6 +41,7 @@ public class MainActivity extends ReactActivity
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override @Override
public void uncaughtException(final Thread thread, final Throwable t) { public void uncaughtException(final Thread thread, final Throwable t) {
// High priority, so don't use StatusThreadPoolExecutor
new Thread() { new Thread() {
@Override @Override
public void run() { public void run() {
@ -150,14 +152,14 @@ public class MainActivity extends ReactActivity
dialog.show(); dialog.show();
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
System.loadLibrary("status-logs"); System.loadLibrary("status-logs");
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@Override @Override

4
modules/react-native-status/android/src/main/java/im/status/ethereum/module/JSCJail.java
View File

@ -102,7 +102,7 @@ class JSCJail implements Jail {
JSFunction web3sendAsync = new JSFunction(context, "web3sendAsync") { JSFunction web3sendAsync = new JSFunction(context, "web3sendAsync") {
public void web3sendAsync(final String payload, final JSValue callback) { public void web3sendAsync(final String payload, final JSValue callback) {
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
String result = Statusgo.CallRPC(payload); String result = Statusgo.CallRPC(payload);
@ -110,7 +110,7 @@ class JSCJail implements Jail {
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
}; };
context.property("web3sendAsync", web3sendAsync); context.property("web3sendAsync", web3sendAsync);

44
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
View File

@ -356,20 +356,20 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
return; return;
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
doStartNode(config); doStartNode(config);
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ReactMethod @ReactMethod
public void stopNode() { public void stopNode() {
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
Log.d(TAG, "stopNode"); Log.d(TAG, "stopNode");
@ -377,7 +377,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ReactMethod @ReactMethod
@ -390,7 +390,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
jail.reset(); jail.reset();
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
String result = Statusgo.Login(address, password); String result = Statusgo.Login(address, password);
@ -399,7 +399,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ReactMethod @ReactMethod
@ -410,7 +410,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
return; return;
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
String res = Statusgo.CreateAccount(password); String res = Statusgo.CreateAccount(password);
@ -419,7 +419,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ReactMethod @ReactMethod
@ -430,7 +430,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
return; return;
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
String res = Statusgo.NotifyUsers(message, payloadJSON, tokensJSON); String res = Statusgo.NotifyUsers(message, payloadJSON, tokensJSON);
@ -439,7 +439,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ReactMethod @ReactMethod
@ -450,7 +450,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
return; return;
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
String res = Statusgo.AddPeer(enode); String res = Statusgo.AddPeer(enode);
@ -459,7 +459,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ -470,7 +470,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
callback.invoke(false); callback.invoke(false);
return; return;
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
String res = Statusgo.RecoverAccount(password, passphrase); String res = Statusgo.RecoverAccount(password, passphrase);
@ -479,7 +479,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
private String createIdentifier() { private String createIdentifier() {
@ -494,7 +494,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
return; return;
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
String res = Statusgo.CompleteTransactions(hashes, password); String res = Statusgo.CompleteTransactions(hashes, password);
@ -502,7 +502,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ -513,14 +513,14 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
return; return;
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
Statusgo.DiscardTransaction(id); Statusgo.DiscardTransaction(id);
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
// Jail // Jail
@ -533,7 +533,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
return; return;
} }
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
jail.initJail(js); jail.initJail(js);
@ -542,7 +542,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ReactMethod @ReactMethod
@ -684,7 +684,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
@ReactMethod @ReactMethod
public void sendWeb3Request(final String payload, final Callback callback) { public void sendWeb3Request(final String payload, final Callback callback) {
Thread thread = new Thread() { Runnable r = new Runnable() {
@Override @Override
public void run() { public void run() {
String res = Statusgo.CallRPC(payload); String res = Statusgo.CallRPC(payload);
@ -692,7 +692,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
}; };
thread.start(); StatusThreadPoolExecutor.getInstance().execute(r);
} }
@ReactMethod @ReactMethod

37
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusThreadPoolExecutor.java Normal file
View File

@ -0,0 +1,37 @@
package im.status.ethereum.module;
import java.util.concurrent.*;
public class StatusThreadPoolExecutor {
private static final int NUMBER_OF_CORES =
Runtime.getRuntime().availableProcessors();
private static final int KEEP_ALIVE_TIME = 1;
private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS;
private final BlockingQueue<Runnable> mQueue;
private final ThreadPoolExecutor mThreadPool;
private StatusThreadPoolExecutor() {
mQueue = new LinkedBlockingQueue<>();
mThreadPool = new ThreadPoolExecutor(
NUMBER_OF_CORES,
NUMBER_OF_CORES,
KEEP_ALIVE_TIME,
KEEP_ALIVE_TIME_UNIT,
mQueue);
}
/** Pugh singleton */
private static class Holder {
private static StatusThreadPoolExecutor instance = new StatusThreadPoolExecutor();
}
public static StatusThreadPoolExecutor getInstance() {
return Holder.instance;
}
public void execute(final Runnable r) {
mThreadPool.execute(r);
}
}