Tracepoints: namespace cleanups

All internal symbols, no API change. Enforce "tracepoint_" or "tp_"
prefixes to local symbols, as well as rename struct probes to struct
tracepoint_probes.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
index ec1a4fce76bf55ec6cb1085688dcd7a0e4a1622c..43c1b46b4a6df4ce0047915af7133e1a44989ac8 100644 (file)
--- a/include/ust/tracepoint.h
+++ b/include/ust/tracepoint.h
@@ -31,7 +31,7 @@
 
 struct tracepoint;
 
 
 struct tracepoint;
 

-struct probe {
+struct tracepoint_probe {

        void *func;
        void *data;
 };
        void *func;
        void *data;
 };


@@ -39,11 +39,10 @@ struct probe {
 struct tracepoint {
        const char *name;               /* Tracepoint name */
        char state;                     /* State. */
 struct tracepoint {
        const char *name;               /* Tracepoint name */
        char state;                     /* State. */

-       struct probe *probes;
+       struct tracepoint_probe *probes;

 };
 
 };
 

-#define PARAMS(args...) args
-
+#define TP_PARAMS(args...)     args

 #define TP_PROTO(args...)      args
 #define TP_ARGS(args...)       args
 
 #define TP_PROTO(args...)      args
 #define TP_ARGS(args...)       args
 


@@ -68,18 +67,18 @@ struct tracepoint {
  */
 #define __DO_TRACE(tp, proto, args)                                    \
        do {                                                            \
  */
 #define __DO_TRACE(tp, proto, args)                                    \
        do {                                                            \

-               struct probe *it_probe_ptr;                             \
-               void *it_func;                                          \
-               void *__data;                                           \
+               struct tracepoint_probe *__tp_it_probe_ptr;             \
+               void *__tp_it_func;                                     \
+               void *__tp_cb_data;                                     \

                                                                        \
                rcu_read_lock();                                        \
                                                                        \
                rcu_read_lock();                                        \

-               it_probe_ptr = rcu_dereference((tp)->probes);           \
-               if (it_probe_ptr) {                                     \
+               __tp_it_probe_ptr = rcu_dereference((tp)->probes);      \
+               if (__tp_it_probe_ptr) {                                \

                        do {                                            \
                        do {                                            \

-                               it_func = (it_probe_ptr)->func;         \
-                               __data = (it_probe_ptr)->data;          \
-                               ((void(*)(proto))(it_func))(args);      \
-                       } while ((++it_probe_ptr)->func);               \
+                               __tp_it_func = __tp_it_probe_ptr->func; \
+                               __tp_cb_data = __tp_it_probe_ptr->data; \
+                               ((void(*)(proto))__tp_it_func)(args);   \
+                       } while ((++__tp_it_probe_ptr)->func);          \

                }                                                       \
                rcu_read_unlock();                                      \
        } while (0)
                }                                                       \
                rcu_read_unlock();                                      \
        } while (0)


@@ -166,18 +165,18 @@ static inline void tracepoint_update_probe_range(struct tracepoint *begin,
  * "(void *data, void)". The second prototype is invalid.
  *
  * DECLARE_TRACE_NOARGS() passes "void" as the tracepoint prototype
  * "(void *data, void)". The second prototype is invalid.
  *
  * DECLARE_TRACE_NOARGS() passes "void" as the tracepoint prototype

- * and "void *__data" as the callback prototype.
+ * and "void *__tp_cb_data" as the callback prototype.

  *
  * DECLARE_TRACE() passes "proto" as the tracepoint protoype and
  *
  * DECLARE_TRACE() passes "proto" as the tracepoint protoype and

- * "void *__data, proto" as the callback prototype.
+ * "void *__tp_cb_data, proto" as the callback prototype.

  */
 #define DECLARE_TRACE_NOARGS(name)                                     \
  */
 #define DECLARE_TRACE_NOARGS(name)                                     \

-               __DECLARE_TRACE(name, void, , void *__data, __data)
+               __DECLARE_TRACE(name, void, , void *__tp_cb_data, __tp_cb_data)

 
 #define DECLARE_TRACE(name, proto, args)                               \
 
 #define DECLARE_TRACE(name, proto, args)                               \

-               __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),      \
-                               PARAMS(void *__data, proto),            \
-                               PARAMS(__data, args))
+               __DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args),\
+                               TP_PARAMS(void *__tp_cb_data, proto),   \
+                               TP_PARAMS(__tp_cb_data, args))

 
 /*
  * Connect a probe to a tracepoint.
 
 /*
  * Connect a probe to a tracepoint.


@@ -407,15 +406,15 @@ extern int trace_event_unregister_lib(struct trace_event * const *start_trace_ev
 
 #define DECLARE_TRACE_EVENT_CLASS(name, proto, args, tstruct, assign, print)
 #define DEFINE_TRACE_EVENT(template, name, proto, args)                \
 
 #define DECLARE_TRACE_EVENT_CLASS(name, proto, args, tstruct, assign, print)
 #define DEFINE_TRACE_EVENT(template, name, proto, args)                \

-       DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+       DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args))

 #define DEFINE_TRACE_EVENT_PRINT(template, name, proto, args, print)   \
 #define DEFINE_TRACE_EVENT_PRINT(template, name, proto, args, print)   \

-       DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+       DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args))

 
 #define TRACE_EVENT(name, proto, args, struct, assign, print)  \
 
 #define TRACE_EVENT(name, proto, args, struct, assign, print)  \

-       DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+       DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args))

 #define TRACE_EVENT_FN(name, proto, args, struct,              \
                assign, print, reg, unreg)                      \
 #define TRACE_EVENT_FN(name, proto, args, struct,              \
                assign, print, reg, unreg)                      \

-       DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+       DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args))

 
 #endif /* ifdef TRACE_EVENT (see note above) */
 
 
 #endif /* ifdef TRACE_EVENT (see note above) */
 

