perf probe: Support event name for --add option

[linux-2.6.git] / tools / perf / util / probe-finder.h

diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
index 6a7cb0c..5e4050c 100644 (file)
--- a/tools/perf/util/probe-finder.h
+++ b/tools/perf/util/probe-finder.h
@@ -1,16 +1,6 @@
 #ifndef _PROBE_FINDER_H
 #define _PROBE_FINDER_H
 
-#define _stringify(n)  #n
-#define stringify(n)   _stringify(n)
-
-#define ERR_IF(cnd)    \
-       do { if (cnd) { \
-               fprintf(stderr, "Error (" __FILE__ ":" stringify(__LINE__) \
-                       "): " stringify(cnd) "\n");                     \
-               exit(1);                                                \
-       } } while (0)
-
 #define MAX_PATH_LEN 256
 #define MAX_PROBE_BUFFER 1024
 #define MAX_PROBES 128
@@ -22,6 +12,9 @@ static inline int is_c_varname(const char *name)
 }
 
 struct probe_point {
+       char    *event;         /* Event name */
+       char    *group;         /* Event group */
+
        /* Inputs */
        char    *file;          /* File name */
        int     line;           /* Line number */
@@ -32,6 +25,8 @@ struct probe_point {
        int     nr_args;        /* Number of arguments */
        char    **args;         /* Arguments */
 
+       int     retprobe;       /* Return probe */
+
        /* Output */
        int     found;          /* Number of found probe points */
        char    *probes[MAX_PROBES];    /* Output buffers (will be allocated)*/
@@ -49,7 +44,9 @@ struct probe_finder {
        /* For function searching */
        Dwarf_Addr      addr;           /* Address */
        Dwarf_Unsigned  fno;            /* File number */
+       Dwarf_Unsigned  lno;            /* Line number */
        Dwarf_Off       inl_offs;       /* Inline offset */
+       Dwarf_Die       cu_die;         /* Current CU */
 
        /* For variable searching */
        Dwarf_Addr      cu_base;        /* Current CU base address */