src/share/vm/code/nmethod.cpp

rev 5878 : [mq]: usdt1-gone

*** 48,78 ****
  
  #ifdef DTRACE_ENABLED
  
  // Only bother with this argument setup if dtrace is available
  
- #ifndef USDT2
- HS_DTRACE_PROBE_DECL8(hotspot, compiled__method__load,
-   const char*, int, const char*, int, const char*, int, void*, size_t);
- 
- HS_DTRACE_PROBE_DECL6(hotspot, compiled__method__unload,
-   char*, int, char*, int, char*, int);
- 
- #define DTRACE_METHOD_UNLOAD_PROBE(method)                                \
-   {                                                                       \
-     Method* m = (method);                                                 \
-     if (m != NULL) {                                                      \
-       Symbol* klass_name = m->klass_name();                               \
-       Symbol* name = m->name();                                           \
-       Symbol* signature = m->signature();                                 \
-       HS_DTRACE_PROBE6(hotspot, compiled__method__unload,                 \
-         klass_name->bytes(), klass_name->utf8_length(),                   \
-         name->bytes(), name->utf8_length(),                               \
-         signature->bytes(), signature->utf8_length());                    \
-     }                                                                     \
-   }
- #else /* USDT2 */
  #define DTRACE_METHOD_UNLOAD_PROBE(method)                                \
    {                                                                       \
      Method* m = (method);                                                 \
      if (m != NULL) {                                                      \
        Symbol* klass_name = m->klass_name();                               \
--- 48,57 ----
*** 82,92 ****
          (char *) klass_name->bytes(), klass_name->utf8_length(),                   \
          (char *) name->bytes(), name->utf8_length(),                               \
          (char *) signature->bytes(), signature->utf8_length());                    \
      }                                                                     \
    }
- #endif /* USDT2 */
  
  #else //  ndef DTRACE_ENABLED
  
  #define DTRACE_METHOD_UNLOAD_PROBE(method)
  
--- 61,70 ----
*** 1518,1546 ****
  // new method for install_code() path
  // Transfer information from compilation to jvmti
  void nmethod::post_compiled_method_load_event() {
  
    Method* moop = method();
- #ifndef USDT2
-   HS_DTRACE_PROBE8(hotspot, compiled__method__load,
-       moop->klass_name()->bytes(),
-       moop->klass_name()->utf8_length(),
-       moop->name()->bytes(),
-       moop->name()->utf8_length(),
-       moop->signature()->bytes(),
-       moop->signature()->utf8_length(),
-       insts_begin(), insts_size());
- #else /* USDT2 */
    HOTSPOT_COMPILED_METHOD_LOAD(
        (char *) moop->klass_name()->bytes(),
        moop->klass_name()->utf8_length(),
        (char *) moop->name()->bytes(),
        moop->name()->utf8_length(),
        (char *) moop->signature()->bytes(),
        moop->signature()->utf8_length(),
        insts_begin(), insts_size());
- #endif /* USDT2 */
  
    if (JvmtiExport::should_post_compiled_method_load() ||
        JvmtiExport::should_post_compiled_method_unload()) {
      get_and_cache_jmethod_id();
    }
--- 1496,1513 ----