Merge "Fix signal chain to allow for signal() call to be used"

7 files changed, 115 insertions, 2 deletions

diff --git a/test/004-SignalTest/signaltest.cc b/test/004-SignalTest/signaltest.cc
index f09fc26..a6d9b66 100644
--- a/test/004-SignalTest/signaltest.cc
+++ b/test/004-SignalTest/signaltest.cc
@@ -87,12 +87,12 @@ extern "C" JNIEXPORT void JNICALL Java_Main_terminateSignalTest(JNIEnv*, jclass)
 
 // Prevent the compiler being a smart-alec and optimizing out the assignment
 // to nullptr.
-char *p = nullptr;
+char *go_away_compiler = nullptr;
 
 extern "C" JNIEXPORT jint JNICALL Java_Main_testSignal(JNIEnv*, jclass) {
 #if defined(__arm__) || defined(__i386__) || defined(__x86_64__) || defined(__aarch64__)
   // On supported architectures we cause a real SEGV.
-  *p = 'a';
+  *go_away_compiler = 'a';
 #else
   // On other architectures we simulate SEGV.
   kill(getpid(), SIGSEGV);
diff --git a/test/004-SignalTest2/expected.txt b/test/004-SignalTest2/expected.txt
new file mode 100644
index 0000000..fd5ec00
--- /dev/null
+++ b/test/004-SignalTest2/expected.txt
@@ -0,0 +1,5 @@
+init signal test
+Caught NullPointerException
+Caught StackOverflowError
+signal caught
+Signal test OK
diff --git a/test/004-SignalTest2/info.txt b/test/004-SignalTest2/info.txt
new file mode 100644
index 0000000..00b0d9a
--- /dev/null
+++ b/test/004-SignalTest2/info.txt
@@ -0,0 +1 @@
+Imported from oat tests.
diff --git a/test/004-SignalTest2/signaltest.cc b/test/004-SignalTest2/signaltest.cc
new file mode 100644
index 0000000..47b1eb6
--- /dev/null
+++ b/test/004-SignalTest2/signaltest.cc
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "jni.h"
+
+#include <sys/ucontext.h>
+
+static int signal_count;
+static const int kMaxSignal = 2;
+
+static void signalhandler(int sig) {
+  printf("signal caught\n");
+  ++signal_count;
+  if (signal_count > kMaxSignal) {
+     printf("too many signals\n");
+     abort();
+  }
+  printf("Signal test OK\n");
+  exit(0);
+}
+
+sighandler_t oldsignal;
+
+extern "C" JNIEXPORT void JNICALL Java_Main_initSignalTest2(JNIEnv*, jclass) {
+  oldsignal = signal(SIGSEGV, reinterpret_cast<sighandler_t>(signalhandler));
+}
+
+// Prevent the compiler being a smart-alec and optimizing out the assignment
+// to nullptr.
+char *go_away_compiler2 = nullptr;
+
+extern "C" JNIEXPORT void JNICALL Java_Main_testSignal2(JNIEnv*, jclass) {
+  *go_away_compiler2 = 'a';
+}
+
diff --git a/test/004-SignalTest2/src/Main.java b/test/004-SignalTest2/src/Main.java
new file mode 100644
index 0000000..7799e8c
--- /dev/null
+++ b/test/004-SignalTest2/src/Main.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Main {
+    private static native void initSignalTest2();
+    private static native void testSignal2();
+
+    private static void stackOverflow() {
+       stackOverflow();
+    }
+
+    public static void main(String[] args) {
+        System.loadLibrary("arttest");
+
+        System.out.println("init signal test");
+        initSignalTest2();
+        try {
+            Object o = null;
+            int hash = o.hashCode();
+
+            // Should never get here.
+            System.out.println("hash: " + hash);
+            throw new AssertionError();
+        } catch (NullPointerException e) {
+            System.out.println("Caught NullPointerException");
+        }
+        try {
+            stackOverflow();
+
+            // Should never get here.
+            throw new AssertionError();
+        } catch (StackOverflowError e) {
+            System.out.println("Caught StackOverflowError");
+        }
+
+        // Test that a signal in native code works.
+        testSignal2();
+    }
+}
diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk
index 2d139a6..1054203 100644
--- a/test/Android.libarttest.mk
+++ b/test/Android.libarttest.mk
@@ -21,6 +21,7 @@ include art/build/Android.common_build.mk
 LIBARTTEST_COMMON_SRC_FILES := \
   004-JniTest/jni_test.cc \
   004-SignalTest/signaltest.cc \
+  004-SignalTest2/signaltest.cc \
   004-ReferenceMap/stack_walk_refmap_jni.cc \
   004-StackWalk/stack_walk_jni.cc \
   004-UnsafeTest/unsafe_test.cc \
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index e4ee4a7..0b6b27a 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -189,6 +189,7 @@ TEST_ART_BROKEN_NO_PREBUILD_TESTS :=
 # Tests that are broken with tracing.
 TEST_ART_BROKEN_TRACE_RUN_TESTS := \
   004-SignalTest \
+  004-SignalTest2 \
   018-stack-overflow \
   097-duplicate-method \
   107-int-math2