From 11d179bfdb39d6a0c0661fde7052f46f0aee1994 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sun, 28 Feb 2016 11:08:12 -0800 Subject: Get rid of the default 6 thread maximum thing --- baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java | 2 +- baksmali/src/main/java/org/jf/baksmali/main.java | 7 ------- smali/src/main/java/org/jf/smali/main.java | 9 +-------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java b/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java index 5dd060f1..74063962 100644 --- a/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java +++ b/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java @@ -81,7 +81,7 @@ public class baksmaliOptions { public InlineMethodResolver inlineResolver = null; public int registerInfo = 0; public ClassPath classPath = null; - public int jobs = -1; + public int jobs = Runtime.getRuntime().availableProcessors(); public SyntheticAccessorResolver syntheticAccessorResolver = null; diff --git a/baksmali/src/main/java/org/jf/baksmali/main.java b/baksmali/src/main/java/org/jf/baksmali/main.java index 17ec3839..376611c7 100644 --- a/baksmali/src/main/java/org/jf/baksmali/main.java +++ b/baksmali/src/main/java/org/jf/baksmali/main.java @@ -245,13 +245,6 @@ public class main { return; } - if (options.jobs <= 0) { - options.jobs = Runtime.getRuntime().availableProcessors(); - if (options.jobs > 6) { - options.jobs = 6; - } - } - String inputDexFileName = remainingArgs[0]; File dexFileFile = new File(inputDexFileName); diff --git a/smali/src/main/java/org/jf/smali/main.java b/smali/src/main/java/org/jf/smali/main.java index bbf4ff37..6e0793c1 100644 --- a/smali/src/main/java/org/jf/smali/main.java +++ b/smali/src/main/java/org/jf/smali/main.java @@ -109,7 +109,7 @@ public class main { return; } - int jobs = -1; + int jobs = Runtime.getRuntime().availableProcessors(); boolean allowOdex = false; boolean verboseErrors = false; boolean printTokens = false; @@ -209,13 +209,6 @@ public class main { } } - if (jobs <= 0) { - jobs = Runtime.getRuntime().availableProcessors(); - if (jobs > 6) { - jobs = 6; - } - } - boolean errors = false; final DexBuilder dexBuilder = DexBuilder.makeDexBuilder(Opcodes.forApi(apiLevel, experimental)); -- cgit v1.2.3