diff --git a/include/ust/ust_trace.h b/include/ust/ust_trace.h
index 21c941a641cb02426ef6616c6bf7135902aaa562..d70ad17833b567a4124c2e11bf78b9e3aa9c0dc3 100644 (file)
--- a/include/ust/ust_trace.h
+++ b/include/ust/ust_trace.h
@@ -32,12 +32,12 @@
 #undef TRACE_EVENT
 #define TRACE_EVENT(name, proto, args, tstruct, assign, print)         \
        DECLARE_TRACE_EVENT_CLASS(name,                                 \
 #undef TRACE_EVENT
 #define TRACE_EVENT(name, proto, args, tstruct, assign, print)         \
        DECLARE_TRACE_EVENT_CLASS(name,                                 \

-                                 PARAMS(proto),                        \
-                                 PARAMS(args),                         \
-                                 PARAMS(tstruct),                      \
-                                 PARAMS(assign),                       \
-                                 PARAMS(print));                       \
-       DEFINE_TRACE_EVENT(name, name, PARAMS(proto), PARAMS(args));
+                                 TP_PARAMS(proto),                     \
+                                 TP_PARAMS(args),                      \
+                                 TP_PARAMS(tstruct),                   \
+                                 TP_PARAMS(assign),                    \
+                                 TP_PARAMS(print));                    \
+       DEFINE_TRACE_EVENT(name, name, TP_PARAMS(proto), TP_PARAMS(args));

 
 #undef __field
 #define __field(type, item)            type    item;
 
 #undef __field
 #define __field(type, item)            type    item;

