#include <errno.h>
#include <stdint.h>
#include <stddef.h>
+#include <stdio.h>
#include <urcu/arch.h>
#include <urcu-bp.h>
struct cds_hlist_node hlist;
struct tracepoint_probe *probes;
int refcount; /* Number of times armed. 0 if disarmed. */
+ const char *signature;
char name[0];
};
static void *
tracepoint_entry_add_probe(struct tracepoint_entry *entry,
- void *probe, void *data)
+ void (*probe)(void), void *data)
{
int nr_probes = 0;
struct tracepoint_probe *old, *new;
}
static void *
-tracepoint_entry_remove_probe(struct tracepoint_entry *entry, void *probe,
- void *data)
+tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
+ void (*probe)(void), void *data)
{
int nr_probes = 0, nr_del = 0, i;
struct tracepoint_probe *old, *new;
* Add the tracepoint to the tracepoint hash table. Must be called with
* tracepoint mutex held.
*/
-static struct tracepoint_entry *add_tracepoint(const char *name)
+static struct tracepoint_entry *add_tracepoint(const char *name,
+ const char *signature)
{
struct cds_hlist_head *head;
struct cds_hlist_node *node;
e->name[name_len] = '\0';
e->probes = NULL;
e->refcount = 0;
+ e->signature = signature;
cds_hlist_add_head(&e->hlist, head);
return e;
}
struct tracepoint *elem, int active)
{
WARN_ON(strncmp((*entry)->name, elem->name, LTTNG_UST_SYM_NAME_LEN - 1) != 0);
+ /*
+ * Check that signatures match before connecting a probe to a
+ * tracepoint. Warn the user if they don't.
+ */
+ if (strcmp(elem->signature, (*entry)->signature) != 0) {
+ static int warned = 0;
+
+ /* Only print once, don't flood console. */
+ if (!warned) {
+ WARN("Tracepoint signature mismatch, not enabling one or more tracepoints. Ensure that the tracepoint probes prototypes match the application.");
+ WARN("Tracepoint \"%s\" signatures: call: \"%s\" vs probe: \"%s\".",
+ elem->name, elem->signature, (*entry)->signature);
+ warned = 1;
+ }
+ /* Don't accept connecting non-matching signatures. */
+ return;
+ }
/*
* rcu_assign_pointer has a cmm_smp_wmb() which makes sure that the new
}
}
+/**
+ * tracepoint_update_callsite_range - Update a callsite range
+ * @begin: beginning of the range
+ * @end: end of the range
+ *
+ * Updates the range of tracepoint call sites.
+ */
+static
+void tracepoint_enable_callsite_range(struct tracepoint_callsite * const *begin,
+ struct tracepoint_callsite * const *end)
+{
+ struct tracepoint_callsite * const *iter;
+ int ret;
+
+ for (iter = begin; iter < end; iter++) {
+ if (!*iter)
+ continue; /* skip dummy */
+ ret = lttng_callsite_add(*iter);
+ assert(!ret);
+ }
+}
+
+static
+void tracepoint_disable_callsite_range(struct tracepoint_callsite * const *begin,
+ struct tracepoint_callsite * const *end)
+{
+ struct tracepoint_callsite * const *iter;
+ int ret;
+
+ for (iter = begin; iter < end; iter++) {
+ if (!*iter)
+ continue; /* skip dummy */
+ ret = lttng_callsite_remove(*iter);
+ assert(!ret);
+ }
+}
+
/*
* Update probes, removing the faulty probes.
*/
}
static struct tracepoint_probe *
-tracepoint_add_probe(const char *name, void *probe, void *data)
+tracepoint_add_probe(const char *name, void (*probe)(void), void *data,
+ const char *signature)
{
struct tracepoint_entry *entry;
struct tracepoint_probe *old;
entry = get_tracepoint(name);
if (!entry) {
- entry = add_tracepoint(name);
+ entry = add_tracepoint(name, signature);
if (IS_ERR(entry))
return (struct tracepoint_probe *)entry;
}
* The probe address must at least be aligned on the architecture pointer size.
* Called with the tracepoint mutex held.
*/
-int __tracepoint_probe_register(const char *name, void *probe, void *data)
+int __tracepoint_probe_register(const char *name, void (*probe)(void),
+ void *data, const char *signature)
{
void *old;
int ret = 0;
DBG("Registering probe to tracepoint %s", name);
pthread_mutex_lock(&tracepoint_mutex);
- old = tracepoint_add_probe(name, probe, data);
+ old = tracepoint_add_probe(name, probe, data, signature);
if (IS_ERR(old)) {
ret = PTR_ERR(old);
goto end;
return ret;
}
-static void *tracepoint_remove_probe(const char *name, void *probe, void *data)
+static void *tracepoint_remove_probe(const char *name, void (*probe)(void),
+ void *data)
{
struct tracepoint_entry *entry;
void *old;
* @probe: probe function pointer
* @probe: probe data pointer
*/
-int __tracepoint_probe_unregister(const char *name, void *probe, void *data)
+int __tracepoint_probe_unregister(const char *name, void (*probe)(void),
+ void *data)
{
void *old;
int ret = 0;
*
* caller must call tracepoint_probe_update_all()
*/
-int tracepoint_probe_register_noupdate(const char *name, void *probe,
- void *data)
+int tracepoint_probe_register_noupdate(const char *name, void (*probe)(void),
+ void *data, const char *signature)
{
void *old;
int ret = 0;
pthread_mutex_lock(&tracepoint_mutex);
- old = tracepoint_add_probe(name, probe, data);
+ old = tracepoint_add_probe(name, probe, data, signature);
if (IS_ERR(old)) {
ret = PTR_ERR(old);
goto end;
* caller must call tracepoint_probe_update_all()
* Called with the tracepoint mutex held.
*/
-int tracepoint_probe_unregister_noupdate(const char *name, void *probe,
+int tracepoint_probe_unregister_noupdate(const char *name, void (*probe)(void),
void *data)
{
void *old;
return 0;
}
+int tracepoint_register_lib_callsite(struct tracepoint_callsite * const *tp_start,
+ int tp_count)
+{
+ int real_count = 0; /* without dummy */
+
+ init_tracepoint();
+
+ tracepoint_enable_callsite_range(tp_start, tp_start + tp_count);
+
+ if (ust_debug()) {
+ int i;
+
+ for (i = 0; i < tp_count; i++) {
+ if (!tp_start[i]) /* Check for dummy */
+ continue;
+ DBG("registered callsite for tracepoint \"%s\" at %s@%p:%s:%u",
+ tp_start[i]->name,
+ tp_start[i]->func,
+ tp_start[i]->ip,
+ tp_start[i]->file,
+ tp_start[i]->lineno);
+ real_count++;
+ }
+ }
+ DBG("just registered a tracepoint callsite section from %p and having %d call sites",
+ tp_start, real_count);
+ return 0;
+}
+
+int tracepoint_unregister_lib_callsite(struct tracepoint_callsite * const *tp_start,
+ int tp_count)
+{
+ tracepoint_disable_callsite_range(tp_start, tp_start + tp_count);
+ DBG("just unregistered a tracepoints callsite section from %p",
+ tp_start);
+ return 0;
+}
+
void init_tracepoint(void)
{
if (uatomic_xchg(&initialized, 1) == 1)
projects / lttng-ust.git / blobdiff