--- /dev/null	2017-09-26 09:07:01.073937575 -0700
+++ new/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadOnOffTest.java	2017-10-06 14:51:03.390464330 -0700
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2017, Google and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package MyPackage;
+
+/**
+ * @test
+ * @summary Verifies the JVMTI Heap Monitor Thread sanity
+ * @compile HeapMonitorThreadOnOffTest.java
+ * @run main/othervm/native -agentlib:HeapMonitor MyPackage.HeapMonitorThreadOnOffTest
+ */
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class HeapMonitorThreadOnOffTest {
+  static {
+    try {
+      System.loadLibrary("HeapMonitor");
+    } catch (UnsatisfiedLinkError ule) {
+      System.err.println("Could not load HeapMonitor library");
+      System.err.println("java.library.path: "
+          + System.getProperty("java.library.path"));
+      throw ule;
+    }
+  }
+
+  public static void main(String[] args) {
+    final int numThreads = 24;
+    ArrayList<Thread> list = new ArrayList<>();
+
+    // Add one thread that consistently turns on/off the sampler to ensure correctness with
+    // potential resets.
+    Switch switchPlayer = new Switch();
+    Thread switchThread = new Thread(switchPlayer, "Switch Player");
+    switchThread.start();
+
+    for (int i = 0 ; i < numThreads; i++) {
+      Thread thread = new Thread(new Allocator(i), "Allocator" + i);
+      thread.start();
+      list.add(thread);
+    }
+
+    for (Thread elem : list) {
+      try {
+        elem.join();
+      } catch(InterruptedException e) {
+        throw new RuntimeException("Thread got interrupted...");
+      }
+    }
+
+    switchPlayer.stop();
+    try {
+      switchThread.join();
+    } catch(InterruptedException e) {
+      throw new RuntimeException("Thread got interrupted while waiting for the switch player...");
+    }
+
+    // We don't check here for correctness of data. If we made it here, the test succeeded:
+    //  Threads can allocate like crazy
+    //  Other threads can turn on/off the system
+  }
+}
+
+class Allocator implements Runnable {
+  private int depth;
+  private int g_tmp[];
+
+  public Allocator(int depth) {
+    this.depth = depth;
+  }
+
+  private int helper() {
+    int sum = 0;
+    // Let us assume that the array is 24 bytes of memory.
+    for (int i = 0; i < 127000 / 6; i++) {
+      int tmp[] = new int[1];
+      // Force it to be kept.
+      g_tmp = tmp;
+      sum += g_tmp[0];
+    }
+    return sum;
+  }
+
+  private int recursiveWrapper(int depth) {
+    if (depth > 0) {
+      return recursiveWrapper(depth - 1);
+    }
+    return helper();
+  }
+
+  public void run() {
+    int sum = 0;
+    System.err.println("Runner with " + depth + " depth.");
+    for (int j = 0; j < 500; j++) {
+      sum += recursiveWrapper(depth);
+    }
+    System.err.println("Ran with " + depth + " depth and sum is " + sum);
+  }
+}
+
+class Switch implements Runnable {
+  private volatile boolean keepGoing;
+
+  private native static void enableSampling();
+  private native static void disableSampling();
+
+  public Switch() {
+    keepGoing = true;
+  }
+
+  public void stop() {
+    keepGoing = false;
+  }
+
+  public void run() {
+    int cnt = 0;
+    System.err.println("Going to turned on/off sampling.");
+    while (keepGoing) {
+      disableSampling();
+      enableSampling();
+      cnt++;
+    }
+    System.err.println("Turned on/off " + cnt + " times.");
+  }
+}