| Submitter | Jan Luebbe |
|---|---|
| Date | May 15, 2012, 9:56 a.m. |
| Message ID | <1337075791-8745-1-git-send-email-jlu@pengutronix.de> |
| Download | mbox | patch |
| Permalink | /patch/27771/ |
| State | Accepted |
| Headers | show |
Comments
On Tue, May 15, 2012 at 11:56:31AM +0200, Jan Luebbe wrote: > On system with large amounts of RAM (such as 96GB), the default > initial heap size is larger than the max heap size specified in > some build commands. Set min_heap to the max_heap value in those > cases instead. > > Signed-off-by: Jan Luebbe <jlu@pengutronix.de> > --- > recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch | 15 +++++++++++++++ > recipes-core/jamvm/jamvm_git.bb | 3 ++- > 2 files changed, 17 insertions(+), 1 deletion(-) > create mode 100644 recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch > > diff --git a/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch b/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch > new file mode 100644 > index 0000000..bf0fda5 > --- /dev/null > +++ b/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch > @@ -0,0 +1,15 @@ > +diff --git a/src/jam.c b/src/jam.c > +index b76ce8b..dc5eac3 100644 > +--- a/src/jam.c > ++++ b/src/jam.c > +@@ -133,9 +133,7 @@ int parseCommandLine(int argc, char *argv[], InitArgs *args) { > + for(i = 1; i < argc; i++) { > + if(*argv[i] != '-') { > + if(args->min_heap > args->max_heap) { > +- printf("Minimum heap size greater than max!\n"); > +- status = 1; > +- goto exit; > ++ args->min_heap = args->max_heap; > + } > + > + if(args->props_count) { > diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb > index 2a4213b..7b28600 100644 > --- a/recipes-core/jamvm/jamvm_git.bb > +++ b/recipes-core/jamvm/jamvm_git.bb > @@ -6,11 +6,12 @@ require jamvm.inc > SRCREV = "4617da717ecb05654ea5bb9572338061106a414d" > PV = "1.5.5+1.6.0-devel+git${SRCPV}" > > -PR = "r1" > +PR = "r2" > > SRC_URI = "git://git.berlios.de/jamvm;protocol=git \ > file://jamvm-jni_h-noinst.patch \ > file://libffi.patch \ > + file://jamvm-minmax-heap.patch \ > " > > S = "${WORKDIR}/git" > -- > 1.7.10 Thanks for the patch, it was applied to meta-java master and jdk-7 branch. Bye Henning
Patch
diff --git a/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch b/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch new file mode 100644 index 0000000..bf0fda5 --- /dev/null +++ b/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch @@ -0,0 +1,15 @@ +diff --git a/src/jam.c b/src/jam.c +index b76ce8b..dc5eac3 100644 +--- a/src/jam.c ++++ b/src/jam.c +@@ -133,9 +133,7 @@ int parseCommandLine(int argc, char *argv[], InitArgs *args) { + for(i = 1; i < argc; i++) { + if(*argv[i] != '-') { + if(args->min_heap > args->max_heap) { +- printf("Minimum heap size greater than max!\n"); +- status = 1; +- goto exit; ++ args->min_heap = args->max_heap; + } + + if(args->props_count) { diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb index 2a4213b..7b28600 100644 --- a/recipes-core/jamvm/jamvm_git.bb +++ b/recipes-core/jamvm/jamvm_git.bb @@ -6,11 +6,12 @@ require jamvm.inc SRCREV = "4617da717ecb05654ea5bb9572338061106a414d" PV = "1.5.5+1.6.0-devel+git${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.berlios.de/jamvm;protocol=git \ file://jamvm-jni_h-noinst.patch \ file://libffi.patch \ + file://jamvm-minmax-heap.patch \ " S = "${WORKDIR}/git"
On system with large amounts of RAM (such as 96GB), the default initial heap size is larger than the max heap size specified in some build commands. Set min_heap to the max_heap value in those cases instead. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> --- recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch | 15 +++++++++++++++ recipes-core/jamvm/jamvm_git.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch