--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp	Tue Sep 17 12:41:45 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp	Tue Sep 17 13:32:27 2019 +0200
@@ -69,6 +69,8 @@
   DEBUG_ONLY(bool is_locked() const;)
 
   JfrCheckpointMspace* lookup(Buffer* old) const;
+  bool use_epoch_transition_mspace(const Thread* t) const;
+  size_t write_epoch_transition_mspace();
 
   static Buffer* lease_buffer(Thread* t, size_t size = 0);
   static Buffer* lease_buffer(Buffer* old, Thread* t, size_t size = 0);
@@ -76,20 +78,19 @@
 
   size_t clear();
   size_t write();
-  size_t write_constants();
   size_t flush();
-  size_t write_epoch_transition_mspace();
-  size_t write_types();
+
+  bool is_static_type_set_required();
+  size_t write_static_type_set();
   size_t write_threads();
-  size_t write_metadata_event();
+  size_t write_static_type_set_and_threads();
+  bool is_type_set_required();
   void write_type_set();
+  static void write_type_set_for_unloaded_classes();
+
   void shift_epoch();
   void synchronize_epoch();
-  bool use_epoch_transition_mspace(const Thread* t) const;
   void notify_threads();
-  void on_rotation();
-  bool is_type_set_required();
-  bool is_constant_set_required();
 
   JfrCheckpointManager(JfrChunkWriter& cw);
   ~JfrCheckpointManager();
@@ -97,16 +98,17 @@
   static JfrCheckpointManager& instance();
   static JfrCheckpointManager* create(JfrChunkWriter& cw);
   bool initialize();
+  void on_rotation();
   static void destroy();
 
  public:
-  void register_service_thread(const Thread* t);
   size_t flush_type_set();
-  void flush_constant_set();
-  static void write_type_set_for_unloaded_classes();
+  void flush_static_type_set();
   static void create_thread_blob(Thread* t);
   static void write_thread_checkpoint(Thread* t);
+  void register_service_thread(const Thread* t);
 
+  friend class Jfr;
   friend class JfrRecorder;
   friend class JfrRecorderService;
   friend class JfrCheckpointFlush;