diff --git a/libust/tracepoint.c b/libust/tracepoint.c
index 87e53cc920664fffff09e79402239ed89050f11d..1c4669b535890a444bacbd0805a509fb05c5f38f 100644 (file)
--- a/libust/tracepoint.c
+++ b/libust/tracepoint.c
@@ -60,7 +60,7 @@ static struct cds_hlist_head tracepoint_table[TRACEPOINT_TABLE_SIZE];
  */
 struct tracepoint_entry {
        struct cds_hlist_node hlist;
  */
 struct tracepoint_entry {
        struct cds_hlist_node hlist;

-       struct probe *probes;
+       struct tracepoint_probe *probes;

        int refcount;   /* Number of times armed. 0 if disarmed. */
        char name[0];
 };
        int refcount;   /* Number of times armed. 0 if disarmed. */
        char name[0];
 };


@@ -70,12 +70,12 @@ struct tp_probes {
 //ust//                struct rcu_head rcu;
                struct cds_list_head list;
        } u;
 //ust//                struct rcu_head rcu;
                struct cds_list_head list;
        } u;

-       struct probe probes[0];
+       struct tracepoint_probe probes[0];

 };
 
 static inline void *allocate_probes(int count)
 {
 };
 
 static inline void *allocate_probes(int count)
 {

-       struct tp_probes *p  = zmalloc(count * sizeof(struct probe)
+       struct tp_probes *p  = zmalloc(count * sizeof(struct tracepoint_probe)

                        + sizeof(struct tp_probes));
        return p == NULL ? NULL : p->probes;
 }
                        + sizeof(struct tp_probes));
        return p == NULL ? NULL : p->probes;
 }


@@ -112,7 +112,7 @@ tracepoint_entry_add_probe(struct tracepoint_entry *entry,
                           void *probe, void *data)
 {
        int nr_probes = 0;
                           void *probe, void *data)
 {
        int nr_probes = 0;

-       struct probe *old, *new;
+       struct tracepoint_probe *old, *new;

 
        WARN_ON(!probe);
 
 
        WARN_ON(!probe);
 


@@ -130,7 +130,7 @@ tracepoint_entry_add_probe(struct tracepoint_entry *entry,
        if (new == NULL)
                return ERR_PTR(-ENOMEM);
        if (old)
        if (new == NULL)
                return ERR_PTR(-ENOMEM);
        if (old)

-               memcpy(new, old, nr_probes * sizeof(struct probe));
+               memcpy(new, old, nr_probes * sizeof(struct tracepoint_probe));

        new[nr_probes].func = probe;
        new[nr_probes].data = data;
        new[nr_probes + 1].func = NULL;
        new[nr_probes].func = probe;
        new[nr_probes].data = data;
        new[nr_probes + 1].func = NULL;


@@ -145,7 +145,7 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry, void *probe,
                              void *data)
 {
        int nr_probes = 0, nr_del = 0, i;
                              void *data)
 {
        int nr_probes = 0, nr_del = 0, i;

-       struct probe *old, *new;
+       struct tracepoint_probe *old, *new;

 
        old = entry->probes;
 
 
        old = entry->probes;
 


@@ -335,17 +335,17 @@ static void tracepoint_update_probes(void)
        lib_update_tracepoints();
 }
 
        lib_update_tracepoints();
 }
 

-static struct probe *
+static struct tracepoint_probe *

 tracepoint_add_probe(const char *name, void *probe, void *data)
 {
        struct tracepoint_entry *entry;
 tracepoint_add_probe(const char *name, void *probe, void *data)
 {
        struct tracepoint_entry *entry;

-       struct probe *old;
+       struct tracepoint_probe *old;

 
        entry = get_tracepoint(name);
        if (!entry) {
                entry = add_tracepoint(name);
                if (IS_ERR(entry))
 
        entry = get_tracepoint(name);
        if (!entry) {
                entry = add_tracepoint(name);
                if (IS_ERR(entry))

-                       return (struct probe *)entry;
+                       return (struct tracepoint_probe *)entry;

        }
        old = tracepoint_entry_add_probe(entry, probe, data);
        if (IS_ERR(old) && !entry->refcount)
        }
        old = tracepoint_entry_add_probe(entry, probe, data);
        if (IS_ERR(old) && !entry->refcount)