src/share/vm/runtime/objectMonitor.cpp

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

*** 76,118 ****
    if (klassname != NULL) {                                                 \
      bytes = (char*)klassname->bytes();                                     \
      len = klassname->utf8_length();                                        \
    }
  
- #ifndef USDT2
- 
- HS_DTRACE_PROBE_DECL4(hotspot, monitor__notify,
-   jlong, uintptr_t, char*, int);
- HS_DTRACE_PROBE_DECL4(hotspot, monitor__notifyAll,
-   jlong, uintptr_t, char*, int);
- HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__enter,
-   jlong, uintptr_t, char*, int);
- HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__entered,
-   jlong, uintptr_t, char*, int);
- HS_DTRACE_PROBE_DECL4(hotspot, monitor__contended__exit,
-   jlong, uintptr_t, char*, int);
- 
- #define DTRACE_MONITOR_WAIT_PROBE(monitor, obj, thread, millis)       \
-   {                                                                        \
-     if (DTraceMonitorProbes) {                                            \
-       DTRACE_MONITOR_PROBE_COMMON(obj, thread);                       \
-       HS_DTRACE_PROBE5(hotspot, monitor__wait, jtid,                       \
-                        (monitor), bytes, len, (millis));                   \
-     }                                                                      \
-   }
- 
- #define DTRACE_MONITOR_PROBE(probe, monitor, obj, thread)             \
-   {                                                                        \
-     if (DTraceMonitorProbes) {                                            \
-       DTRACE_MONITOR_PROBE_COMMON(obj, thread);                       \
-       HS_DTRACE_PROBE4(hotspot, monitor__##probe, jtid,                    \
-                        (uintptr_t)(monitor), bytes, len);                  \
-     }                                                                      \
-   }
- 
- #else /* USDT2 */
- 
  #define DTRACE_MONITOR_WAIT_PROBE(monitor, obj, thread, millis)            \
    {                                                                        \
      if (DTraceMonitorProbes) {                                            \
        DTRACE_MONITOR_PROBE_COMMON(obj, thread);                            \
        HOTSPOT_MONITOR_WAIT(jtid,                                           \
--- 76,85 ----
*** 133,143 ****
        HOTSPOT_MONITOR_##probe(jtid,                                               \
                         (uintptr_t)(monitor), bytes, len);                  \
      }                                                                      \
    }
  
- #endif /* USDT2 */
  #else //  ndef DTRACE_ENABLED
  
  #define DTRACE_MONITOR_WAIT_PROBE(obj, thread, millis, mon)    {;}
  #define DTRACE_MONITOR_PROBE(probe, obj, thread, mon)          {;}
  
--- 100,109 ----