X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libust%2Ftracepoint.c;h=dd2ad7fae24fcc37615db05bda2e6a917e2889e6;hb=7166e240639cec06f4273f65059300f98b5296f6;hp=d6b09737a8cd052096e31465ea90573753db8d7e;hpb=34e4b7db790ca5ff678eae7cf5658455a8991870;p=ust.git diff --git a/libust/tracepoint.c b/libust/tracepoint.c index d6b0973..dd2ad7f 100644 --- a/libust/tracepoint.c +++ b/libust/tracepoint.c @@ -19,26 +19,14 @@ * Ported to userspace by Pierre-Marc Fournier. */ -//ust// #include -//ust// #include -//ust// #include -//ust// #include -//ust// #include -//ust// #include -//ust// #include -//ust// #include -//ust// #include -//ust// #include - #include -#include "kernelcompat.h" -#include "tracepoint.h" +#include +#include #include "usterr.h" -//#include "list.h" #define _LGPL_SOURCE -#include +#include //extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden"))); //extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden"))); @@ -86,8 +74,8 @@ struct tp_probes { static inline void *allocate_probes(int count) { - struct tp_probes *p = kmalloc(count * sizeof(void *) - + sizeof(struct tp_probes), GFP_KERNEL); + struct tp_probes *p = malloc(count * sizeof(void *) + + sizeof(struct tp_probes)); return p == NULL ? NULL : p->probes; } @@ -103,7 +91,7 @@ static inline void release_probes(void *old) struct tp_probes, probes[0]); //ust// call_rcu_sched(&tp_probes->u.rcu, rcu_free_old_probes); synchronize_rcu(); - kfree(tp_probes); + free(tp_probes); } } @@ -115,7 +103,7 @@ static void debug_print_probes(struct tracepoint_entry *entry) return; for (i = 0; entry->funcs[i]; i++) - printk(KERN_DEBUG "Probe %d : %p\n", i, entry->funcs[i]); + DBG("Probe %d : %p", i, entry->funcs[i]); } static void * @@ -225,8 +213,7 @@ static struct tracepoint_entry *add_tracepoint(const char *name) head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)]; hlist_for_each_entry(e, node, head, hlist) { if (!strcmp(name, e->name)) { - printk(KERN_NOTICE - "tracepoint %s busy\n", name); + DBG("tracepoint %s busy", name); return ERR_PTR(-EEXIST); /* Already there */ } } @@ -234,7 +221,7 @@ static struct tracepoint_entry *add_tracepoint(const char *name) * Using kmalloc here to allocate a variable length element. Could * cause some memory fragmentation if overused. */ - e = kmalloc(sizeof(struct tracepoint_entry) + name_len, GFP_KERNEL); + e = malloc(sizeof(struct tracepoint_entry) + name_len); if (!e) return ERR_PTR(-ENOMEM); memcpy(&e->name[0], name, name_len); @@ -251,7 +238,7 @@ static struct tracepoint_entry *add_tracepoint(const char *name) static inline void remove_tracepoint(struct tracepoint_entry *e) { hlist_del(&e->hlist); - kfree(e); + free(e); } /* @@ -311,6 +298,17 @@ void tracepoint_update_probe_range(struct tracepoint *begin, mutex_unlock(&tracepoints_mutex); } +static void lib_update_tracepoints(void) +{ + struct tracepoint_lib *lib; + +//ust// 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); +} + /* * Update probes, removing the faulty probes. */ @@ -491,11 +489,38 @@ void tracepoint_probe_update_all(void) list_del(&pos->u.list); //ust// call_rcu_sched(&pos->u.rcu, rcu_free_old_probes); synchronize_rcu(); - kfree(pos); + free(pos); } } //ust// EXPORT_SYMBOL_GPL(tracepoint_probe_update_all); +/* + * Returns 0 if current not found. + * Returns 1 if current found. + */ +int lib_get_iter_tracepoints(struct tracepoint_iter *iter) +{ + struct tracepoint_lib *iter_lib; + int found = 0; + +//ust// mutex_lock(&module_mutex); + list_for_each_entry(iter_lib, &libs, list) { + if (iter_lib < iter->lib) + continue; + else if (iter_lib > iter->lib) + iter->tracepoint = NULL; + found = tracepoint_get_iter_range(&iter->tracepoint, + iter_lib->tracepoints_start, + iter_lib->tracepoints_start + iter_lib->tracepoints_count); + if (found) { + iter->lib = iter_lib; + break; + } + } +//ust// mutex_unlock(&module_mutex); + return found; +} + /** * tracepoint_get_iter_range - Get a next tracepoint iterator given a range. * @tracepoint: current tracepoints (in), next tracepoint (out) @@ -532,7 +557,7 @@ static void tracepoint_get_iter(struct tracepoint_iter *iter) //ust// } /* tracepoints in libs. */ found = lib_get_iter_tracepoints(iter); -end: +//ust// end: if (!found) tracepoint_iter_reset(iter); } @@ -600,44 +625,6 @@ void tracepoint_iter_reset(struct tracepoint_iter *iter) //ust// #endif /* CONFIG_MODULES */ -/* - * Returns 0 if current not found. - * Returns 1 if current found. - */ -int lib_get_iter_tracepoints(struct tracepoint_iter *iter) -{ - struct tracepoint_lib *iter_lib; - int found = 0; - -//ust// mutex_lock(&module_mutex); - list_for_each_entry(iter_lib, &libs, list) { - if (iter_lib < iter->lib) - continue; - else if (iter_lib > iter->lib) - iter->tracepoint = NULL; - found = marker_get_iter_range(&iter->tracepoint, - iter_lib->tracepoints_start, - iter_lib->tracepoints_start + iter_lib->tracepoints_count); - if (found) { - iter->lib = iter_lib; - break; - } - } -//ust// mutex_unlock(&module_mutex); - return found; -} - -void lib_update_tracepoints(void) -{ - struct tracepoint_lib *lib; - -//ust// 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); -} - static void (*new_tracepoint_cb)(struct tracepoint *) = NULL; void tracepoint_set_new_tracepoint_cb(void (*cb)(struct tracepoint *)) @@ -679,10 +666,22 @@ int tracepoint_register_lib(struct tracepoint *tracepoints_start, int tracepoint return 0; } -int tracepoint_unregister_lib(struct tracepoint *tracepoints_start, int tracepoints_count) +int tracepoint_unregister_lib(struct tracepoint *tracepoints_start) { - /*FIXME: implement; but before implementing, tracepoint_register_lib must - have appropriate locking. */ + struct tracepoint_lib *lib; + + mutex_lock(&tracepoints_mutex); + + list_for_each_entry(lib, &libs, list) { + if(lib->tracepoints_start == tracepoints_start) { + struct tracepoint_lib *lib2free = lib; + list_del(&lib->list); + free(lib2free); + break; + } + } + + mutex_unlock(&tracepoints_mutex); return 0; }