src/share/vm/prims/stackwalk.cpp

rev 13288 : imported patch 8181917-refactor-ul-logstream

*** 25,34 ****
--- 25,35 ----
  #include "precompiled.hpp"
  #include "classfile/javaClasses.hpp"
  #include "classfile/javaClasses.inline.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "logging/log.hpp"
+ #include "logging/logStream.hpp"
  #include "memory/oopFactory.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "prims/stackwalk.hpp"
  #include "runtime/globals.hpp"
*** 119,146 ****
  
      // skip hidden frames for default StackWalker option (i.e. SHOW_HIDDEN_FRAMES
      // not set) and when StackWalker::getCallerClass is called
      if (!ShowHiddenFrames && (skip_hidden_frames(mode) || get_caller_class(mode))) {
        if (method->is_hidden()) {
!         if (log_is_enabled(Debug, stackwalk)) {
            ResourceMark rm(THREAD);
!           outputStream* st = Log(stackwalk)::debug_stream();
!           st->print("  hidden method: ");
!           method->print_short_name(st);
!           st->cr();
          }
          continue;
        }
      }
  
      int index = end_index++;
!     if (log_is_enabled(Debug, stackwalk)) {
        ResourceMark rm(THREAD);
!       outputStream* st = Log(stackwalk)::debug_stream();
!       st->print("  %d: frame method: ", index);
!       method->print_short_name(st);
!       st->print_cr(" bci=%d", stream.bci());
      }
  
      if (!need_method_info(mode) && get_caller_class(mode) &&
            index == start_index && method->caller_sensitive()) {
        ResourceMark rm(THREAD);
--- 120,149 ----
  
      // skip hidden frames for default StackWalker option (i.e. SHOW_HIDDEN_FRAMES
      // not set) and when StackWalker::getCallerClass is called
      if (!ShowHiddenFrames && (skip_hidden_frames(mode) || get_caller_class(mode))) {
        if (method->is_hidden()) {
!         LogTarget(Debug, stackwalk) lt;
!         if (lt.is_enabled()) {
            ResourceMark rm(THREAD);
!           LogStream ls(lt);
!           ls.print("  hidden method: ");
!           method->print_short_name(&ls);
!           ls.cr();
          }
          continue;
        }
      }
  
      int index = end_index++;
!     LogTarget(Debug, stackwalk) lt;
!     if (lt.is_enabled()) {
        ResourceMark rm(THREAD);
!       LogStream ls(lt);
!       ls.print("  %d: frame method: ", index);
!       method->print_short_name(&ls);
!       ls.print_cr(" bci=%d", stream.bci());
      }
  
      if (!need_method_info(mode) && get_caller_class(mode) &&
            index == start_index && method->caller_sensitive()) {
        ResourceMark rm(THREAD);
*** 362,390 ****
        if (ik != stackWalker_klass &&
              ik != abstractStackWalker_klass && ik->super() != abstractStackWalker_klass)  {
          break;
        }
  
!       if (log_is_enabled(Debug, stackwalk)) {
          ResourceMark rm(THREAD);
!         outputStream* st = Log(stackwalk)::debug_stream();
!         st->print("  skip ");
!         stream.method()->print_short_name(st);
!         st->cr();
        }
        stream.next();
      }
  
      // stack frame has been traversed individually and resume stack walk
      // from the stack frame at depth == skip_frames.
      for (int n=0; n < skip_frames && !stream.at_end(); stream.next(), n++) {
!       if (log_is_enabled(Debug, stackwalk)) {
          ResourceMark rm(THREAD);
!         outputStream* st = Log(stackwalk)::debug_stream();
!         st->print("  skip ");
!         stream.method()->print_short_name(st);
!         st->cr();
        }
      }
    }
  
    int end_index = start_index;
--- 365,395 ----
        if (ik != stackWalker_klass &&
              ik != abstractStackWalker_klass && ik->super() != abstractStackWalker_klass)  {
          break;
        }
  
!       LogTarget(Debug, stackwalk) lt;
!       if (lt.is_enabled()) {
          ResourceMark rm(THREAD);
!         LogStream ls(lt);      
!         ls.print("  skip ");
!         stream.method()->print_short_name(&ls);
!         ls.cr();
        }
        stream.next();
      }
  
      // stack frame has been traversed individually and resume stack walk
      // from the stack frame at depth == skip_frames.
      for (int n=0; n < skip_frames && !stream.at_end(); stream.next(), n++) {
!       LogTarget(Debug, stackwalk) lt;
!       if (lt.is_enabled()) {
          ResourceMark rm(THREAD);
!         LogStream ls(lt);
!         ls.print("  skip ");
!         stream.method()->print_short_name(&ls);
!         ls.cr();
        }
      }
    }
  
    int end_index = start_index;