X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracer.c;h=60fc8b7a182270110e9408ec7d96fd72e655d8e0;hb=8649cd59b1c15b8d4097cf63f733e8007d76ad13;hp=d5ec43e8356c2e527bc5642cc301fe1edb273770;hpb=b73a4c471dc987ea8548632dffb3c7050de77dd0;p=ust.git

diff --git a/libust/tracer.c b/libust/tracer.c
index d5ec43e..60fc8b7 100644
--- a/libust/tracer.c
+++ b/libust/tracer.c
@@ -343,7 +343,7 @@ void ltt_release_trace(struct kref *kref)
 	struct ust_trace *trace = container_of(kref,
 			struct ust_trace, kref);
 	ltt_channels_trace_free(trace->channels);
-	kfree(trace);
+	free(trace);
 }
 
 static inline void prepare_chan_size_num(unsigned int *subbuf_size,
@@ -381,7 +381,7 @@ int _ltt_trace_setup(const char *trace_name)
 		goto traces_error;
 	}
 
-	new_trace = kzalloc(sizeof(struct ust_trace), GFP_KERNEL);
+	new_trace = zmalloc(sizeof(struct ust_trace));
 	if (!new_trace) {
 		ERR("Unable to allocate memory for trace %s", trace_name);
 		err = -ENOMEM;
@@ -389,7 +389,8 @@ int _ltt_trace_setup(const char *trace_name)
 	}
 	strncpy(new_trace->trace_name, trace_name, NAME_MAX);
 	new_trace->channels = ltt_channels_trace_alloc(&new_trace->nr_channels,
-						       0, 1);
+				ust_channels_overwrite_by_default,
+				ust_channels_request_collection_by_default, 1);
 	if (!new_trace->channels) {
 		ERR("Unable to allocate memory for chaninfo  %s\n", trace_name);
 		err = -ENOMEM;
@@ -423,7 +424,7 @@ int _ltt_trace_setup(const char *trace_name)
 	return 0;
 
 trace_free:
-	kfree(new_trace);
+	free(new_trace);
 traces_error:
 	return err;
 }
@@ -442,7 +443,7 @@ int ltt_trace_setup(const char *trace_name)
 static void _ltt_trace_free(struct ust_trace *trace)
 {
 	list_del(&trace->list);
-	kfree(trace);
+	free(trace);
 }
 
 int ltt_trace_set_type(const char *trace_name, const char *trace_type)
@@ -630,6 +631,11 @@ int ltt_trace_alloc(const char *trace_name)
 
 	ltt_lock_traces();
 
+	if (_ltt_trace_find(trace_name)) { /* Trace already allocated */
+		err = 1;
+		goto traces_error;
+	}
+
 	trace = _ltt_trace_find_setup(trace_name);
 	if (!trace) {
 		ERR("Trace not found %s", trace_name);
@@ -779,15 +785,17 @@ traces_error:
 }
 
 /* Sleepable part of the destroy */
-static void __ltt_trace_destroy(struct ust_trace *trace)
+static void __ltt_trace_destroy(struct ust_trace *trace, int drop)
 {
 	int i;
 	struct ust_channel *chan;
 
-	for (i = 0; i < trace->nr_channels; i++) {
-		chan = &trace->channels[i];
-		if (chan->active)
-			trace->ops->finish_channel(chan);
+	if(!drop) {
+		for (i = 0; i < trace->nr_channels; i++) {
+			chan = &trace->channels[i];
+			if (chan->active)
+				trace->ops->finish_channel(chan);
+		}
 	}
 
 	return; /* FIXME: temporary for ust */
@@ -822,7 +830,7 @@ static void __ltt_trace_destroy(struct ust_trace *trace)
 	kref_put(&trace->kref, ltt_release_trace);
 }
 
-int ltt_trace_destroy(const char *trace_name)
+int ltt_trace_destroy(const char *trace_name, int drop)
 {
 	int err = 0;
 	struct ust_trace *trace;
@@ -837,7 +845,7 @@ int ltt_trace_destroy(const char *trace_name)
 
 		ltt_unlock_traces();
 
-		__ltt_trace_destroy(trace);
+		__ltt_trace_destroy(trace, drop);
 //ust//		put_trace_clock();
 
 		return 0;