From: Elliott Hughes <enh@google.com>
Date: Sun, 26 Sep 2010 22:12:21 +0000 (-0700)
Subject: Be more explicit in our -Xms == -Xmx message, and stop pretending we'll fix it.
X-Git-Tag: android-x86-4.0-r1~256^2~101
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c488076021ac1b7147e7b41e3390d017540c6f63;p=android-x86%2Fdalvik.git

Be more explicit in our -Xms == -Xmx message, and stop pretending we'll fix it.

This is only going to be fixed by removing the notion of external allocations.
I'll add a note to that bug that we should remove this check entirely.

Bug: 2714377
Change-Id: If84bd98676fcc1e2d4f9f234d547553d256f5785
---

diff --git a/vm/Init.c b/vm/Init.c
index 74fbce959..cd6949670 100644
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -1030,11 +1030,14 @@ static int dvmProcessOptions(int argc, const char* const argv[],
         }
     }
 
-    /* We should be able to cope with these being equal, but until
-     * http://b/2714377 is fixed, we can't.
+    /* External allocations count against the space we "reserve" by setting
+     * the heap max size greater than the heap start size. Without a gap,
+     * no external allocations will succeed. You won't get very far like that,
+     * so let's not even try.
      */
     if (gDvm.heapSizeStart >= gDvm.heapSizeMax) {
-        dvmFprintf(stderr, "Heap start size must be < heap max size\n");
+        dvmFprintf(stderr, "External allocations require a gap between the "
+            "heap start size and max size\n");
         return -1;
     }