X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracepoint.c;h=6155e2900e43ff6d6c3b40220aae18f4fea3cbae;hb=eddb0f66ac5c9175433828c3f72211115474ddb7;hp=7976f7d920c3f3a6ff3e8c442e6aa2eace925e92;hpb=c1f205309da615f1f0c68beedf37365942246537;p=ust.git

diff --git a/libust/tracepoint.c b/libust/tracepoint.c
index 7976f7d..6155e29 100644
--- a/libust/tracepoint.c
+++ b/libust/tracepoint.c
@@ -19,23 +19,11 @@
  * Ported to userspace by Pierre-Marc Fournier.
  */
 
-//ust// #include <linux/module.h>
-//ust// #include <linux/mutex.h>
-//ust// #include <linux/types.h>
-//ust// #include <linux/jhash.h>
-//ust// #include <linux/list.h>
-//ust// #include <linux/rcupdate.h>
-//ust// #include <linux/tracepoint.h>
-//ust// #include <linux/err.h>
-//ust// #include <linux/slab.h>
-//ust// #include <linux/immediate.h>
-
 #include <errno.h>
-
-#include <ust/kernelcompat.h>
 #include <ust/tracepoint.h>
+#include <ust/core.h>
+#include <ust/kcompat/kcompat.h>
 #include "usterr.h"
-//#include "list.h"
 
 #define _LGPL_SOURCE
 #include <urcu-bp.h>
@@ -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);
 	}
 }
 
@@ -233,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);
@@ -250,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);
 }
 
 /*
@@ -297,7 +285,7 @@ void tracepoint_update_probe_range(struct tracepoint *begin,
 	struct tracepoint *iter;
 	struct tracepoint_entry *mark_entry;
 
-	mutex_lock(&tracepoints_mutex);
+	pthread_mutex_lock(&tracepoints_mutex);
 	for (iter = begin; iter < end; iter++) {
 		mark_entry = get_tracepoint(iter->name);
 		if (mark_entry) {
@@ -307,18 +295,18 @@ void tracepoint_update_probe_range(struct tracepoint *begin,
 			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);
 }
 
 /*
@@ -365,9 +353,9 @@ int tracepoint_probe_register(const char *name, void *probe)
 {
 	void *old;
 
-	mutex_lock(&tracepoints_mutex);
+	pthread_mutex_lock(&tracepoints_mutex);
 	old = tracepoint_add_probe(name, probe);
-	mutex_unlock(&tracepoints_mutex);
+	pthread_mutex_unlock(&tracepoints_mutex);
 	if (IS_ERR(old))
 		return PTR_ERR(old);
 
@@ -407,9 +395,9 @@ int tracepoint_probe_unregister(const char *name, void *probe)
 {
 	void *old;
 
-	mutex_lock(&tracepoints_mutex);
+	pthread_mutex_lock(&tracepoints_mutex);
 	old = tracepoint_remove_probe(name, probe);
-	mutex_unlock(&tracepoints_mutex);
+	pthread_mutex_unlock(&tracepoints_mutex);
 	if (IS_ERR(old))
 		return PTR_ERR(old);
 
@@ -443,14 +431,14 @@ int tracepoint_probe_register_noupdate(const char *name, void *probe)
 {
 	void *old;
 
-	mutex_lock(&tracepoints_mutex);
+	pthread_mutex_lock(&tracepoints_mutex);
 	old = tracepoint_add_probe(name, probe);
 	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);
@@ -466,14 +454,14 @@ int tracepoint_probe_unregister_noupdate(const char *name, void *probe)
 {
 	void *old;
 
-	mutex_lock(&tracepoints_mutex);
+	pthread_mutex_lock(&tracepoints_mutex);
 	old = tracepoint_remove_probe(name, probe);
 	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);
@@ -486,22 +474,22 @@ void tracepoint_probe_update_all(void)
 	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) {
 		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);
@@ -515,7 +503,7 @@ int lib_get_iter_tracepoints(struct tracepoint_iter *iter)
 	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;
@@ -529,7 +517,7 @@ int lib_get_iter_tracepoints(struct tracepoint_iter *iter)
 			break;
 		}
 	}
-//ust//	mutex_unlock(&module_mutex);
+//ust//	pthread_mutex_unlock(&module_mutex);
 	return found;
 }
 
@@ -664,9 +652,9 @@ int tracepoint_register_lib(struct tracepoint *tracepoints_start, int tracepoint
 	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);
 
@@ -678,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;
+
+	pthread_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;
+		}
+	}
+
+	pthread_mutex_unlock(&tracepoints_mutex);
 
 	return 0;
 }