[oe-commits] Robert Schuster : jamvm-initial 1.4.5: Face random crashes with a silent retry.
git version control
git at git.openembedded.org
Wed Jul 14 06:08:01 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 1bd457c58207fe853ab05c6dc118f32b99996b62
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1bd457c58207fe853ab05c6dc118f32b99996b62
Author: Robert Schuster <robertschuster at fsfe.org>
Date: Tue Jul 13 15:46:41 2010 +0200
jamvm-initial 1.4.5: Face random crashes with a silent retry.
jamvm-initial 1.5.0: Dito.
---
recipes/jamvm/files/jamvm_1.4.5-initial.patch | 15 ++++++++++++---
recipes/jamvm/files/jamvm_1.5.0-initial.patch | 15 ++++++++++++---
recipes/jamvm/jamvm-initial_1.4.5.bb | 2 +-
recipes/jamvm/jamvm-initial_1.5.0.bb | 2 +-
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/recipes/jamvm/files/jamvm_1.4.5-initial.patch b/recipes/jamvm/files/jamvm_1.4.5-initial.patch
index 3c68818..f841271 100644
--- a/recipes/jamvm/files/jamvm_1.4.5-initial.patch
+++ b/recipes/jamvm/files/jamvm_1.4.5-initial.patch
@@ -14,12 +14,21 @@ Index: jamvm-1.4.5/java-initial
===================================================================
--- /dev/null
+++ jamvm-1.4.5/java-initial
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,14 @@
+#!/bin/sh
+#
-+# Wrapper script inspired by the one provided by cacao.
++# Wrapper which (almost) silently restarts the VM in case of segfaults.
+
-+exec jamvm-initial ${1+"$@"}
++redo_from_start=1;
++while [ $redo_from_start -eq 1 ]; do
++ echo "Running JamVM: ${@}"
++ redo_from_start=0;
++ jamvm ${1+"$@"}
++ if [ $? -eq 139 ]; then
++ echo "JamVM crashed - silently trying again"
++ redo_from_start=1;
++ fi
++done
Index: jamvm-1.4.5/lib/Makefile.am
===================================================================
--- jamvm-1.4.5.orig/lib/Makefile.am
diff --git a/recipes/jamvm/files/jamvm_1.5.0-initial.patch b/recipes/jamvm/files/jamvm_1.5.0-initial.patch
index 9b972da..3d5a4ae 100644
--- a/recipes/jamvm/files/jamvm_1.5.0-initial.patch
+++ b/recipes/jamvm/files/jamvm_1.5.0-initial.patch
@@ -15,12 +15,21 @@ Index: jamvm-1.5.0/java-initial
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ jamvm-1.5.0/java-initial 2007-12-20 00:03:27.000000000 +0100
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,14 @@
+#!/bin/sh
+#
-+# Wrapper script inspired by the one provided by cacao.
++# Wrapper which (almost) silently restarts the VM in case of segfaults.
+
-+exec jamvm-initial ${1+"$@"}
++redo_from_start=1;
++while [ $redo_from_start -eq 1 ]; do
++ echo "Running JamVM: ${@}"
++ redo_from_start=0;
++ jamvm ${1+"$@"}
++ if [ $? -eq 139 ]; then
++ echo "JamVM crashed - silently trying again"
++ redo_from_start=1;
++ fi
++done
Index: jamvm-1.5.0/lib/Makefile.am
===================================================================
--- jamvm-1.5.0.orig/lib/Makefile.am 2007-12-20 00:05:24.000000000 +0100
diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb
index e3ace6d..301e806 100644
--- a/recipes/jamvm/jamvm-initial_1.4.5.bb
+++ b/recipes/jamvm/jamvm-initial_1.4.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
DEPENDS = "zlib-native classpath-initial jikes-initial libffi-native"
-PR = "r1"
+PR = "r2"
PROVIDES = "virtual/java-initial"
diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb
index 3986861..2a1fef6 100644
--- a/recipes/jamvm/jamvm-initial_1.5.0.bb
+++ b/recipes/jamvm/jamvm-initial_1.5.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
DEPENDS = "zlib-native classpath-initial jikes-initial libffi-native"
-PR = "r1"
+PR = "r2"
PROVIDES = "virtual/java-initial"
More information about the Openembedded-commits
mailing list