5 files changed, 159 insertions, 0 deletions
diff --git a/test/203-multi-checkpoint/expected.txt b/test/203-multi-checkpoint/expected.txt
new file mode 100644
index 0000000000..e1e30e3f1d
--- /dev/null
+++ b/test/203-multi-checkpoint/expected.txt
@@ -0,0 +1,5 @@
+JNI_OnLoad called
+Other thread running
+pushing checkpoints
+checkpoints pushed
+Passed!
diff --git a/test/203-multi-checkpoint/info.txt b/test/203-multi-checkpoint/info.txt
new file mode 100644
index 0000000000..a96ba97d2a
--- /dev/null
+++ b/test/203-multi-checkpoint/info.txt
@@ -0,0 +1,4 @@
+Test that we correctly handle checkpoints that suspend.
+
+This could cause problems with asserts when there were multiple checkpoints
+queued and earlier ones suspended.
diff --git a/test/203-multi-checkpoint/multi_checkpoint.cc b/test/203-multi-checkpoint/multi_checkpoint.cc
new file mode 100644
index 0000000000..0799b6ed2d
--- /dev/null
+++ b/test/203-multi-checkpoint/multi_checkpoint.cc
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2017 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 "art_method-inl.h"
+#include "base/mutex-inl.h"
+#include "scoped_thread_state_change-inl.h"
+#include "thread-inl.h"
+#include "thread_pool.h"
+
+namespace art {
+
+struct TestClosure : public Closure {
+  bool first_run_start;
+  bool first_run_end;
+  bool second_run;
+  bool second_run_interleaved;
+
+  void Run(Thread* self) OVERRIDE {
+    CHECK_EQ(self, Thread::Current()) << "Not running on target thread!";
+    if (!first_run_start) {
+      CHECK(!second_run);
+      first_run_start = true;
+      // Suspend ourself so that we will perform the second run.
+      {
+        ScopedObjectAccess soa(self);
+        self->FullSuspendCheck();
+      }
+      first_run_end = true;
+    } else {
+      CHECK(!second_run);
+      CHECK(first_run_start);
+      second_run = true;
+      second_run_interleaved = !first_run_end;
+    }
+  }
+
+  void Check() {
+    CHECK(first_run_start);
+    CHECK(first_run_end);
+    CHECK(second_run);
+    CHECK(second_run_interleaved);
+  }
+};
+
+static TestClosure gTestClosure = {};
+
+extern "C" JNIEXPORT void JNICALL Java_Main_checkCheckpointsRun(JNIEnv*, jclass) {
+  gTestClosure.Check();
+}
+
+struct SetupClosure : public Closure {
+  void Run(Thread* self) OVERRIDE {
+    CHECK_EQ(self, Thread::Current()) << "Not running on target thread!";
+    ScopedObjectAccess soa(self);
+    MutexLock tscl_mu(self, *Locks::thread_suspend_count_lock_);
+    // Both should succeed since we are in runnable and have the lock.
+    CHECK(self->RequestCheckpoint(&gTestClosure)) << "Could not set first checkpoint.";
+    CHECK(self->RequestCheckpoint(&gTestClosure)) << "Could not set second checkpoint.";
+  }
+};
+
+static SetupClosure gSetupClosure = {};
+
+extern "C" JNIEXPORT void JNICALL Java_Main_pushCheckpoints(JNIEnv*, jclass, jobject thr) {
+  Thread* self = Thread::Current();
+  ScopedObjectAccess soa(self);
+  MutexLock tll_mu(self, *Locks::thread_list_lock_);
+  Thread* target = Thread::FromManagedThread(soa, thr);
+  while (true) {
+    MutexLock tscl_mu(self, *Locks::thread_suspend_count_lock_);
+    if (target->RequestCheckpoint(&gSetupClosure)) {
+      break;
+    }
+  }
+}
+
+}  // namespace art
diff --git a/test/203-multi-checkpoint/src/Main.java b/test/203-multi-checkpoint/src/Main.java
new file mode 100644
index 0000000000..187f622730
--- /dev/null
+++ b/test/203-multi-checkpoint/src/Main.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+import java.util.concurrent.Semaphore;
+
+public class Main {
+  static final Semaphore start = new Semaphore(0);
+  static volatile boolean continue_loop = true;
+
+  public static void main(String[] args) throws Exception {
+    System.loadLibrary(args[0]);
+    Thread t = new Thread(Main::runTargetThread, "Target Thread");
+
+    t.start();
+    // Wait for other thread to start.
+    start.acquire();
+
+    System.out.println("pushing checkpoints");
+    pushCheckpoints(t);
+
+    System.out.println("checkpoints pushed");
+    continue_loop = false;
+
+    t.join();
+
+    checkCheckpointsRun();
+
+    System.out.println("Passed!");
+  }
+
+  public static native void pushCheckpoints(Thread t);
+  public static native boolean checkCheckpointsRun();
+
+  public static void doNothing() {}
+  public static void runTargetThread() {
+    System.out.println("Other thread running");
+    try {
+      start.release();
+      while (continue_loop) {
+        doNothing();
+      }
+    } catch (Exception e) {
+      throw new Error("Exception occurred!", e);
+    }
+  }
+}
diff --git a/test/Android.bp b/test/Android.bp
index 16b30f988f..17ef1141df 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -359,6 +359,7 @@ cc_defaults {
         "141-class-unload/jni_unload.cc",
         "148-multithread-gc-annotations/gc_coverage.cc",
         "149-suspend-all-stress/suspend_all.cc",
+        "203-multi-checkpoint/multi_checkpoint.cc",
         "154-gc-loop/heap_interface.cc",
         "454-get-vreg/get_vreg_jni.cc",
         "457-regs/regs_jni.cc",