summaryrefslogtreecommitdiffstats
path: root/runtime/sdt.h
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/sdt.h')
-rw-r--r--runtime/sdt.h112
1 files changed, 71 insertions, 41 deletions
diff --git a/runtime/sdt.h b/runtime/sdt.h
index 17c1be71..9fe7b176 100644
--- a/runtime/sdt.h
+++ b/runtime/sdt.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2008 Red Hat Inc.
+// Copyright (C) 2005-2009 Red Hat Inc.
// Copyright (C) 2006 Intel Corporation.
//
// This file is part of systemtap, and is free software. You can
@@ -16,14 +16,23 @@
long arg __attribute__ ((aligned(8)));
#endif
+#define STAP_SENTINEL 0x31425250
+
#define STAP_PROBE_STRUCT(probe,type,argc) \
struct _probe_ ## probe \
{ \
- char probe_name [strlen(#probe)+1]; \
- int probe_type; \
+ int probe_type; \
+ char *probe_name; \
STAP_PROBE_STRUCT_ARG (probe_arg); \
}; \
- static volatile struct _probe_ ## probe _probe_ ## probe __attribute__ ((section (".probes"))) = {#probe,type,argc};
+static char probe_name [strlen(#probe)+1] \
+ __attribute__ ((section (".probes"))) \
+ = #probe; \
+static volatile struct _probe_ ## probe _probe_ ## probe __attribute__ ((section (".probes"))) = {STAP_SENTINEL,&probe_name[0],argc};
+
+#define STAP_CONCAT(a,b) a ## b
+#define STAP_LABEL(p,n) \
+ STAP_CONCAT(_probe_ ## p ## _, n)
// The goto _probe_ prevents the label from "drifting"
#ifdef USE_STAP_PROBE
@@ -32,42 +41,40 @@ struct _probe_ ## probe \
_stap_probe_0 (_probe_ ## probe.probe_name);
#else
#define STAP_PROBE(provider,probe) \
-_probe_ ## probe: \
+STAP_LABEL(probe,__LINE__): \
asm volatile ("nop"); \
- STAP_PROBE_STRUCT(probe,1,(size_t)&& _probe_ ## probe) \
+ STAP_PROBE_STRUCT(probe,1,(size_t)&& STAP_LABEL(probe,__LINE__)) \
if (__builtin_expect(_probe_ ## probe.probe_type < 0, 0)) \
- goto _probe_ ## probe;
+ goto STAP_LABEL(probe,__LINE__);
#endif
-
#ifdef USE_STAP_PROBE
#define STAP_PROBE1(provider,probe,arg1) \
STAP_PROBE_STRUCT(probe,0,1) \
_stap_probe_1 (_probe_ ## probe.probe_name,(size_t)arg1);
#else
#define STAP_PROBE1(provider,probe,parm1) \
- {volatile typeof(parm1) arg1 = parm1; \
-_probe_ ## probe: \
+ {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \
+STAP_LABEL(probe,__LINE__): \
asm volatile ("nop" :: "r"(arg1)); \
- STAP_PROBE_STRUCT(probe,1,(size_t)&& _probe_ ## probe) \
+ STAP_PROBE_STRUCT(probe,1,(size_t)&& STAP_LABEL(probe,__LINE__)) \
if (__builtin_expect(_probe_ ## probe.probe_type < 0, 0)) \
- goto _probe_ ## probe;}
+ goto STAP_LABEL(probe,__LINE__);}
#endif
-
#ifdef USE_STAP_PROBE
#define STAP_PROBE2(provider,probe,arg1,arg2) \
STAP_PROBE_STRUCT(probe,0,2) \
_stap_probe_2 (_probe_ ## probe.probe_name,(size_t)arg1,(size_t)arg2);
#else
#define STAP_PROBE2(provider,probe,parm1,parm2) \
- {volatile typeof(parm1) arg1 = parm1; \
- volatile typeof(parm2) arg2 = parm2; \
-_probe_ ## probe: \
+ {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \
+ volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \
+STAP_LABEL(probe,__LINE__): \
asm volatile ("nop" :: "r"(arg1), "r"(arg2)); \
- STAP_PROBE_STRUCT(probe,1,(size_t)&& _probe_ ## probe)\
+ STAP_PROBE_STRUCT(probe,1,(size_t)&& STAP_LABEL(probe,__LINE__)) \
if (__builtin_expect(_probe_ ## probe.probe_type < 0, 0)) \
- goto _probe_ ## probe;}
+ goto STAP_LABEL(probe,__LINE__);}
#endif
#ifdef USE_STAP_PROBE
@@ -76,14 +83,14 @@ _probe_ ## probe: \
_stap_probe_3 (_probe_ ## probe.probe_name,(size_t)arg1,(size_t)arg2,(size_t)arg3);
#else
#define STAP_PROBE3(provider,probe,parm1,parm2,parm3) \
- {volatile typeof(parm1) arg1 = parm1; \
- volatile typeof(parm2) arg2 = parm2; \
- volatile typeof(parm3) arg3 = parm3; \
-_probe_ ## probe: \
+ {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \
+ volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \
+ volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \
+STAP_LABEL(probe,__LINE__): \
asm volatile ("nop" :: "r"(arg1), "r"(arg2), "r"(arg3)); \
- STAP_PROBE_STRUCT(probe,1,(size_t)&& _probe_ ## probe) \
+ STAP_PROBE_STRUCT(probe,1,(size_t)&& STAP_LABEL(probe,__LINE__)) \
if (__builtin_expect(_probe_ ## probe.probe_type < 0, 0)) \
- goto _probe_ ## probe;}
+ goto STAP_LABEL(probe,__LINE__);}
#endif
#ifdef USE_STAP_PROBE
@@ -92,15 +99,15 @@ _probe_ ## probe: \
_stap_probe_4 (_probe_ ## probe.probe_name,(size_t)arg1,(size_t)arg2,(size_t)arg3,(size_t)arg4);
#else
#define STAP_PROBE4(provider,probe,parm1,parm2,parm3,parm4) \
- {volatile typeof(parm1) arg1 = parm1; \
- volatile typeof(parm2) arg2 = parm2; \
- volatile typeof(parm3) arg3 = parm3; \
- volatile typeof(parm4) arg4 = parm4; \
-_probe_ ## probe: \
- asm volatile ("nop" "r"(arg1), "r"(arg2), "r"(arg3), "r"(arg4)); \
- STAP_PROBE_STRUCT(probe,1,(size_t)&& _probe_ ## probe) \
+ {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \
+ volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \
+ volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \
+ volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \
+STAP_LABEL(probe,__LINE__): \
+ asm volatile ("nop" :: "r"(arg1), "r"(arg2), "r"(arg3), "r"(arg4)); \
+ STAP_PROBE_STRUCT(probe,1,(size_t)&& STAP_LABEL(probe,__LINE__)) \
if (__builtin_expect(_probe_ ## probe.probe_type < 0, 0)) \
- goto _probe_ ## probe;}
+ goto STAP_LABEL(probe,__LINE__);}
#endif
#ifdef USE_STAP_PROBE
@@ -109,16 +116,35 @@ _probe_ ## probe: \
_stap_probe_5 (_probe_ ## probe.probe_name,(size_t)arg1,(size_t)arg2,(size_t)arg3,(size_t)arg4,(size_t)arg5);
#else
#define STAP_PROBE5(provider,probe,parm1,parm2,parm3,parm4,parm5) \
- {volatile typeof(parm1) arg1 = parm1; \
- volatile typeof(parm2) arg2 = parm2; \
- volatile typeof(parm3) arg3 = parm3; \
- volatile typeof(parm4) arg4 = parm4; \
- volatile typeof(parm5) arg5 = parm5; \
-_probe_ ## probe: \
- asm volatile ("nop" "r"(arg1), "r"(arg2), "r"(arg3), "r"(arg4), "r"(arg5)); \
- STAP_PROBE_STRUCT(probe,1,(size_t)&& _probe_ ## probe) \
+ {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \
+ volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \
+ volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \
+ volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \
+ volatile typeof((parm5)) arg5 __attribute__ ((unused)) = parm5; \
+STAP_LABEL(probe,__LINE__): \
+ asm volatile ("nop" :: "r"(arg1), "r"(arg2), "r"(arg3), "r"(arg4), "r"(arg5)); \
+ STAP_PROBE_STRUCT(probe,1,(size_t)&& STAP_LABEL(probe,__LINE__)) \
+ if (__builtin_expect(_probe_ ## probe.probe_type < 0, 0)) \
+ goto STAP_LABEL(probe,__LINE__);}
+#endif
+
+#ifdef USE_STAP_PROBE
+#define STAP_PROBE6(provider,probe,arg1,arg2,arg3,arg4,arg5,arg6) \
+ STAP_PROBE_STRUCT(probe,0,6) \
+ _stap_probe_6 (_probe_ ## probe.probe_name,(size_t)arg1,(size_t)arg2,(size_t)arg3,(size_t)arg4,(size_t)arg5,(size_t)arg6);
+#else
+#define STAP_PROBE6(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6) \
+ {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \
+ volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \
+ volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \
+ volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \
+ volatile typeof((parm5)) arg5 __attribute__ ((unused)) = parm5; \
+ volatile typeof((parm6)) arg6 __attribute__ ((unused)) = parm6; \
+STAP_LABEL(probe,__LINE__): \
+ asm volatile ("nop" :: "r"(arg1), "r"(arg2), "r"(arg3), "r"(arg4), "r"(arg5), "r"(arg6)); \
+ STAP_PROBE_STRUCT(probe,1,(size_t)&& STAP_LABEL(probe,__LINE__)) \
if (__builtin_expect(_probe_ ## probe.probe_type < 0, 0)) \
- goto _probe_ ## probe;}
+ goto STAP_LABEL(probe,__LINE__);}
#endif
#define DTRACE_PROBE(provider,probe) \
@@ -131,3 +157,7 @@ STAP_PROBE2(provider,probe,parm1,parm2)
STAP_PROBE3(provider,probe,parm1,parm2,parm3)
#define DTRACE_PROBE4(provider,probe,parm1,parm2,parm3,parm4) \
STAP_PROBE4(provider,probe,parm1,parm2,parm3,parm4)
+#define DTRACE_PROBE5(provider,probe,parm1,parm2,parm3,parm4,parm5) \
+STAP_PROBE4(provider,probe,parm1,parm2,parm3,parm4,parm5)
+#define DTRACE_PROBE6(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6) \
+STAP_PROBE4(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6)