diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/sdt.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index d005d3c1..3275874d 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,7 @@ +2008-01-27 Stan Cox <scox@redhat.com> + + * sdt.h (struct _probe_): Make probe_name a STAP_PROBE_STRUCT_ARG. + 2009-01-26 Mark Wielaard <mjw@redhat.com> * sdt.h: DTRACE_PROBE5 is STAP_PROBE5, not 4, likewise for 6. diff --git a/runtime/sdt.h b/runtime/sdt.h index 88183461..2db2e3a0 100644 --- a/runtime/sdt.h +++ b/runtime/sdt.h @@ -22,13 +22,13 @@ struct _probe_ ## probe \ { \ int probe_type; \ - char *probe_name; \ + STAP_PROBE_STRUCT_ARG (probe_name); \ STAP_PROBE_STRUCT_ARG (probe_arg); \ }; \ -static char probe_name [strlen(#probe)+1] \ +static char probe ## _ ## 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}; + static volatile struct _probe_ ## probe _probe_ ## probe __attribute__ ((section (".probes"))) = {STAP_SENTINEL,(long)& probe ## _ ## probe_name[0],argc}; #define STAP_CONCAT(a,b) a ## b #define STAP_LABEL(p,n) \ |