Show
Ignore:
Timestamp:
08/15/11 19:43:36 (3 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1313437416 -0400
git-parent:

[f207009593817c50a5fb4fd4e75cbdc4c79dcfcc]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1313437416 -0400
Message:

make this work on Mac OS X Lion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/dtrace_probes.d

    rb09464c rb014769  
    1515}; 
    1616 
    17 provider noit_check
    18   probe dispatch(char *, char *, char *, char *); 
    19   probe status(char *, char *, char *, char *, int, int, char *); 
    20   probe metric(char *, char *, char *, char *, char *, int, char *); 
     17provider noit
     18  probe check__dispatch(char *, char *, char *, char *); 
     19  probe check__metric(char *, char *, char *, char *, char *, int, char *); 
     20  probe check__status(char *, char *, char *, char *, int, int, char *); 
    2121}; 
  • src/dtrace_probes.h

    rb09464c rb014769  
    1212#endif 
    1313 
    14 #define STRATCON_NOIT_STABILITY "___dtrace_stability$stratcon_noit$v1$1_1_0_1_1_0_1_1_0_1_1_0_1_1_0" 
    15  
    16 #define STRATCON_NOIT_TYPEDEFS "___dtrace_typedefs$stratcon_noit$v2" 
    17  
    18 #if !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED 
     14#if _DTRACE_VERSION 
    1915 
    2016#define STRATCON_NOIT_CONNECT(arg0, arg1, arg2, arg3) \ 
    21 do { \ 
    22         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    23         __dtrace_probe$stratcon_noit$connect$v1$696e74$63686172202a$63686172202a$63686172202a(arg0, arg1, arg2, arg3); \ 
    24         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    25 } while (0) 
     17        __dtrace_stratcon_noit___connect(arg0, arg1, arg2, arg3) 
     18#ifndef __sparc 
    2619#define STRATCON_NOIT_CONNECT_ENABLED() \ 
    27         ({ int _r = __dtrace_isenabled$stratcon_noit$connect$v1(); \ 
    28                 __asm__ volatile(""); \ 
    29                 _r; }) 
     20        __dtraceenabled_stratcon_noit___connect() 
     21#else 
     22#define STRATCON_NOIT_CONNECT_ENABLED() \ 
     23        __dtraceenabled_stratcon_noit___connect(0) 
     24#endif 
    3025#define STRATCON_NOIT_CONNECT_CLOSE(arg0, arg1, arg2, arg3, arg4, arg5) \ 
    31 do { \ 
    32         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    33         __dtrace_probe$stratcon_noit$connect__close$v1$696e74$63686172202a$63686172202a$63686172202a$696e74$696e74(arg0, arg1, arg2, arg3, arg4, arg5); \ 
    34         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    35 } while (0) 
     26        __dtrace_stratcon_noit___connect__close(arg0, arg1, arg2, arg3, arg4, arg5) 
     27#ifndef __sparc 
    3628#define STRATCON_NOIT_CONNECT_CLOSE_ENABLED() \ 
    37         ({ int _r = __dtrace_isenabled$stratcon_noit$connect__close$v1(); \ 
    38                 __asm__ volatile(""); \ 
    39                 _r; }) 
     29        __dtraceenabled_stratcon_noit___connect__close() 
     30#else 
     31#define STRATCON_NOIT_CONNECT_CLOSE_ENABLED() \ 
     32        __dtraceenabled_stratcon_noit___connect__close(0) 
     33#endif 
    4034#define STRATCON_NOIT_CONNECT_FAILED(arg0, arg1, arg2, arg3, arg4) \ 
    41 do { \ 
    42         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    43         __dtrace_probe$stratcon_noit$connect__failed$v1$696e74$63686172202a$63686172202a$63686172202a$696e74(arg0, arg1, arg2, arg3, arg4); \ 
    44         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    45 } while (0) 
     35        __dtrace_stratcon_noit___connect__failed(arg0, arg1, arg2, arg3, arg4) 
     36#ifndef __sparc 
    4637#define STRATCON_NOIT_CONNECT_FAILED_ENABLED() \ 
    47         ({ int _r = __dtrace_isenabled$stratcon_noit$connect__failed$v1(); \ 
    48                 __asm__ volatile(""); \ 
    49                 _r; }) 
     38        __dtraceenabled_stratcon_noit___connect__failed() 
     39#else 
     40#define STRATCON_NOIT_CONNECT_FAILED_ENABLED() \ 
     41        __dtraceenabled_stratcon_noit___connect__failed(0) 
     42#endif 
    5043#define STRATCON_NOIT_CONNECT_SSL(arg0, arg1, arg2, arg3) \ 
    51 do { \ 
    52         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    53         __dtrace_probe$stratcon_noit$connect__ssl$v1$696e74$63686172202a$63686172202a$63686172202a(arg0, arg1, arg2, arg3); \ 
    54         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    55 } while (0) 
     44        __dtrace_stratcon_noit___connect__ssl(arg0, arg1, arg2, arg3) 
     45#ifndef __sparc 
    5646#define STRATCON_NOIT_CONNECT_SSL_ENABLED() \ 
    57         ({ int _r = __dtrace_isenabled$stratcon_noit$connect__ssl$v1(); \ 
    58                 __asm__ volatile(""); \ 
    59                 _r; }) 
     47        __dtraceenabled_stratcon_noit___connect__ssl() 
     48#else 
     49#define STRATCON_NOIT_CONNECT_SSL_ENABLED() \ 
     50        __dtraceenabled_stratcon_noit___connect__ssl(0) 
     51#endif 
    6052#define STRATCON_NOIT_CONNECT_SSL_FAILED(arg0, arg1, arg2, arg3, arg4, arg5) \ 
    61 do { \ 
    62         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    63         __dtrace_probe$stratcon_noit$connect__ssl__failed$v1$696e74$63686172202a$63686172202a$63686172202a$63686172202a$696e74(arg0, arg1, arg2, arg3, arg4, arg5); \ 
    64         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    65 } while (0) 
     53        __dtrace_stratcon_noit___connect__ssl__failed(arg0, arg1, arg2, arg3, arg4, arg5) 
     54#ifndef __sparc 
    6655#define STRATCON_NOIT_CONNECT_SSL_FAILED_ENABLED() \ 
    67         ({ int _r = __dtrace_isenabled$stratcon_noit$connect__ssl__failed$v1(); \ 
    68                 __asm__ volatile(""); \ 
    69                 _r; }) 
     56        __dtraceenabled_stratcon_noit___connect__ssl__failed() 
     57#else 
     58#define STRATCON_NOIT_CONNECT_SSL_FAILED_ENABLED() \ 
     59        __dtraceenabled_stratcon_noit___connect__ssl__failed(0) 
     60#endif 
    7061#define STRATCON_NOIT_CONNECT_SSL_SUCCESS(arg0, arg1, arg2, arg3) \ 
    71 do { \ 
    72         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    73         __dtrace_probe$stratcon_noit$connect__ssl__success$v1$696e74$63686172202a$63686172202a$63686172202a(arg0, arg1, arg2, arg3); \ 
    74         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    75 } while (0) 
     62        __dtrace_stratcon_noit___connect__ssl__success(arg0, arg1, arg2, arg3) 
     63#ifndef __sparc 
    7664#define STRATCON_NOIT_CONNECT_SSL_SUCCESS_ENABLED() \ 
    77         ({ int _r = __dtrace_isenabled$stratcon_noit$connect__ssl__success$v1(); \ 
    78                 __asm__ volatile(""); \ 
    79                 _r; }) 
     65        __dtraceenabled_stratcon_noit___connect__ssl__success() 
     66#else 
     67#define STRATCON_NOIT_CONNECT_SSL_SUCCESS_ENABLED() \ 
     68        __dtraceenabled_stratcon_noit___connect__ssl__success(0) 
     69#endif 
    8070#define STRATCON_NOIT_CONNECT_SUCCESS(arg0, arg1, arg2, arg3) \ 
    81 do { \ 
    82         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    83         __dtrace_probe$stratcon_noit$connect__success$v1$696e74$63686172202a$63686172202a$63686172202a(arg0, arg1, arg2, arg3); \ 
    84         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    85 } while (0) 
     71        __dtrace_stratcon_noit___connect__success(arg0, arg1, arg2, arg3) 
     72#ifndef __sparc 
    8673#define STRATCON_NOIT_CONNECT_SUCCESS_ENABLED() \ 
    87         ({ int _r = __dtrace_isenabled$stratcon_noit$connect__success$v1(); \ 
    88                 __asm__ volatile(""); \ 
    89                 _r; }) 
     74        __dtraceenabled_stratcon_noit___connect__success() 
     75#else 
     76#define STRATCON_NOIT_CONNECT_SUCCESS_ENABLED() \ 
     77        __dtraceenabled_stratcon_noit___connect__success(0) 
     78#endif 
    9079#define STRATCON_NOIT_RESCHEDULE(arg0, arg1, arg2, arg3, arg4) \ 
    91 do { \ 
    92         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    93         __dtrace_probe$stratcon_noit$reschedule$v1$696e74$63686172202a$63686172202a$63686172202a$696e74(arg0, arg1, arg2, arg3, arg4); \ 
    94         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    95 } while (0) 
     80        __dtrace_stratcon_noit___reschedule(arg0, arg1, arg2, arg3, arg4) 
     81#ifndef __sparc 
    9682#define STRATCON_NOIT_RESCHEDULE_ENABLED() \ 
    97         ({ int _r = __dtrace_isenabled$stratcon_noit$reschedule$v1(); \ 
    98                 __asm__ volatile(""); \ 
    99                 _r; }) 
     83        __dtraceenabled_stratcon_noit___reschedule() 
     84#else 
     85#define STRATCON_NOIT_RESCHEDULE_ENABLED() \ 
     86        __dtraceenabled_stratcon_noit___reschedule(0) 
     87#endif 
    10088#define STRATCON_NOIT_SHUTDOWN_PERMANENT(arg0, arg1, arg2, arg3) \ 
    101 do { \ 
    102         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    103         __dtrace_probe$stratcon_noit$shutdown__permanent$v1$696e74$63686172202a$63686172202a$63686172202a(arg0, arg1, arg2, arg3); \ 
    104         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    105 } while (0) 
     89        __dtrace_stratcon_noit___shutdown__permanent(arg0, arg1, arg2, arg3) 
     90#ifndef __sparc 
    10691#define STRATCON_NOIT_SHUTDOWN_PERMANENT_ENABLED() \ 
    107         ({ int _r = __dtrace_isenabled$stratcon_noit$shutdown__permanent$v1(); \ 
    108                 __asm__ volatile(""); \ 
    109                 _r; }) 
     92        __dtraceenabled_stratcon_noit___shutdown__permanent() 
     93#else 
     94#define STRATCON_NOIT_SHUTDOWN_PERMANENT_ENABLED() \ 
     95        __dtraceenabled_stratcon_noit___shutdown__permanent(0) 
     96#endif 
    11097#define STRATCON_NOIT_STREAM_BODY(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \ 
    111 do { \ 
    112         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    113         __dtrace_probe$stratcon_noit$stream__body$v1$696e74$63686172202a$63686172202a$63686172202a$696e74$696e74$696e74$696e74$63686172202a(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); \ 
    114         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    115 } while (0) 
     98        __dtrace_stratcon_noit___stream__body(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) 
     99#ifndef __sparc 
    116100#define STRATCON_NOIT_STREAM_BODY_ENABLED() \ 
    117         ({ int _r = __dtrace_isenabled$stratcon_noit$stream__body$v1(); \ 
    118                 __asm__ volatile(""); \ 
    119                 _r; }) 
     101        __dtraceenabled_stratcon_noit___stream__body() 
     102#else 
     103#define STRATCON_NOIT_STREAM_BODY_ENABLED() \ 
     104        __dtraceenabled_stratcon_noit___stream__body(0) 
     105#endif 
    120106#define STRATCON_NOIT_STREAM_CHECKPOINT(arg0, arg1, arg2, arg3, arg4, arg5) \ 
    121 do { \ 
    122         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    123         __dtrace_probe$stratcon_noit$stream__checkpoint$v1$696e74$63686172202a$63686172202a$63686172202a$696e74$696e74(arg0, arg1, arg2, arg3, arg4, arg5); \ 
    124         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    125 } while (0) 
     107        __dtrace_stratcon_noit___stream__checkpoint(arg0, arg1, arg2, arg3, arg4, arg5) 
     108#ifndef __sparc 
    126109#define STRATCON_NOIT_STREAM_CHECKPOINT_ENABLED() \ 
    127         ({ int _r = __dtrace_isenabled$stratcon_noit$stream__checkpoint$v1(); \ 
    128                 __asm__ volatile(""); \ 
    129                 _r; }) 
     110        __dtraceenabled_stratcon_noit___stream__checkpoint() 
     111#else 
     112#define STRATCON_NOIT_STREAM_CHECKPOINT_ENABLED() \ 
     113        __dtraceenabled_stratcon_noit___stream__checkpoint(0) 
     114#endif 
    130115#define STRATCON_NOIT_STREAM_COUNT(arg0, arg1, arg2, arg3, arg4) \ 
    131 do { \ 
    132         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    133         __dtrace_probe$stratcon_noit$stream__count$v1$696e74$63686172202a$63686172202a$63686172202a$696e74(arg0, arg1, arg2, arg3, arg4); \ 
    134         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    135 } while (0) 
     116        __dtrace_stratcon_noit___stream__count(arg0, arg1, arg2, arg3, arg4) 
     117#ifndef __sparc 
    136118#define STRATCON_NOIT_STREAM_COUNT_ENABLED() \ 
    137         ({ int _r = __dtrace_isenabled$stratcon_noit$stream__count$v1(); \ 
    138                 __asm__ volatile(""); \ 
    139                 _r; }) 
     119        __dtraceenabled_stratcon_noit___stream__count() 
     120#else 
     121#define STRATCON_NOIT_STREAM_COUNT_ENABLED() \ 
     122        __dtraceenabled_stratcon_noit___stream__count(0) 
     123#endif 
    140124#define STRATCON_NOIT_STREAM_HEADER(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \ 
    141 do { \ 
    142         __asm__ volatile(".reference " STRATCON_NOIT_TYPEDEFS); \ 
    143         __dtrace_probe$stratcon_noit$stream__header$v1$696e74$63686172202a$63686172202a$63686172202a$696e74$696e74$696e74$696e74$696e74(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); \ 
    144         __asm__ volatile(".reference " STRATCON_NOIT_STABILITY); \ 
    145 } while (0) 
     125        __dtrace_stratcon_noit___stream__header(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) 
     126#ifndef __sparc 
    146127#define STRATCON_NOIT_STREAM_HEADER_ENABLED() \ 
    147         ({ int _r = __dtrace_isenabled$stratcon_noit$stream__header$v1(); \ 
    148                 __asm__ volatile(""); \ 
    149                 _r; }) 
    150  
    151  
    152 extern void __dtrace_probe$stratcon_noit$connect$v1$696e74$63686172202a$63686172202a$63686172202a(int, const char *, const char *, const char *); 
    153 extern int __dtrace_isenabled$stratcon_noit$connect$v1(void); 
    154 extern void __dtrace_probe$stratcon_noit$connect__close$v1$696e74$63686172202a$63686172202a$63686172202a$696e74$696e74(int, const char *, const char *, const char *, int, int); 
    155 extern int __dtrace_isenabled$stratcon_noit$connect__close$v1(void); 
    156 extern void __dtrace_probe$stratcon_noit$connect__failed$v1$696e74$63686172202a$63686172202a$63686172202a$696e74(int, const char *, const char *, const char *, int); 
    157 extern int __dtrace_isenabled$stratcon_noit$connect__failed$v1(void); 
    158 extern void __dtrace_probe$stratcon_noit$connect__ssl$v1$696e74$63686172202a$63686172202a$63686172202a(int, const char *, const char *, const char *); 
    159 extern int __dtrace_isenabled$stratcon_noit$connect__ssl$v1(void); 
    160 extern void __dtrace_probe$stratcon_noit$connect__ssl__failed$v1$696e74$63686172202a$63686172202a$63686172202a$63686172202a$696e74(int, const char *, const char *, const char *, const char *, int); 
    161 extern int __dtrace_isenabled$stratcon_noit$connect__ssl__failed$v1(void); 
    162 extern void __dtrace_probe$stratcon_noit$connect__ssl__success$v1$696e74$63686172202a$63686172202a$63686172202a(int, const char *, const char *, const char *); 
    163 extern int __dtrace_isenabled$stratcon_noit$connect__ssl__success$v1(void); 
    164 extern void __dtrace_probe$stratcon_noit$connect__success$v1$696e74$63686172202a$63686172202a$63686172202a(int, const char *, const char *, const char *); 
    165 extern int __dtrace_isenabled$stratcon_noit$connect__success$v1(void); 
    166 extern void __dtrace_probe$stratcon_noit$reschedule$v1$696e74$63686172202a$63686172202a$63686172202a$696e74(int, const char *, const char *, const char *, int); 
    167 extern int __dtrace_isenabled$stratcon_noit$reschedule$v1(void); 
    168 extern void __dtrace_probe$stratcon_noit$shutdown__permanent$v1$696e74$63686172202a$63686172202a$63686172202a(int, const char *, const char *, const char *); 
    169 extern int __dtrace_isenabled$stratcon_noit$shutdown__permanent$v1(void); 
    170 extern void __dtrace_probe$stratcon_noit$stream__body$v1$696e74$63686172202a$63686172202a$63686172202a$696e74$696e74$696e74$696e74$63686172202a(int, const char *, const char *, const char *, int, int, int, int, const char *); 
    171 extern int __dtrace_isenabled$stratcon_noit$stream__body$v1(void); 
    172 extern void __dtrace_probe$stratcon_noit$stream__checkpoint$v1$696e74$63686172202a$63686172202a$63686172202a$696e74$696e74(int, const char *, const char *, const char *, int, int); 
    173 extern int __dtrace_isenabled$stratcon_noit$stream__checkpoint$v1(void); 
    174 extern void __dtrace_probe$stratcon_noit$stream__count$v1$696e74$63686172202a$63686172202a$63686172202a$696e74(int, const char *, const char *, const char *, int); 
    175 extern int __dtrace_isenabled$stratcon_noit$stream__count$v1(void); 
    176 extern void __dtrace_probe$stratcon_noit$stream__header$v1$696e74$63686172202a$63686172202a$63686172202a$696e74$696e74$696e74$696e74$696e74(int, const char *, const char *, const char *, int, int, int, int, int); 
    177 extern int __dtrace_isenabled$stratcon_noit$stream__header$v1(void); 
    178  
    179 #else 
    180  
    181 #define STRATCON_NOIT_CONNECT(arg0, arg1, arg2, arg3) \ 
    182 do { \ 
    183         } while (0) 
     128        __dtraceenabled_stratcon_noit___stream__header() 
     129#else 
     130#define STRATCON_NOIT_STREAM_HEADER_ENABLED() \ 
     131        __dtraceenabled_stratcon_noit___stream__header(0) 
     132#endif 
     133 
     134 
     135extern void __dtrace_stratcon_noit___connect(int, char *, char *, char *); 
     136#ifndef __sparc 
     137extern int __dtraceenabled_stratcon_noit___connect(void); 
     138#else 
     139extern int __dtraceenabled_stratcon_noit___connect(long); 
     140#endif 
     141extern void __dtrace_stratcon_noit___connect__close(int, char *, char *, char *, int, int); 
     142#ifndef __sparc 
     143extern int __dtraceenabled_stratcon_noit___connect__close(void); 
     144#else 
     145extern int __dtraceenabled_stratcon_noit___connect__close(long); 
     146#endif 
     147extern void __dtrace_stratcon_noit___connect__failed(int, char *, char *, char *, int); 
     148#ifndef __sparc 
     149extern int __dtraceenabled_stratcon_noit___connect__failed(void); 
     150#else 
     151extern int __dtraceenabled_stratcon_noit___connect__failed(long); 
     152#endif 
     153extern void __dtrace_stratcon_noit___connect__ssl(int, char *, char *, char *); 
     154#ifndef __sparc 
     155extern int __dtraceenabled_stratcon_noit___connect__ssl(void); 
     156#else 
     157extern int __dtraceenabled_stratcon_noit___connect__ssl(long); 
     158#endif 
     159extern void __dtrace_stratcon_noit___connect__ssl__failed(int, char *, char *, char *, char *, int); 
     160#ifndef __sparc 
     161extern int __dtraceenabled_stratcon_noit___connect__ssl__failed(void); 
     162#else 
     163extern int __dtraceenabled_stratcon_noit___connect__ssl__failed(long); 
     164#endif 
     165extern void __dtrace_stratcon_noit___connect__ssl__success(int, char *, char *, char *); 
     166#ifndef __sparc 
     167extern int __dtraceenabled_stratcon_noit___connect__ssl__success(void); 
     168#else 
     169extern int __dtraceenabled_stratcon_noit___connect__ssl__success(long); 
     170#endif 
     171extern void __dtrace_stratcon_noit___connect__success(int, char *, char *, char *); 
     172#ifndef __sparc 
     173extern int __dtraceenabled_stratcon_noit___connect__success(void); 
     174#else 
     175extern int __dtraceenabled_stratcon_noit___connect__success(long); 
     176#endif 
     177extern void __dtrace_stratcon_noit___reschedule(int, char *, char *, char *, int); 
     178#ifndef __sparc 
     179extern int __dtraceenabled_stratcon_noit___reschedule(void); 
     180#else 
     181extern int __dtraceenabled_stratcon_noit___reschedule(long); 
     182#endif 
     183extern void __dtrace_stratcon_noit___shutdown__permanent(int, char *, char *, char *); 
     184#ifndef __sparc 
     185extern int __dtraceenabled_stratcon_noit___shutdown__permanent(void); 
     186#else 
     187extern int __dtraceenabled_stratcon_noit___shutdown__permanent(long); 
     188#endif 
     189extern void __dtrace_stratcon_noit___stream__body(int, char *, char *, char *, int, int, int, int, char *); 
     190#ifndef __sparc 
     191extern int __dtraceenabled_stratcon_noit___stream__body(void); 
     192#else 
     193extern int __dtraceenabled_stratcon_noit___stream__body(long); 
     194#endif 
     195extern void __dtrace_stratcon_noit___stream__checkpoint(int, char *, char *, char *, int, int); 
     196#ifndef __sparc 
     197extern int __dtraceenabled_stratcon_noit___stream__checkpoint(void); 
     198#else 
     199extern int __dtraceenabled_stratcon_noit___stream__checkpoint(long); 
     200#endif 
     201extern void __dtrace_stratcon_noit___stream__count(int, char *, char *, char *, int); 
     202#ifndef __sparc 
     203extern int __dtraceenabled_stratcon_noit___stream__count(void); 
     204#else 
     205extern int __dtraceenabled_stratcon_noit___stream__count(long); 
     206#endif 
     207extern void __dtrace_stratcon_noit___stream__header(int, char *, char *, char *, int, int, int, int, int); 
     208#ifndef __sparc 
     209extern int __dtraceenabled_stratcon_noit___stream__header(void); 
     210#else 
     211extern int __dtraceenabled_stratcon_noit___stream__header(long); 
     212#endif 
     213 
     214#else 
     215 
     216#define STRATCON_NOIT_CONNECT(arg0, arg1, arg2, arg3) 
    184217#define STRATCON_NOIT_CONNECT_ENABLED() (0) 
    185 #define STRATCON_NOIT_CONNECT_CLOSE(arg0, arg1, arg2, arg3, arg4, arg5) \ 
    186 do { \ 
    187         } while (0) 
     218#define STRATCON_NOIT_CONNECT_CLOSE(arg0, arg1, arg2, arg3, arg4, arg5) 
    188219#define STRATCON_NOIT_CONNECT_CLOSE_ENABLED() (0) 
    189 #define STRATCON_NOIT_CONNECT_FAILED(arg0, arg1, arg2, arg3, arg4) \ 
    190 do { \ 
    191         } while (0) 
     220#define STRATCON_NOIT_CONNECT_FAILED(arg0, arg1, arg2, arg3, arg4) 
    192221#define STRATCON_NOIT_CONNECT_FAILED_ENABLED() (0) 
    193 #define STRATCON_NOIT_CONNECT_SSL(arg0, arg1, arg2, arg3) \ 
    194 do { \ 
    195         } while (0) 
     222#define STRATCON_NOIT_CONNECT_SSL(arg0, arg1, arg2, arg3) 
    196223#define STRATCON_NOIT_CONNECT_SSL_ENABLED() (0) 
    197 #define STRATCON_NOIT_CONNECT_SSL_FAILED(arg0, arg1, arg2, arg3, arg4, arg5) \ 
    198 do { \ 
    199         } while (0) 
     224#define STRATCON_NOIT_CONNECT_SSL_FAILED(arg0, arg1, arg2, arg3, arg4, arg5) 
    200225#define STRATCON_NOIT_CONNECT_SSL_FAILED_ENABLED() (0) 
    201 #define STRATCON_NOIT_CONNECT_SSL_SUCCESS(arg0, arg1, arg2, arg3) \ 
    202 do { \ 
    203         } while (0) 
     226#define STRATCON_NOIT_CONNECT_SSL_SUCCESS(arg0, arg1, arg2, arg3) 
    204227#define STRATCON_NOIT_CONNECT_SSL_SUCCESS_ENABLED() (0) 
    205 #define STRATCON_NOIT_CONNECT_SUCCESS(arg0, arg1, arg2, arg3) \ 
    206 do { \ 
    207         } while (0) 
     228#define STRATCON_NOIT_CONNECT_SUCCESS(arg0, arg1, arg2, arg3) 
    208229#define STRATCON_NOIT_CONNECT_SUCCESS_ENABLED() (0) 
    209 #define STRATCON_NOIT_RESCHEDULE(arg0, arg1, arg2, arg3, arg4) \ 
    210 do { \ 
    211         } while (0) 
     230#define STRATCON_NOIT_RESCHEDULE(arg0, arg1, arg2, arg3, arg4) 
    212231#define STRATCON_NOIT_RESCHEDULE_ENABLED() (0) 
    213 #define STRATCON_NOIT_SHUTDOWN_PERMANENT(arg0, arg1, arg2, arg3) \ 
    214 do { \ 
    215         } while (0) 
     232#define STRATCON_NOIT_SHUTDOWN_PERMANENT(arg0, arg1, arg2, arg3) 
    216233#define STRATCON_NOIT_SHUTDOWN_PERMANENT_ENABLED() (0) 
    217 #define STRATCON_NOIT_STREAM_BODY(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \ 
    218 do { \ 
    219         } while (0) 
     234#define STRATCON_NOIT_STREAM_BODY(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) 
    220235#define STRATCON_NOIT_STREAM_BODY_ENABLED() (0) 
    221 #define STRATCON_NOIT_STREAM_CHECKPOINT(arg0, arg1, arg2, arg3, arg4, arg5) \ 
    222 do { \ 
    223         } while (0) 
     236#define STRATCON_NOIT_STREAM_CHECKPOINT(arg0, arg1, arg2, arg3, arg4, arg5) 
    224237#define STRATCON_NOIT_STREAM_CHECKPOINT_ENABLED() (0) 
    225 #define STRATCON_NOIT_STREAM_COUNT(arg0, arg1, arg2, arg3, arg4) \ 
    226 do { \ 
    227         } while (0) 
     238#define STRATCON_NOIT_STREAM_COUNT(arg0, arg1, arg2, arg3, arg4) 
    228239#define STRATCON_NOIT_STREAM_COUNT_ENABLED() (0) 
    229 #define STRATCON_NOIT_STREAM_HEADER(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \ 
    230 do { \ 
    231         } while (0) 
     240#define STRATCON_NOIT_STREAM_HEADER(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) 
    232241#define STRATCON_NOIT_STREAM_HEADER_ENABLED() (0) 
    233242 
    234 #endif /* !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED */ 
    235  
    236 #define NOIT_CHECK_STABILITY "___dtrace_stability$noit_check$v1$1_1_0_1_1_0_1_1_0_1_1_0_1_1_0" 
    237  
    238 #define NOIT_CHECK_TYPEDEFS "___dtrace_typedefs$noit_check$v2" 
    239  
    240 #if !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED 
     243#endif 
     244 
     245#if _DTRACE_VERSION 
    241246 
    242247#define NOIT_CHECK_DISPATCH(arg0, arg1, arg2, arg3) \ 
    243 do { \ 
    244         __asm__ volatile(".reference " NOIT_CHECK_TYPEDEFS); \ 
    245         __dtrace_probe$noit_check$dispatch$v1$63686172202a$63686172202a$63686172202a$63686172202a(arg0, arg1, arg2, arg3); \ 
    246         __asm__ volatile(".reference " NOIT_CHECK_STABILITY); \ 
    247 } while (0) 
     248        __dtrace_noit___check__dispatch(arg0, arg1, arg2, arg3) 
     249#ifndef __sparc 
    248250#define NOIT_CHECK_DISPATCH_ENABLED() \ 
    249         ({ int _r = __dtrace_isenabled$noit_check$dispatch$v1(); \ 
    250                 __asm__ volatile(""); \ 
    251                 _r; }) 
     251        __dtraceenabled_noit___check__dispatch() 
     252#else 
     253#define NOIT_CHECK_DISPATCH_ENABLED() \ 
     254        __dtraceenabled_noit___check__dispatch(0) 
     255#endif 
    252256#define NOIT_CHECK_METRIC(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \ 
    253 do { \ 
    254         __asm__ volatile(".reference " NOIT_CHECK_TYPEDEFS); \ 
    255         __dtrace_probe$noit_check$metric$v1$63686172202a$63686172202a$63686172202a$63686172202a$63686172202a$696e74$63686172202a(arg0, arg1, arg2, arg3, arg4, arg5, arg6); \ 
    256         __asm__ volatile(".reference " NOIT_CHECK_STABILITY); \ 
    257 } while (0) 
     257        __dtrace_noit___check__metric(arg0, arg1, arg2, arg3, arg4, arg5, arg6) 
     258#ifndef __sparc 
    258259#define NOIT_CHECK_METRIC_ENABLED() \ 
    259         ({ int _r = __dtrace_isenabled$noit_check$metric$v1(); \ 
    260                 __asm__ volatile(""); \ 
    261                 _r; }) 
     260        __dtraceenabled_noit___check__metric() 
     261#else 
     262#define NOIT_CHECK_METRIC_ENABLED() \ 
     263        __dtraceenabled_noit___check__metric(0) 
     264#endif 
    262265#define NOIT_CHECK_STATUS(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \ 
    263 do { \ 
    264         __asm__ volatile(".reference " NOIT_CHECK_TYPEDEFS); \ 
    265         __dtrace_probe$noit_check$status$v1$63686172202a$63686172202a$63686172202a$63686172202a$696e74$696e74$63686172202a(arg0, arg1, arg2, arg3, arg4, arg5, arg6); \ 
    266         __asm__ volatile(".reference " NOIT_CHECK_STABILITY); \ 
    267 } while (0) 
     266        __dtrace_noit___check__status(arg0, arg1, arg2, arg3, arg4, arg5, arg6) 
     267#ifndef __sparc 
    268268#define NOIT_CHECK_STATUS_ENABLED() \ 
    269         ({ int _r = __dtrace_isenabled$noit_check$status$v1(); \ 
    270                 __asm__ volatile(""); \ 
    271                 _r; }) 
    272  
    273  
    274 extern void __dtrace_probe$noit_check$dispatch$v1$63686172202a$63686172202a$63686172202a$63686172202a(const char *, const char *, const char *, const char *); 
    275 extern int __dtrace_isenabled$noit_check$dispatch$v1(void); 
    276 extern void __dtrace_probe$noit_check$metric$v1$63686172202a$63686172202a$63686172202a$63686172202a$63686172202a$696e74$63686172202a(const char *, const char *, const char *, const char *, const char *, int, const char *); 
    277 extern int __dtrace_isenabled$noit_check$metric$v1(void); 
    278 extern void __dtrace_probe$noit_check$status$v1$63686172202a$63686172202a$63686172202a$63686172202a$696e74$696e74$63686172202a(const char *, const char *, const char *, const char *, int, int, const char *); 
    279 extern int __dtrace_isenabled$noit_check$status$v1(void); 
    280  
    281 #else 
    282  
    283 #define NOIT_CHECK_DISPATCH(arg0, arg1, arg2, arg3) \ 
    284 do { \ 
    285         } while (0) 
     269        __dtraceenabled_noit___check__status() 
     270#else 
     271#define NOIT_CHECK_STATUS_ENABLED() \ 
     272        __dtraceenabled_noit___check__status(0) 
     273#endif 
     274 
     275 
     276extern void __dtrace_noit___check__dispatch(char *, char *, char *, char *); 
     277#ifndef __sparc 
     278extern int __dtraceenabled_noit___check__dispatch(void); 
     279#else 
     280extern int __dtraceenabled_noit___check__dispatch(long); 
     281#endif 
     282extern void __dtrace_noit___check__metric(char *, char *, char *, char *, char *, int, char *); 
     283#ifndef __sparc 
     284extern int __dtraceenabled_noit___check__metric(void); 
     285#else 
     286extern int __dtraceenabled_noit___check__metric(long); 
     287#endif 
     288extern void __dtrace_noit___check__status(char *, char *, char *, char *, int, int, char *); 
     289#ifndef __sparc 
     290extern int __dtraceenabled_noit___check__status(void); 
     291#else 
     292extern int __dtraceenabled_noit___check__status(long); 
     293#endif 
     294 
     295#else 
     296 
     297#define NOIT_CHECK_DISPATCH(arg0, arg1, arg2, arg3) 
    286298#define NOIT_CHECK_DISPATCH_ENABLED() (0) 
    287 #define NOIT_CHECK_METRIC(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \ 
    288 do { \ 
    289         } while (0) 
     299#define NOIT_CHECK_METRIC(arg0, arg1, arg2, arg3, arg4, arg5, arg6) 
    290300#define NOIT_CHECK_METRIC_ENABLED() (0) 
    291 #define NOIT_CHECK_STATUS(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \ 
    292 do { \ 
    293         } while (0) 
     301#define NOIT_CHECK_STATUS(arg0, arg1, arg2, arg3, arg4, arg5, arg6) 
    294302#define NOIT_CHECK_STATUS_ENABLED() (0) 
    295303 
    296 #endif /* !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED */ 
     304#endif 
    297305 
    298306