Adjust max memory factor at a step level

niranjan94 · niranjan94 · commit 50a4b9dde2db · 2018-12-26T11:55:18.000+05:30
diff --git a/app/src/main/kotlin/com/njlabs/showjava/decompilers/BaseDecompiler.kt b/app/src/main/kotlin/com/njlabs/showjava/decompilers/BaseDecompiler.kt
@@ -74,6 +74,7 @@ abstract class BaseDecompiler(val context: Context, val data: Data) {
     private val disposables = CompositeDisposable()
     private var onLowMemory: ((Boolean) -> Unit)? = null
     private var memoryThresholdCrossCount = 0
+    protected open val maxMemoryAdjustmentFactor = 1.25
 
     init {
         @Suppress("LeakingThis")
@@ -121,21 +122,21 @@ abstract class BaseDecompiler(val context: Context, val data: Data) {
                 .subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
                 .subscribe {
-                    val maxAdjusted = Runtime.getRuntime().maxMemory() / 1.25
+                    val maxAdjusted = Runtime.getRuntime().maxMemory() / maxMemoryAdjustmentFactor
                     val used = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()).toDouble().let { m ->
                         if (m > maxAdjusted) maxAdjusted else m
                     }
                     val usedPercentage = (used / maxAdjusted) * 100
 
                     Timber.d("[mem] ----")
                     Timber.d("[mem] Used: ${FileUtils.byteCountToDisplaySize(used.toLong())}")
-                    Timber.d("[mem] Max: ${FileUtils.byteCountToDisplaySize(maxAdjusted.toLong())}")
+                    Timber.d("[mem] Max: ${FileUtils.byteCountToDisplaySize(maxAdjusted.toLong())} at factor $maxMemoryAdjustmentFactor")
                     Timber.d("[mem] Used %: $usedPercentage")
 
                     broadcastStatus("memory", "%.2f".format(usedPercentage), "memory")
 
                     if (usedPercentage > memoryThreshold) {
-                        if (memoryThresholdCrossCount > 2) {
+                        if (memoryThresholdCrossCount > 1) {
                             onLowMemory?.invoke(true)
                         } else {
                             memoryThresholdCrossCount++
diff --git a/app/src/main/kotlin/com/njlabs/showjava/decompilers/JarExtractionWorker.kt b/app/src/main/kotlin/com/njlabs/showjava/decompilers/JarExtractionWorker.kt
@@ -64,6 +64,10 @@ class JarExtractionWorker(context: Context, data: Data) : BaseDecompiler(context
 
     private var ignoredLibs: ArrayList<String> = ArrayList()
 
+    // Set a lower max memory than available.
+    // Creating a dex file can easily use up memory before we get a chance to exit gracefully
+    override val maxMemoryAdjustmentFactor = 1.5
+
     /**
      * Load a list of library classes that are to be ignored from the assets
      */
diff --git a/app/src/main/kotlin/com/njlabs/showjava/utils/UserPreferences.kt b/app/src/main/kotlin/com/njlabs/showjava/utils/UserPreferences.kt
@@ -36,7 +36,7 @@ class UserPreferences(private val prefs: SharedPreferences) {
             const val DARK_MODE = false
             const val SHOW_MEMORY_USAGE = true
             const val SHOW_SYSTEM_APPS = false
-            const val MEMORY_THRESHOLD = 90
+            const val MEMORY_THRESHOLD = 80
             const val IGNORE_LIBRARIES = true
             const val CHUNK_SIZE = 500
             const val MAX_ATTEMPTS = 2
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -93,7 +93,7 @@
             android:inputType="number"
             android:key="memoryThreshold"
             android:numeric="integer"
-            android:defaultValue="90"
+            android:defaultValue="80"
             android:maxLines="1"
             android:singleLine="true"
             android:title="@string/memoryThreshold" />
