src/share/vm/utilities/dtrace_disabled.hpp

rev 5893 : 8034080: Remove the USDT1 dtrace code from Hotspot

*** 30,41 ****
   * on a system that doesn't suuport dtrace or because we're bulding a variant
   * of hotspot (like core) where we do not support dtrace
   */
  #if !defined(DTRACE_ENABLED)
  
- #ifdef USDT2
- 
  /* hotspot provider probes */
  #define HOTSPOT_CLASS_LOADED(arg0, arg1, arg2, arg3)
  #define HOTSPOT_CLASS_LOADED_ENABLED()  0
  #define HOTSPOT_CLASS_UNLOADED(arg0, arg1, arg2, arg3)
  #define HOTSPOT_CLASS_UNLOADED_ENABLED()  0
--- 30,39 ----
*** 105,115 ****
  #define HOTSPOT_THREAD_YIELD_ENABLED() 0
  #define HOTSPOT_THREAD_PARK_BEGIN(arg0, arg1, arg2)
  #define HOTSPOT_THREAD_PARK_BEGIN_ENABLED() 0
  #define HOTSPOT_THREAD_PARK_END(arg0)
  #define HOTSPOT_THREAD_PARK_END_ENABLED() 0
! #define HOTSPOT_THREAD_UNPARK()
  #define HOTSPOT_THREAD_UNPARK_ENABLED() 0
  #define HOTSPOT_VM_INIT_BEGIN()
  #define HOTSPOT_VM_INIT_BEGIN_ENABLED() 0
  #define HOTSPOT_VM_INIT_END()
  #define HOTSPOT_VM_INIT_END_ENABLED() 0
--- 103,113 ----
  #define HOTSPOT_THREAD_YIELD_ENABLED() 0
  #define HOTSPOT_THREAD_PARK_BEGIN(arg0, arg1, arg2)
  #define HOTSPOT_THREAD_PARK_BEGIN_ENABLED() 0
  #define HOTSPOT_THREAD_PARK_END(arg0)
  #define HOTSPOT_THREAD_PARK_END_ENABLED() 0
! #define HOTSPOT_THREAD_UNPARK(arg0)
  #define HOTSPOT_THREAD_UNPARK_ENABLED() 0
  #define HOTSPOT_VM_INIT_BEGIN()
  #define HOTSPOT_VM_INIT_BEGIN_ENABLED() 0
  #define HOTSPOT_VM_INIT_END()
  #define HOTSPOT_VM_INIT_END_ENABLED() 0
*** 1084,1097 ****
  #define HOTSPOT_JNI_UNREGISTERNATIVES_ENTRY(arg0, arg1)
  #define HOTSPOT_JNI_UNREGISTERNATIVES_ENTRY_ENABLED()  0
  #define HOTSPOT_JNI_UNREGISTERNATIVES_RETURN(arg0)
  #define HOTSPOT_JNI_UNREGISTERNATIVES_RETURN_ENABLED()  0
  
- #else /* USDT2 */
- #error This file should only be included for USDT2
- #endif /* USDT2 */
- 
  #else /* !defined(DTRACE_ENABLED) */
  #error This file should only be included when dtrace is not enabled
! #end /* !defined(DTRACE_ENABLED) */
  
  #endif // SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP
--- 1082,1091 ----
  #define HOTSPOT_JNI_UNREGISTERNATIVES_ENTRY(arg0, arg1)
  #define HOTSPOT_JNI_UNREGISTERNATIVES_ENTRY_ENABLED()  0
  #define HOTSPOT_JNI_UNREGISTERNATIVES_RETURN(arg0)
  #define HOTSPOT_JNI_UNREGISTERNATIVES_RETURN_ENABLED()  0
  
  #else /* !defined(DTRACE_ENABLED) */
  #error This file should only be included when dtrace is not enabled
! #endif /* !defined(DTRACE_ENABLED) */
  
  #endif // SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP