X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libust%2Fchannels.c;h=6716b5d774762991f9b716d3d9d1c73bd9c172cb;hb=0222e1213f196b66cbc08cd29093aca4a28e9ffb;hp=b7f35439a86e189413e7fa8ef81374c30a945d12;hpb=b102c2b0b07a155285716d9f7fd788662cecd54b;p=ust.git

diff --git a/libust/channels.c b/libust/channels.c
index b7f3543..6716b5d 100644
--- a/libust/channels.c
+++ b/libust/channels.c
@@ -23,22 +23,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-//ust// #include <linux/module.h>
-//ust// #include <linux/ltt-channels.h>
-//ust// #include <linux/mutex.h>
-//ust// #include <linux/vmalloc.h>
-
-#include <ust/kernelcompat.h>
+#include <stdlib.h>
+#include <ust/marker.h>
 #include "channels.h"
 #include "usterr.h"
-#include <ust/marker.h>
 
 /*
  * ltt_channel_mutex may be nested inside the LTT trace mutex.
  * ltt_channel_mutex mutex may be nested inside markers mutex.
  */
 static DEFINE_MUTEX(ltt_channel_mutex);
-static LIST_HEAD(ltt_channels);
+static CDS_LIST_HEAD(ltt_channels);
 /*
  * Index of next channel in array. Makes sure that as long as a trace channel is
  * allocated, no array index will be re-used when a channel is freed and then
@@ -49,11 +44,14 @@ static LIST_HEAD(ltt_channels);
 static unsigned int free_index;
 static struct kref index_kref;	/* Keeps track of allocated trace channels */
 
+int ust_channels_overwrite_by_default = 0;
+int ust_channels_request_collection_by_default = 1;
+
 static struct ltt_channel_setting *lookup_channel(const char *name)
 {
 	struct ltt_channel_setting *iter;
 
-	list_for_each_entry(iter, &ltt_channels, list)
+	cds_list_for_each_entry(iter, &ltt_channels, list)
 		if (strcmp(name, iter->name) == 0)
 			return iter;
 	return NULL;
@@ -68,20 +66,21 @@ static struct ltt_channel_setting *lookup_channel(const char *name)
  */
 static void release_channel_setting(struct kref *kref)
 {
-	struct ltt_channel_setting *setting = container_of(kref,
+	struct ltt_channel_setting *setting = _ust_container_of(kref,
 		struct ltt_channel_setting, kref);
 	struct ltt_channel_setting *iter;
 
 	if (uatomic_read(&index_kref.refcount) == 0
 	    && uatomic_read(&setting->kref.refcount) == 0) {
-		list_del(&setting->list);
-		kfree(setting);
+		cds_list_del(&setting->list);
+		free(setting);
 
 		free_index = 0;
-		list_for_each_entry(iter, &ltt_channels, list) {
+		cds_list_for_each_entry(iter, &ltt_channels, list) {
 			iter->index = free_index++;
 			iter->free_event_id = 0;
 		}
+		/* FIXME: why not run this? */
 //ust//		markers_compact_event_ids();
 	}
 }
@@ -95,7 +94,7 @@ static void release_trace_channel(struct kref *kref)
 {
 	struct ltt_channel_setting *iter, *n;
 
-	list_for_each_entry_safe(iter, n, &ltt_channels, list)
+	cds_list_for_each_entry_safe(iter, n, &ltt_channels, list)
 		release_channel_setting(&iter->kref);
 }
 
@@ -110,7 +109,7 @@ int ltt_channels_register(const char *name)
 	struct ltt_channel_setting *setting;
 	int ret = 0;
 
-	mutex_lock(&ltt_channel_mutex);
+	pthread_mutex_lock(&ltt_channel_mutex);
 	setting = lookup_channel(name);
 	if (setting) {
 		if (uatomic_read(&setting->kref.refcount) == 0)
@@ -120,18 +119,18 @@ int ltt_channels_register(const char *name)
 			goto end;
 		}
 	}
-	setting = kzalloc(sizeof(*setting), GFP_KERNEL);
+	setting = zmalloc(sizeof(*setting));
 	if (!setting) {
 		ret = -ENOMEM;
 		goto end;
 	}
-	list_add(&setting->list, &ltt_channels);
+	cds_list_add(&setting->list, &ltt_channels);
 	strncpy(setting->name, name, PATH_MAX-1);
 	setting->index = free_index++;
 init_kref:
 	kref_init(&setting->kref);
 end:
-	mutex_unlock(&ltt_channel_mutex);
+	pthread_mutex_unlock(&ltt_channel_mutex);
 	return ret;
 }
 //ust// EXPORT_SYMBOL_GPL(ltt_channels_register);
@@ -147,7 +146,7 @@ int ltt_channels_unregister(const char *name)
 	struct ltt_channel_setting *setting;
 	int ret = 0;
 
-	mutex_lock(&ltt_channel_mutex);
+	pthread_mutex_lock(&ltt_channel_mutex);
 	setting = lookup_channel(name);
 	if (!setting || uatomic_read(&setting->kref.refcount) == 0) {
 		ret = -ENOENT;
@@ -155,7 +154,7 @@ int ltt_channels_unregister(const char *name)
 	}
 	kref_put(&setting->kref, release_channel_setting);
 end:
-	mutex_unlock(&ltt_channel_mutex);
+	pthread_mutex_unlock(&ltt_channel_mutex);
 	return ret;
 }
 //ust// EXPORT_SYMBOL_GPL(ltt_channels_unregister);
@@ -173,7 +172,7 @@ int ltt_channels_set_default(const char *name,
 	struct ltt_channel_setting *setting;
 	int ret = 0;
 
-	mutex_lock(&ltt_channel_mutex);
+	pthread_mutex_lock(&ltt_channel_mutex);
 	setting = lookup_channel(name);
 	if (!setting || uatomic_read(&setting->kref.refcount) == 0) {
 		ret = -ENOENT;
@@ -182,7 +181,7 @@ int ltt_channels_set_default(const char *name,
 	setting->subbuf_size = subbuf_size;
 	setting->subbuf_cnt = subbuf_cnt;
 end:
-	mutex_unlock(&ltt_channel_mutex);
+	pthread_mutex_unlock(&ltt_channel_mutex);
 	return ret;
 }
 //ust// EXPORT_SYMBOL_GPL(ltt_channels_set_default);
@@ -198,7 +197,7 @@ const char *ltt_channels_get_name_from_index(unsigned int index)
 {
 	struct ltt_channel_setting *iter;
 
-	list_for_each_entry(iter, &ltt_channels, list)
+	cds_list_for_each_entry(iter, &ltt_channels, list)
 		if (iter->index == index && uatomic_read(&iter->kref.refcount))
 			return iter->name;
 	return NULL;
@@ -210,7 +209,7 @@ ltt_channels_get_setting_from_name(const char *name)
 {
 	struct ltt_channel_setting *iter;
 
-	list_for_each_entry(iter, &ltt_channels, list)
+	cds_list_for_each_entry(iter, &ltt_channels, list)
 		if (!strcmp(iter->name, name)
 		    && uatomic_read(&iter->kref.refcount))
 			return iter;
@@ -249,12 +248,13 @@ int ltt_channels_get_index_from_name(const char *name)
  */
 struct ust_channel *ltt_channels_trace_alloc(unsigned int *nr_channels,
 						    int overwrite,
+						    int request_collection,
 						    int active)
 {
 	struct ust_channel *channel = NULL;
 	struct ltt_channel_setting *iter;
 
-	mutex_lock(&ltt_channel_mutex);
+	pthread_mutex_lock(&ltt_channel_mutex);
 	if (!free_index) {
 		WARN("ltt_channels_trace_alloc: no free_index; are there any probes connected?");
 		goto end;
@@ -264,23 +264,23 @@ struct ust_channel *ltt_channels_trace_alloc(unsigned int *nr_channels,
 	else
 		kref_get(&index_kref);
 	*nr_channels = free_index;
-	channel = kzalloc(sizeof(struct ust_channel) * free_index,
-			  GFP_KERNEL);
+	channel = zmalloc(sizeof(struct ust_channel) * free_index);
 	if (!channel) {
 		WARN("ltt_channel_struct: channel null after alloc");
 		goto end;
 	}
-	list_for_each_entry(iter, &ltt_channels, list) {
+	cds_list_for_each_entry(iter, &ltt_channels, list) {
 		if (!uatomic_read(&iter->kref.refcount))
 			continue;
 		channel[iter->index].subbuf_size = iter->subbuf_size;
 		channel[iter->index].subbuf_cnt = iter->subbuf_cnt;
 		channel[iter->index].overwrite = overwrite;
+		channel[iter->index].request_collection = request_collection;
 		channel[iter->index].active = active;
 		channel[iter->index].channel_name = iter->name;
 	}
 end:
-	mutex_unlock(&ltt_channel_mutex);
+	pthread_mutex_unlock(&ltt_channel_mutex);
 	return channel;
 }
 //ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_alloc);
@@ -295,10 +295,10 @@ end:
 void ltt_channels_trace_free(struct ust_channel *channels)
 {
 	lock_markers();
-	mutex_lock(&ltt_channel_mutex);
-	kfree(channels);
+	pthread_mutex_lock(&ltt_channel_mutex);
+	free(channels);
 	kref_put(&index_kref, release_trace_channel);
-	mutex_unlock(&ltt_channel_mutex);
+	pthread_mutex_unlock(&ltt_channel_mutex);
 	unlock_markers();
 }
 //ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_free);
@@ -352,9 +352,9 @@ int ltt_channels_get_event_id(const char *channel, const char *name)
 {
 	int ret;
 
-	mutex_lock(&ltt_channel_mutex);
+	pthread_mutex_lock(&ltt_channel_mutex);
 	ret = _ltt_channels_get_event_id(channel, name);
-	mutex_unlock(&ltt_channel_mutex);
+	pthread_mutex_unlock(&ltt_channel_mutex);
 	return ret;
 }