# HG changeset patch
# User mgronlun
# Date 1481118858 -3600
# Node ID b1a7ee8ed4446157923fd831cbc504e3f61bd888
# Parent  aa430a02eedaff27f1ed45abd211c0642b8e7d99
8170847: Refactor trace/traceStream.hpp
Reviewed-by:

diff --git a/src/share/vm/trace/traceEventClasses.xsl b/src/share/vm/trace/traceEventClasses.xsl
--- a/src/share/vm/trace/traceEventClasses.xsl
+++ b/src/share/vm/trace/traceEventClasses.xsl
@@ -119,7 +119,7 @@
 <xsl:apply-templates select="value|structvalue|transition_value|relation" mode="write-fields"/>
 
   void writeEventContent(void) {
-    TraceStream ts(*tty);
+    TraceStream ts;
     ts.print("<xsl:value-of select="@label"/>: [");
 <xsl:apply-templates select="value|structvalue" mode="write-data"/>
     ts.print("]\n");
diff --git a/src/share/vm/trace/traceStream.cpp b/src/share/vm/trace/traceStream.cpp
new file mode 100644
--- /dev/null
+++ b/src/share/vm/trace/traceStream.cpp
@@ -0,0 +1,91 @@
+/*
+* Copyright (c) 2016, 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.
+*
+*/
+
+#include "precompiled.hpp"
+#include "trace/traceStream.hpp"
+#ifdef INCLUDE_TRACE
+#include "classfile/classLoaderData.hpp"
+#include "classfile/javaClasses.inline.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/klass.hpp"
+#include "oops/method.hpp"
+#include "oops/symbol.hpp"
+
+void TraceStream::print_val(const char* label, const Klass* val) const {
+  ResourceMark rm;
+  const char* description = "NULL";
+  if (val != NULL) {
+    const Symbol* name = val->name();
+    if (name != NULL) {
+      description = name->as_C_string();
+    }
+  }
+  tty->print("%s = %s", label, description);
+}
+
+void TraceStream::print_val(const char* label, const Method* val) const {
+  ResourceMark rm;
+  const char* description = "NULL";
+  if (val != NULL) {
+    description = val->name_and_sig_as_C_string();
+  }
+  tty->print("%s = %s", label, description);
+}
+
+void TraceStream::print_val(const char* label, const ClassLoaderData* cld) const {
+  ResourceMark rm;
+  if (cld == NULL || cld->is_anonymous()) {
+    tty->print("%s = NULL", label);
+    return;
+  }
+  const char* class_loader_name = "NULL";
+  const char* class_loader_type_name = "NULL";
+  const oop class_loader_oop = cld->class_loader();
+
+  if (class_loader_oop != NULL) {
+    const Klass* k = class_loader_oop->klass();
+    assert(k != NULL, "invariant");
+    const Symbol* klass_name_sym = k->name();
+    if (klass_name_sym != NULL) {
+      class_loader_type_name = klass_name_sym->as_C_string();
+    }
+    const oop class_loader_name_oop =
+      java_lang_ClassLoader::name(class_loader_oop);
+    if (class_loader_name_oop != NULL) {
+      const char* class_loader_name_from_oop =
+        java_lang_String::as_utf8_string(class_loader_name_oop);
+      if (class_loader_name_from_oop != NULL &&
+            class_loader_name_from_oop[0] != '\0') {
+        class_loader_name = class_loader_name_from_oop;
+      }
+    }
+  } else {
+    assert(class_loader_oop == NULL, "invariant");
+    // anonymous CLDs are excluded, this would be the boot loader
+    class_loader_name = "boot";
+  }
+  tty->print("%s = name=%s class=%s", label, class_loader_name, class_loader_type_name);
+}
+
+#endif // INCLUDE_TRACE
diff --git a/src/share/vm/trace/traceStream.hpp b/src/share/vm/trace/traceStream.hpp
--- a/src/share/vm/trace/traceStream.hpp
+++ b/src/share/vm/trace/traceStream.hpp
@@ -27,116 +27,71 @@
 
 #include "utilities/macros.hpp"
 #if INCLUDE_TRACE
-#include "classfile/classLoaderData.hpp"
-#include "classfile/javaClasses.inline.hpp"
-#include "memory/resourceArea.hpp"
-#include "oops/klass.hpp"
-#include "oops/method.hpp"
-#include "oops/symbol.hpp"
+#include "memory/allocation.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
 
+class Klass;
+class Method;
+class ClassLoaderData;
+
 class TraceStream : public StackObj {
- private:
-  outputStream& _st;
-
  public:
-  TraceStream(outputStream& stream): _st(stream) {}
-
-  void print_val(const char* label, u1 val) {
-    _st.print("%s = " UINT32_FORMAT, label, val);
+  TraceStream() {
+    assert(tty != NULL, "invariant");
   }
 
-  void print_val(const char* label, u2 val) {
-    _st.print("%s = " UINT32_FORMAT, label, val);
+  void print(const char* val) const {
+    tty->print("%s", val);
   }
 
-  void print_val(const char* label, s2 val) {
-    _st.print("%s = " INT32_FORMAT, label, val);
+  void print_val(const char* label, u1 val) const {
+    tty->print("%s = " UINT32_FORMAT, label, val);
   }
 
-  void print_val(const char* label, u4 val) {
-    _st.print("%s = " UINT32_FORMAT, label, val);
+  void print_val(const char* label, u2 val) const {
+    tty->print("%s = " UINT32_FORMAT, label, val);
   }
 
-  void print_val(const char* label, s4 val) {
-    _st.print("%s = " INT32_FORMAT, label, val);
+  void print_val(const char* label, s2 val) const {
+    tty->print("%s = " INT32_FORMAT, label, val);
   }
 
-  void print_val(const char* label, u8 val) {
-    _st.print("%s = " UINT64_FORMAT, label, val);
+  void print_val(const char* label, u4 val) const {
+    tty->print("%s = " UINT32_FORMAT, label, val);
   }
 
-  void print_val(const char* label, s8 val) {
-    _st.print("%s = " INT64_FORMAT, label, (int64_t) val);
+  void print_val(const char* label, s4 val) const {
+    tty->print("%s = " INT32_FORMAT, label, val);
   }
 
-  void print_val(const char* label, bool val) {
-    _st.print("%s = %s", label, val ? "true" : "false");
+  void print_val(const char* label, u8 val) const {
+    tty->print("%s = " UINT64_FORMAT, label, val);
   }
 
-  void print_val(const char* label, float val) {
-    _st.print("%s = %f", label, val);
+  void print_val(const char* label, s8 val) const {
+    tty->print("%s = " INT64_FORMAT, label, (int64_t) val);
   }
 
-  void print_val(const char* label, double val) {
-    _st.print("%s = %f", label, val);
+  void print_val(const char* label, bool val) const {
+    tty->print("%s = %s", label, val ? "true" : "false");
   }
 
-  void print_val(const char* label, const Klass* const val) {
-    ResourceMark rm;
-    const char* description = "NULL";
-    if (val != NULL) {
-      Symbol* name = val->name();
-      if (name != NULL) {
-        description = name->as_C_string();
-      }
-    }
-    _st.print("%s = %s", label, description);
+  void print_val(const char* label, float val) const {
+    tty->print("%s = %f", label, val);
   }
 
-  void print_val(const char* label, const Method* const val) {
-    ResourceMark rm;
-    const char* description = "NULL";
-    if (val != NULL) {
-      description = val->name_and_sig_as_C_string();
-    }
-    _st.print("%s = %s", label, description);
+  void print_val(const char* label, double val) const {
+    tty->print("%s = %f", label, val);
   }
 
-  void print_val(const char* label, const ClassLoaderData* const cld) {
-    ResourceMark rm;
-    if (cld == NULL || cld->is_anonymous()) {
-      _st.print("%s = NULL", label);
-      return;
-    }
-    const oop class_loader_oop = cld->class_loader();
-    if (class_loader_oop == NULL) {
-      _st.print("%s = NULL", label);
-      return;
-    }
-    const char* class_loader_name = "NULL";
-    const char* klass_name = "NULL";
-    const oop class_loader_name_oop =
-      java_lang_ClassLoader::name(class_loader_oop);
-    if (class_loader_name_oop != NULL) {
-      class_loader_name =
-        java_lang_String::as_utf8_string(class_loader_name_oop);
-    }
-    const Klass* const k = class_loader_oop->klass();
-    const Symbol* klass_name_sym = k->name();
-    if (klass_name_sym != NULL) {
-      klass_name = klass_name_sym->as_C_string();
-    }
-    _st.print("%s = name=%s class=%s", label, class_loader_name, klass_name);
+  void print_val(const char* label, const char* val) const {
+    tty->print("%s = '%s'", label, val);
   }
 
-  void print_val(const char* label, const char* val) {
-    _st.print("%s = '%s'", label, val);
-  }
-
-  void print(const char* val) {
-    _st.print("%s", val);
-  }
+  void print_val(const char* label, const Klass* val) const;
+  void print_val(const char* label, const Method* val)const ;
+  void print_val(const char* label, const ClassLoaderData* cld) const;
 };
 
 #endif // INCLUDE_TRACE