*/
struct tracepoint_entry {
struct hlist_node hlist;
- void **funcs;
+ struct probe *probes;
int refcount; /* Number of times armed. 0 if disarmed. */
char name[0];
};
//ust// struct rcu_head rcu;
struct list_head list;
} u;
- void *probes[0];
+ struct probe probes[0];
};
static inline void *allocate_probes(int count)
{
- struct tp_probes *p = malloc(count * sizeof(void *)
+ struct tp_probes *p = zmalloc(count * sizeof(struct probe)
+ sizeof(struct tp_probes));
return p == NULL ? NULL : p->probes;
}
static inline void release_probes(void *old)
{
if (old) {
- struct tp_probes *tp_probes = container_of(old,
+ struct tp_probes *tp_probes = _ust_container_of(old,
struct tp_probes, probes[0]);
//ust// call_rcu_sched(&tp_probes->u.rcu, rcu_free_old_probes);
synchronize_rcu();
{
int i;
- if (!tracepoint_debug || !entry->funcs)
+ if (!tracepoint_debug || !entry->probes)
return;
- for (i = 0; entry->funcs[i]; i++)
- DBG("Probe %d : %p", i, entry->funcs[i]);
+ for (i = 0; entry->probes[i].func; i++)
+ DBG("Probe %d : %p", i, entry->probes[i].func);
}
static void *
-tracepoint_entry_add_probe(struct tracepoint_entry *entry, void *probe)
+tracepoint_entry_add_probe(struct tracepoint_entry *entry,
+ void *probe, void *data)
{
int nr_probes = 0;
- void **old, **new;
+ struct probe *old, *new;
WARN_ON(!probe);
debug_print_probes(entry);
- old = entry->funcs;
+ old = entry->probes;
if (old) {
/* (N -> N+1), (N != 0, 1) probes */
- for (nr_probes = 0; old[nr_probes]; nr_probes++)
- if (old[nr_probes] == probe)
+ for (nr_probes = 0; old[nr_probes].func; nr_probes++)
+ if (old[nr_probes].func == probe &&
+ old[nr_probes].data == data)
return ERR_PTR(-EEXIST);
}
/* + 2 : one for new probe, one for NULL func */
if (new == NULL)
return ERR_PTR(-ENOMEM);
if (old)
- memcpy(new, old, nr_probes * sizeof(void *));
- new[nr_probes] = probe;
- new[nr_probes + 1] = NULL;
+ memcpy(new, old, nr_probes * sizeof(struct probe));
+ new[nr_probes].func = probe;
+ new[nr_probes].data = data;
+ new[nr_probes + 1].func = NULL;
entry->refcount = nr_probes + 1;
- entry->funcs = new;
+ entry->probes = new;
debug_print_probes(entry);
return old;
}
static void *
-tracepoint_entry_remove_probe(struct tracepoint_entry *entry, void *probe)
+tracepoint_entry_remove_probe(struct tracepoint_entry *entry, void *probe,
+ void *data)
{
int nr_probes = 0, nr_del = 0, i;
- void **old, **new;
+ struct probe *old, *new;
- old = entry->funcs;
+ old = entry->probes;
if (!old)
return ERR_PTR(-ENOENT);
debug_print_probes(entry);
/* (N -> M), (N > 1, M >= 0) probes */
- for (nr_probes = 0; old[nr_probes]; nr_probes++) {
- if ((!probe || old[nr_probes] == probe))
+ for (nr_probes = 0; old[nr_probes].func; nr_probes++) {
+ if (!probe ||
+ (old[nr_probes].func == probe &&
+ old[nr_probes].data == data))
nr_del++;
}
if (nr_probes - nr_del == 0) {
/* N -> 0, (N > 1) */
- entry->funcs = NULL;
+ entry->probes = NULL;
entry->refcount = 0;
debug_print_probes(entry);
return old;
new = allocate_probes(nr_probes - nr_del + 1);
if (new == NULL)
return ERR_PTR(-ENOMEM);
- for (i = 0; old[i]; i++)
- if ((probe && old[i] != probe))
+ for (i = 0; old[i].func; i++)
+ if (probe &&
+ (old[i].func != probe || old[i].data != data))
new[j++] = old[i];
- new[nr_probes - nr_del] = NULL;
+ new[nr_probes - nr_del].func = NULL;
entry->refcount = nr_probes - nr_del;
- entry->funcs = new;
+ entry->probes = new;
}
debug_print_probes(entry);
return old;
}
}
/*
- * Using kmalloc here to allocate a variable length element. Could
+ * Using zmalloc here to allocate a variable length element. Could
* cause some memory fragmentation if overused.
*/
- e = malloc(sizeof(struct tracepoint_entry) + name_len);
+ e = zmalloc(sizeof(struct tracepoint_entry) + name_len);
if (!e)
return ERR_PTR(-ENOMEM);
memcpy(&e->name[0], name, name_len);
- e->funcs = NULL;
+ e->probes = NULL;
e->refcount = 0;
hlist_add_head(&e->hlist, head);
return e;
* include/linux/tracepoints.h. A matching smp_read_barrier_depends()
* is used.
*/
- rcu_assign_pointer(elem->funcs, (*entry)->funcs);
+ rcu_assign_pointer(elem->probes, (*entry)->probes);
elem->state__imv = active;
}
static void disable_tracepoint(struct tracepoint *elem)
{
elem->state__imv = 0;
- rcu_assign_pointer(elem->funcs, NULL);
+ rcu_assign_pointer(elem->probes, NULL);
}
/**
* Updates the probe callback corresponding to a range of tracepoints.
*/
void tracepoint_update_probe_range(struct tracepoint *begin,
- struct tracepoint *end)
+ struct tracepoint *end)
{
struct tracepoint *iter;
struct tracepoint_entry *mark_entry;
- mutex_lock(&tracepoints_mutex);
+ pthread_mutex_lock(&tracepoints_mutex);
for (iter = begin; iter < end; iter++) {
+ if (!iter->name) {
+ disable_tracepoint(iter);
+ continue;
+ }
mark_entry = get_tracepoint(iter->name);
if (mark_entry) {
set_tracepoint(&mark_entry, iter,
disable_tracepoint(iter);
}
}
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
}
static void lib_update_tracepoints(void)
{
struct tracepoint_lib *lib;
-//ust// mutex_lock(&module_mutex);
+//ust// pthread_mutex_lock(&module_mutex);
list_for_each_entry(lib, &libs, list)
tracepoint_update_probe_range(lib->tracepoints_start,
lib->tracepoints_start + lib->tracepoints_count);
-//ust// mutex_unlock(&module_mutex);
+//ust// pthread_mutex_unlock(&module_mutex);
}
/*
//ust// module_imv_update();
}
-static void *tracepoint_add_probe(const char *name, void *probe)
+static struct probe *
+tracepoint_add_probe(const char *name, void *probe, void *data)
{
struct tracepoint_entry *entry;
- void *old;
+ struct probe *old;
entry = get_tracepoint(name);
if (!entry) {
entry = add_tracepoint(name);
if (IS_ERR(entry))
- return entry;
+ return (struct probe *)entry;
}
- old = tracepoint_entry_add_probe(entry, probe);
+ old = tracepoint_entry_add_probe(entry, probe, data);
if (IS_ERR(old) && !entry->refcount)
remove_tracepoint(entry);
return old;
* Returns 0 if ok, error value on error.
* The probe address must at least be aligned on the architecture pointer size.
*/
-int tracepoint_probe_register(const char *name, void *probe)
+int tracepoint_probe_register(const char *name, void *probe, void *data)
{
void *old;
- mutex_lock(&tracepoints_mutex);
- old = tracepoint_add_probe(name, probe);
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_lock(&tracepoints_mutex);
+ old = tracepoint_add_probe(name, probe, data);
+ pthread_mutex_unlock(&tracepoints_mutex);
if (IS_ERR(old))
return PTR_ERR(old);
}
//ust// EXPORT_SYMBOL_GPL(tracepoint_probe_register);
-static void *tracepoint_remove_probe(const char *name, void *probe)
+static void *tracepoint_remove_probe(const char *name, void *probe, void *data)
{
struct tracepoint_entry *entry;
void *old;
entry = get_tracepoint(name);
if (!entry)
return ERR_PTR(-ENOENT);
- old = tracepoint_entry_remove_probe(entry, probe);
+ old = tracepoint_entry_remove_probe(entry, probe, data);
if (IS_ERR(old))
return old;
if (!entry->refcount)
* tracepoint_probe_unregister - Disconnect a probe from a tracepoint
* @name: tracepoint name
* @probe: probe function pointer
+ * @probe: probe data pointer
*
* We do not need to call a synchronize_sched to make sure the probes have
* finished running before doing a module unload, because the module unload
* itself uses stop_machine(), which insures that every preempt disabled section
* have finished.
*/
-int tracepoint_probe_unregister(const char *name, void *probe)
+int tracepoint_probe_unregister(const char *name, void *probe, void *data)
{
void *old;
- mutex_lock(&tracepoints_mutex);
- old = tracepoint_remove_probe(name, probe);
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_lock(&tracepoints_mutex);
+ old = tracepoint_remove_probe(name, probe, data);
+ pthread_mutex_unlock(&tracepoints_mutex);
if (IS_ERR(old))
return PTR_ERR(old);
{
need_update = 1;
if (old) {
- struct tp_probes *tp_probes = container_of(old,
+ struct tp_probes *tp_probes = _ust_container_of(old,
struct tp_probes, probes[0]);
list_add(&tp_probes->u.list, &old_probes);
}
*
* caller must call tracepoint_probe_update_all()
*/
-int tracepoint_probe_register_noupdate(const char *name, void *probe)
+int tracepoint_probe_register_noupdate(const char *name, void *probe,
+ void *data)
{
void *old;
- mutex_lock(&tracepoints_mutex);
- old = tracepoint_add_probe(name, probe);
+ pthread_mutex_lock(&tracepoints_mutex);
+ old = tracepoint_add_probe(name, probe, data);
if (IS_ERR(old)) {
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
return PTR_ERR(old);
}
tracepoint_add_old_probes(old);
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
return 0;
}
//ust// EXPORT_SYMBOL_GPL(tracepoint_probe_register_noupdate);
*
* caller must call tracepoint_probe_update_all()
*/
-int tracepoint_probe_unregister_noupdate(const char *name, void *probe)
+int tracepoint_probe_unregister_noupdate(const char *name, void *probe,
+ void *data)
{
void *old;
- mutex_lock(&tracepoints_mutex);
- old = tracepoint_remove_probe(name, probe);
+ pthread_mutex_lock(&tracepoints_mutex);
+ old = tracepoint_remove_probe(name, probe, data);
if (IS_ERR(old)) {
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
return PTR_ERR(old);
}
tracepoint_add_old_probes(old);
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
return 0;
}
//ust// EXPORT_SYMBOL_GPL(tracepoint_probe_unregister_noupdate);
LIST_HEAD(release_probes);
struct tp_probes *pos, *next;
- mutex_lock(&tracepoints_mutex);
+ pthread_mutex_lock(&tracepoints_mutex);
if (!need_update) {
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
return;
}
if (!list_empty(&old_probes))
list_replace_init(&old_probes, &release_probes);
need_update = 0;
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
tracepoint_update_probes();
list_for_each_entry_safe(pos, next, &release_probes, u.list) {
struct tracepoint_lib *iter_lib;
int found = 0;
-//ust// mutex_lock(&module_mutex);
+//ust// pthread_mutex_lock(&module_mutex);
list_for_each_entry(iter_lib, &libs, list) {
if (iter_lib < iter->lib)
continue;
break;
}
}
-//ust// mutex_unlock(&module_mutex);
+//ust// pthread_mutex_unlock(&module_mutex);
return found;
}
{
struct tracepoint_lib *pl;
- pl = (struct tracepoint_lib *) malloc(sizeof(struct tracepoint_lib));
+ pl = (struct tracepoint_lib *) zmalloc(sizeof(struct tracepoint_lib));
pl->tracepoints_start = tracepoints_start;
pl->tracepoints_count = tracepoints_count;
/* FIXME: maybe protect this with its own mutex? */
- mutex_lock(&tracepoints_mutex);
+ pthread_mutex_lock(&tracepoints_mutex);
list_add(&pl->list, &libs);
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
new_tracepoints(tracepoints_start, tracepoints_start + tracepoints_count);
lib_update_tracepoints();
DBG("just registered a tracepoints section from %p and having %d tracepoints", tracepoints_start, tracepoints_count);
-
+
return 0;
}
{
struct tracepoint_lib *lib;
- mutex_lock(&tracepoints_mutex);
+ pthread_mutex_lock(&tracepoints_mutex);
list_for_each_entry(lib, &libs, list) {
if(lib->tracepoints_start == tracepoints_start) {
}
}
- mutex_unlock(&tracepoints_mutex);
+ pthread_mutex_unlock(&tracepoints_mutex);
return 0;
}
projects / ust.git / blobdiff