*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* Ported to userspace by Pierre-Marc Fournier.
*/
+#define _LGPL_SOURCE
#include <errno.h>
#include <ust/tracepoint.h>
#include <ust/core.h>
#include <ust/kcompat/kcompat.h>
-#include "usterr.h"
-
-#define _LGPL_SOURCE
#include <urcu-bp.h>
#include <urcu/hlist.h>
+#include "usterr_signal_safe.h"
+
//extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden")));
//extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden")));
*/
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];
};
//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)
{
- 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;
}
void *probe, void *data)
{
int nr_probes = 0;
- struct probe *old, *new;
+ struct tracepoint_probe *old, *new;
WARN_ON(!probe);
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;
void *data)
{
int nr_probes = 0, nr_del = 0, i;
- struct probe *old, *new;
+ struct tracepoint_probe *old, *new;
old = entry->probes;
* is used.
*/
rcu_assign_pointer(elem->probes, (*entry)->probes);
- elem->state__imv = active;
+ elem->state = active;
}
/*
*/
static void disable_tracepoint(struct tracepoint *elem)
{
- elem->state__imv = 0;
+ elem->state = 0;
rcu_assign_pointer(elem->probes, NULL);
}
//ust// __stop___tracepoints);
/* tracepoints in modules. */
lib_update_tracepoints();
- /* Update immediate values */
- core_imv_update();
-//ust// module_imv_update();
}
-static struct probe *
+static struct tracepoint_probe *
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))
- return (struct probe *)entry;
+ return (struct tracepoint_probe *)entry;
}
old = tracepoint_entry_add_probe(entry, probe, data);
if (IS_ERR(old) && !entry->refcount)