src/share/vm/trace/traceStream.hpp

rev 8910 : full patch for jfr

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2014, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2019, 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.
*** 28,84 ****
  #include "utilities/macros.hpp"
  #if INCLUDE_TRACE
  #include "oops/klass.hpp"
  #include "oops/method.hpp"
  #include "oops/symbol.hpp"
  #include "utilities/ostream.hpp"
  
! 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);
    }
  
!   void print_val(const char* label, u2 val) {
!     _st.print("%s = " UINT32_FORMAT, label, val);
    }
  
!   void print_val(const char* label, s2 val) {
!     _st.print("%s = " INT32_FORMAT, label, val);
    }
  
!   void print_val(const char* label, u4 val) {
!     _st.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, u8 val) {
!     _st.print("%s = " UINT64_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, bool val) {
!     _st.print("%s = %s", label, val ? "true" : "false");
    }
  
!   void print_val(const char* label, float val) {
!     _st.print("%s = %f", label, val);
    }
  
!   void print_val(const char* label, double val) {
!     _st.print("%s = %f", label, val);
    }
  
    // Caller is machine generated code located in traceEventClasses.hpp
    // Event<TraceId>::writeEvent() (pseudocode) contains the
    // necessary ResourceMark for the resource allocations below.
--- 28,85 ----
  #include "utilities/macros.hpp"
  #if INCLUDE_TRACE
  #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 ClassLoaderData;
! class Klass;
! class Method;
  
+ class TraceStream : public StackObj {
   public:
!   TraceStream() {
!     assert(tty != NULL, "invariant");
    }
  
!   void print(const char* val) const {
!     tty->print("%s", val);
    }
  
!   void print_val(const char* label, u1 val) const {
!     tty->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, s2 val) const {
!     tty->print("%s = " INT32_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, s4 val) const {
!     tty->print("%s = " INT32_FORMAT, label, val);
    }
  
!   void print_val(const char* label, u8 val) const {
!     tty->print("%s = " UINT64_FORMAT, 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, bool val) const {
!     tty->print("%s = %s", label, val ? "true" : "false");
    }
  
    // Caller is machine generated code located in traceEventClasses.hpp
    // Event<TraceId>::writeEvent() (pseudocode) contains the
    // necessary ResourceMark for the resource allocations below.
*** 89,99 ****
        Symbol* name = val->name();
        if (name != NULL) {
          description = name->as_C_string();
        }
      }
!     _st.print("%s = %s", label, description);
    }
  
    // Caller is machine generated code located in traceEventClasses.hpp
    // Event<TraceId>::writeEvent() (pseudocode) contains the
    // necessary ResourceMark for the resource allocations below.
--- 90,100 ----
        Symbol* name = val->name();
        if (name != NULL) {
          description = name->as_C_string();
        }
      }
!     tty->print("%s = %s", label, description);
    }
  
    // Caller is machine generated code located in traceEventClasses.hpp
    // Event<TraceId>::writeEvent() (pseudocode) contains the
    // necessary ResourceMark for the resource allocations below.
*** 101,119 ****
    void print_val(const char* label, const Method* const val) {
      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, const char* val) {
!     _st.print("%s = '%s'", label, val);
    }
  
!   void print(const char* val) {
!     _st.print("%s", val);
    }
  };
  
  #endif // INCLUDE_TRACE
  #endif // SHARE_VM_TRACE_TRACESTREAM_HPP
--- 102,128 ----
    void print_val(const char* label, const Method* const val) {
      const char* description = "NULL";
      if (val != NULL) {
        description = val->name_and_sig_as_C_string();
      }
!     tty->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, double val) const {
!     tty->print("%s = %f", label, val);
    }
+ 
+   void print_val(const char* label, const char* val) const {
+     tty->print("%s = '%s'", label, 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
  #endif // SHARE_VM_TRACE_TRACESTREAM_HPP