--- a/src/hotspot/share/jfr/jfr.cpp	Thu Nov 15 10:59:56 2018 +0100
+++ b/src/hotspot/share/jfr/jfr.cpp	Thu Nov 15 11:10:04 2018 +0100
@@ -63,13 +63,17 @@
   }
 }
 
-void Jfr::on_thread_exit(JavaThread* thread) {
-  JfrThreadLocal::on_exit(thread);
+void Jfr::on_thread_start(Thread* t) {
+  JfrThreadLocal::on_start(t);
 }
 
-void Jfr::on_thread_destruct(Thread* thread) {
-  if (JfrRecorder::is_created()) {
-    JfrThreadLocal::on_destruct(thread);
+void Jfr::on_thread_exit(Thread* t) {
+  JfrThreadLocal::on_exit(t);
+}
+
+void Jfr::on_java_thread_dismantle(JavaThread* jt) {
+  if (JfrRecorder::is_recording()) {
+    JfrCheckpointManager::write_thread_checkpoint(jt);
   }
 }
 
@@ -90,7 +94,3 @@
 bool Jfr::on_start_flight_recording_option(const JavaVMOption** option, char* delimiter) {
   return JfrOptionSet::parse_start_flight_recording_option(option, delimiter);
 }
-
-Thread* Jfr::sampler_thread() {
-  return JfrThreadSampling::sampler_thread();
-}