#include <urcu/hlist.h>
#include <urcu/uatomic.h>
#include <urcu/compiler.h>
+#include <urcu/system.h>
#include <lttng/tracepoint.h>
#include <lttng/ust-abi.h> /* for LTTNG_UST_SYM_NAME_LEN */
/* Set to 1 to enable tracepoint debug output */
static const int tracepoint_debug;
static int initialized;
-static void (*new_tracepoint_cb)(struct tracepoint *);
+static void (*new_tracepoint_cb)(struct lttng_ust_tracepoint *);
/*
* tracepoint_mutex nests inside UST mutex.
*/
struct tracepoint_entry {
struct cds_hlist_node hlist;
- struct tracepoint_probe *probes;
+ struct lttng_ust_tracepoint_probe *probes;
int refcount; /* Number of times armed. 0 if disarmed. */
int callsite_refcount; /* how many libs use this tracepoint */
const char *signature;
/* Field below only used for call_rcu scheme */
/* struct rcu_head head; */
} u;
- struct tracepoint_probe probes[0];
+ struct lttng_ust_tracepoint_probe probes[0];
};
/*
struct callsite_entry {
struct cds_hlist_node hlist; /* hash table node */
struct cds_list_head node; /* lib list of callsites node */
- struct tracepoint *tp;
+ struct lttng_ust_tracepoint *tp;
};
/* coverity[+alloc] */
static void *allocate_probes(int count)
{
- struct tp_probes *p = zmalloc(count * sizeof(struct tracepoint_probe)
- + sizeof(struct tp_probes));
+ struct tp_probes *p =
+ zmalloc(count * sizeof(struct lttng_ust_tracepoint_probe)
+ + sizeof(struct tp_probes));
return p == NULL ? NULL : p->probes;
}
void (*probe)(void), void *data)
{
int nr_probes = 0;
- struct tracepoint_probe *old, *new;
+ struct lttng_ust_tracepoint_probe *old, *new;
if (!probe) {
WARN_ON(1);
if (new == NULL)
return ERR_PTR(-ENOMEM);
if (old)
- memcpy(new, old, nr_probes * sizeof(struct tracepoint_probe));
+ memcpy(new, old,
+ nr_probes * sizeof(struct lttng_ust_tracepoint_probe));
new[nr_probes].func = probe;
new[nr_probes].data = data;
new[nr_probes + 1].func = NULL;
void (*probe)(void), void *data)
{
int nr_probes = 0, nr_del = 0, i;
- struct tracepoint_probe *old, *new;
+ struct lttng_ust_tracepoint_probe *old, *new;
old = entry->probes;
* Sets the probe callback corresponding to one tracepoint.
*/
static void set_tracepoint(struct tracepoint_entry **entry,
- struct tracepoint *elem, int active)
+ struct lttng_ust_tracepoint *elem, int active)
{
WARN_ON(strncmp((*entry)->name, elem->name, LTTNG_UST_SYM_NAME_LEN - 1) != 0);
/*
* is used.
*/
rcu_assign_pointer(elem->probes, (*entry)->probes);
- elem->state = active;
+ CMM_STORE_SHARED(elem->state, active);
}
/*
* function insures that the original callback is not used anymore. This insured
* by preempt_disable around the call site.
*/
-static void disable_tracepoint(struct tracepoint *elem)
+static void disable_tracepoint(struct lttng_ust_tracepoint *elem)
{
- elem->state = 0;
+ CMM_STORE_SHARED(elem->state, 0);
rcu_assign_pointer(elem->probes, NULL);
}
* Add the callsite to the callsite hash table. Must be called with
* tracepoint mutex held.
*/
-static void add_callsite(struct tracepoint_lib * lib, struct tracepoint *tp)
+static void add_callsite(struct tracepoint_lib * lib, struct lttng_ust_tracepoint *tp)
{
struct cds_hlist_head *head;
struct callsite_entry *e;
hash = jhash(name, name_len, 0);
head = &callsite_table[hash & (CALLSITE_TABLE_SIZE - 1)];
e = zmalloc(sizeof(struct callsite_entry));
- assert(e);
+ if (!e) {
+ PERROR("Unable to add callsite for tracepoint \"%s\"", name);
+ return;
+ }
cds_hlist_add_head(&e->hlist, head);
e->tp = tp;
cds_list_add(&e->node, &lib->callsites);
hash = jhash(name, name_len, 0);
head = &callsite_table[hash & (CALLSITE_TABLE_SIZE - 1)];
cds_hlist_for_each_entry(e, node, head, hlist) {
- struct tracepoint *tp = e->tp;
+ struct lttng_ust_tracepoint *tp = e->tp;
if (strncmp(name, tp->name, LTTNG_UST_SYM_NAME_LEN - 1))
continue;
* Updates the probe callback corresponding to a range of tracepoints.
*/
static
-void tracepoint_update_probe_range(struct tracepoint * const *begin,
- struct tracepoint * const *end)
+void tracepoint_update_probe_range(struct lttng_ust_tracepoint * const *begin,
+ struct lttng_ust_tracepoint * const *end)
{
- struct tracepoint * const *iter;
+ struct lttng_ust_tracepoint * const *iter;
struct tracepoint_entry *mark_entry;
for (iter = begin; iter < end; iter++) {
static void lib_register_callsites(struct tracepoint_lib *lib)
{
- struct tracepoint * const *begin;
- struct tracepoint * const *end;
- struct tracepoint * const *iter;
+ struct lttng_ust_tracepoint * const *begin;
+ struct lttng_ust_tracepoint * const *end;
+ struct lttng_ust_tracepoint * const *iter;
begin = lib->tracepoints_start;
end = lib->tracepoints_start + lib->tracepoints_count;
lib_update_tracepoints(lib);
}
-static struct tracepoint_probe *
+static struct lttng_ust_tracepoint_probe *
tracepoint_add_probe(const char *name, void (*probe)(void), void *data,
const char *signature)
{
struct tracepoint_entry *entry;
- struct tracepoint_probe *old;
+ struct lttng_ust_tracepoint_probe *old;
entry = get_tracepoint(name);
if (!entry) {
entry = add_tracepoint(name, signature);
if (IS_ERR(entry))
- return (struct tracepoint_probe *)entry;
+ return (struct lttng_ust_tracepoint_probe *)entry;
}
old = tracepoint_entry_add_probe(entry, probe, data);
if (IS_ERR(old) && !entry->refcount)
pthread_mutex_unlock(&tracepoint_mutex);
}
-void tracepoint_set_new_tracepoint_cb(void (*cb)(struct tracepoint *))
+void tracepoint_set_new_tracepoint_cb(void (*cb)(struct lttng_ust_tracepoint *))
{
new_tracepoint_cb = cb;
}
-static void new_tracepoints(struct tracepoint * const *start, struct tracepoint * const *end)
+static void new_tracepoints(struct lttng_ust_tracepoint * const *start,
+ struct lttng_ust_tracepoint * const *end)
{
if (new_tracepoint_cb) {
- struct tracepoint * const *t;
+ struct lttng_ust_tracepoint * const *t;
for (t = start; t < end; t++) {
if (*t)
}
}
-int tracepoint_register_lib(struct tracepoint * const *tracepoints_start,
+int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start,
int tracepoints_count)
{
struct tracepoint_lib *pl, *iter;
init_tracepoint();
pl = (struct tracepoint_lib *) zmalloc(sizeof(struct tracepoint_lib));
-
+ if (!pl) {
+ PERROR("Unable to register tracepoint lib");
+ return -1;
+ }
pl->tracepoints_start = tracepoints_start;
pl->tracepoints_count = tracepoints_count;
CDS_INIT_LIST_HEAD(&pl->callsites);
return 0;
}
-int tracepoint_unregister_lib(struct tracepoint * const *tracepoints_start)
+int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start)
{
struct tracepoint_lib *lib;