src/os_cpu/linux_x86/vm/thread_linux_x86.cpp

rev 4773 : 8005849: JEP 167: Event-Based JVM Tracing
Reviewed-by: acorn, coleenp, sla
Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2010, 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) 2003, 2013, 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.
*** 30,41 ****
  // currently interrupted by SIGPROF
  bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr,
    void* ucontext, bool isInJava) {
  
    assert(Thread::current() == this, "caller must be current thread");
!   assert(this->is_Java_thread(), "must be JavaThread");
  
    JavaThread* jt = (JavaThread *)this;
  
    // If we have a last_Java_frame, then we should use it even if
    // isInJava == true.  It should be more reliable than ucontext info.
    if (jt->has_last_Java_frame()) {
--- 30,48 ----
  // currently interrupted by SIGPROF
  bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr,
    void* ucontext, bool isInJava) {
  
    assert(Thread::current() == this, "caller must be current thread");
!   return pd_get_top_frame(fr_addr, ucontext, isInJava);
! }
  
+ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava) {
+   return pd_get_top_frame(fr_addr, ucontext, isInJava);
+ }
+ 
+ bool JavaThread::pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava) {
+   assert(this->is_Java_thread(), "must be JavaThread");
    JavaThread* jt = (JavaThread *)this;
  
    // If we have a last_Java_frame, then we should use it even if
    // isInJava == true.  It should be more reliable than ucontext info.
    if (jt->has_last_Java_frame()) {