--- /dev/null	2017-11-09 09:38:01.297999907 +0100
+++ new/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp	2018-04-09 14:46:27.240024889 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2014, 2018, Oracle 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.
+ *
+ */
+
+#ifndef SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP
+#define SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP
+
+#include "jfr/leakprofiler/leakProfiler.hpp"
+#include "jfr/leakprofiler/sampling/objectSampler.hpp"
+#include "jfr/recorder/access/jfrOptionSet.hpp"
+#include "logging/log.hpp"
+#include "runtime/vm_operations.hpp"
+
+// Safepoint operation for stopping leak profiler object sampler
+class StopOperation : public VM_Operation {
+ public:
+  StopOperation() {}
+
+  Mode evaluation_mode() const {
+    return _safepoint;
+  }
+
+  VMOp_Type type() const {
+    return VMOp_GC_HeapInspection;
+  }
+
+  virtual void doit() {
+    assert(LeakProfiler::is_running(), "invariant");
+    ObjectSampler* object_sampler = LeakProfiler::object_sampler();
+    delete object_sampler;
+    LeakProfiler::set_object_sampler(NULL);
+    log_trace(jfr, system)( "Object sampling stopped");
+  }
+};
+
+#endif // SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP