X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracer.c;h=8c3f77466f057f8fc89afcfc3c1dd2a5ac57b45f;hb=1dba3e6c054da18f238d051da5b1839bd5e4e4dd;hp=aec55f43223b382432b298b43dce170d1d75506b;hpb=c1f205309da615f1f0c68beedf37365942246537;p=ust.git

diff --git a/libust/tracer.c b/libust/tracer.c
index aec55f4..8c3f774 100644
--- a/libust/tracer.c
+++ b/libust/tracer.c
@@ -34,7 +34,8 @@
 #include <urcu-bp.h>
 #include <urcu/rculist.h>
 
-#include <ust/kernelcompat.h>
+#include <ust/clock.h>
+
 #include "tracercore.h"
 #include "tracer.h"
 #include "usterr.h"
@@ -45,12 +46,12 @@
 
 /* Default callbacks for modules */
 notrace int ltt_filter_control_default(enum ltt_filter_control_msg msg,
-		struct ltt_trace_struct *trace)
+		struct ust_trace *trace)
 {
 	return 0;
 }
 
-int ltt_statedump_default(struct ltt_trace_struct *trace)
+int ltt_statedump_default(struct ust_trace *trace)
 {
 	return 0;
 }
@@ -58,21 +59,17 @@ int ltt_statedump_default(struct ltt_trace_struct *trace)
 /* Callbacks for registered modules */
 
 int (*ltt_filter_control_functor)
-	(enum ltt_filter_control_msg msg, struct ltt_trace_struct *trace) =
+	(enum ltt_filter_control_msg msg, struct ust_trace *trace) =
 					ltt_filter_control_default;
 struct module *ltt_filter_control_owner;
 
 /* These function pointers are protected by a trace activation check */
 struct module *ltt_run_filter_owner;
-int (*ltt_statedump_functor)(struct ltt_trace_struct *trace) =
+int (*ltt_statedump_functor)(struct ust_trace *trace) =
 					ltt_statedump_default;
 struct module *ltt_statedump_owner;
 
-struct chan_info_struct {
-	const char *name;
-	unsigned int def_subbufsize;
-	unsigned int def_subbufcount;
-} chan_infos[] = {
+struct chan_info_struct chan_infos[] = {
 	[LTT_CHANNEL_METADATA] = {
 		LTT_METADATA_CHANNEL,
 		LTT_DEFAULT_SUBBUF_SIZE_LOW,
@@ -140,7 +137,7 @@ static enum ltt_channels get_channel_type_from_name(const char *name)
 //ust// 		}
 //ust// 		ltt_filter_control_functor =
 //ust// 			(int (*)(enum ltt_filter_control_msg,
-//ust// 			struct ltt_trace_struct *))function;
+//ust// 			struct ust_trace *))function;
 //ust// 		ltt_filter_control_owner = owner;
 //ust// 		break;
 //ust// 	case LTT_FUNCTION_STATEDUMP:
@@ -149,7 +146,7 @@ static enum ltt_channels get_channel_type_from_name(const char *name)
 //ust// 			goto end;
 //ust// 		}
 //ust// 		ltt_statedump_functor =
-//ust// 			(int (*)(struct ltt_trace_struct *))function;
+//ust// 			(int (*)(struct ust_trace *))function;
 //ust// 		ltt_statedump_owner = owner;
 //ust// 		break;
 //ust// 	}
@@ -248,26 +245,7 @@ static inline int is_channel_overwrite(enum ltt_channels chan,
 	}
 }
 
-/**
- * ltt_write_trace_header - Write trace header
- * @trace: Trace information
- * @header: Memory address where the information must be written to
- */
-void notrace ltt_write_trace_header(struct ltt_trace_struct *trace,
-		struct ltt_subbuffer_header *header)
-{
-	header->magic_number = LTT_TRACER_MAGIC_NUMBER;
-	header->major_version = LTT_TRACER_VERSION_MAJOR;
-	header->minor_version = LTT_TRACER_VERSION_MINOR;
-	header->arch_size = sizeof(void *);
-	header->alignment = ltt_get_alignment();
-	header->start_time_sec = trace->start_time.tv_sec;
-	header->start_time_usec = trace->start_time.tv_usec;
-	header->start_freq = trace->start_freq;
-	header->freq_scale = trace->freq_scale;
-}
-
-static void trace_async_wakeup(struct ltt_trace_struct *trace)
+static void trace_async_wakeup(struct ust_trace *trace)
 {
 	int i;
 	struct ust_channel *chan;
@@ -283,7 +261,7 @@ static void trace_async_wakeup(struct ltt_trace_struct *trace)
 //ust// /* Timer to send async wakeups to the readers */
 //ust// static void async_wakeup(unsigned long data)
 //ust// {
-//ust// 	struct ltt_trace_struct *trace;
+//ust// 	struct ust_trace *trace;
 //ust// 
 //ust// 	/*
 //ust// 	 * PREEMPT_RT does not allow spinlocks to be taken within preempt
@@ -315,9 +293,9 @@ static void trace_async_wakeup(struct ltt_trace_struct *trace)
  *
  * Returns a pointer to the trace structure, NULL if not found.
  */
-struct ltt_trace_struct *_ltt_trace_find(const char *trace_name)
+struct ust_trace *_ltt_trace_find(const char *trace_name)
 {
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 
 	list_for_each_entry(trace, &ltt_traces.head, list)
 		if (!strncmp(trace->trace_name, trace_name, NAME_MAX))
@@ -331,9 +309,9 @@ struct ltt_trace_struct *_ltt_trace_find(const char *trace_name)
  *
  * Returns a pointer to the trace structure, NULL if not found.
  */
-struct ltt_trace_struct *_ltt_trace_find_setup(const char *trace_name)
+struct ust_trace *_ltt_trace_find_setup(const char *trace_name)
 {
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 
 	list_for_each_entry(trace, &ltt_traces.setup_head, list)
 		if (!strncmp(trace->trace_name, trace_name, NAME_MAX))
@@ -348,8 +326,8 @@ struct ltt_trace_struct *_ltt_trace_find_setup(const char *trace_name)
  */
 void ltt_release_transport(struct kref *kref)
 {
-//ust// 	struct ltt_trace_struct *trace = container_of(kref,
-//ust// 			struct ltt_trace_struct, ltt_transport_kref);
+//ust// 	struct ust_trace *trace = container_of(kref,
+//ust// 			struct ust_trace, ltt_transport_kref);
 //ust// 	trace->ops->remove_dirs(trace);
 }
 
@@ -359,15 +337,19 @@ void ltt_release_transport(struct kref *kref)
  */
 void ltt_release_trace(struct kref *kref)
 {
-	struct ltt_trace_struct *trace = container_of(kref,
-			struct ltt_trace_struct, 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,
 					 unsigned int *n_subbufs)
 {
+	/* Make sure the subbuffer size is larger than a page */
+	*subbuf_size = max_t(unsigned int, *subbuf_size, PAGE_SIZE);
+
+	/* round to next power of 2 */
 	*subbuf_size = 1 << get_count_order(*subbuf_size);
 	*n_subbufs = 1 << get_count_order(*n_subbufs);
 
@@ -379,7 +361,7 @@ static inline void prepare_chan_size_num(unsigned int *subbuf_size,
 int _ltt_trace_setup(const char *trace_name)
 {
 	int err = 0;
-	struct ltt_trace_struct *new_trace = NULL;
+	struct ust_trace *new_trace = NULL;
 	int metadata_index;
 	unsigned int chan;
 	enum ltt_channels chantype;
@@ -396,7 +378,7 @@ int _ltt_trace_setup(const char *trace_name)
 		goto traces_error;
 	}
 
-	new_trace = kzalloc(sizeof(struct ltt_trace_struct), GFP_KERNEL);
+	new_trace = zmalloc(sizeof(struct ust_trace));
 	if (!new_trace) {
 		ERR("Unable to allocate memory for trace %s", trace_name);
 		err = -ENOMEM;
@@ -404,7 +386,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;
@@ -438,7 +421,7 @@ int _ltt_trace_setup(const char *trace_name)
 	return 0;
 
 trace_free:
-	kfree(new_trace);
+	free(new_trace);
 traces_error:
 	return err;
 }
@@ -454,16 +437,16 @@ int ltt_trace_setup(const char *trace_name)
 }
 
 /* must be called from within a traces lock. */
-static void _ltt_trace_free(struct ltt_trace_struct *trace)
+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)
 {
 	int err = 0;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 	struct ltt_transport *tran_iter, *transport = NULL;
 
 	ltt_lock_traces();
@@ -498,7 +481,7 @@ int ltt_trace_set_channel_subbufsize(const char *trace_name,
 		const char *channel_name, unsigned int size)
 {
 	int err = 0;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 	int index;
 
 	ltt_lock_traces();
@@ -527,7 +510,7 @@ int ltt_trace_set_channel_subbufcount(const char *trace_name,
 		const char *channel_name, unsigned int cnt)
 {
 	int err = 0;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 	int index;
 
 	ltt_lock_traces();
@@ -556,7 +539,7 @@ int ltt_trace_set_channel_enable(const char *trace_name,
 		const char *channel_name, unsigned int enable)
 {
 	int err = 0;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 	int index;
 
 	ltt_lock_traces();
@@ -596,7 +579,7 @@ int ltt_trace_set_channel_overwrite(const char *trace_name,
 		const char *channel_name, unsigned int overwrite)
 {
 	int err = 0;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 	int index;
 
 	ltt_lock_traces();
@@ -637,7 +620,7 @@ traces_error:
 int ltt_trace_alloc(const char *trace_name)
 {
 	int err = 0;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 	unsigned int subbuf_size, subbuf_cnt;
 //ust//	unsigned long flags;
 	int chan;
@@ -645,6 +628,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);
@@ -680,7 +668,7 @@ int ltt_trace_alloc(const char *trace_name)
 //ust//	local_irq_save(flags);
 	trace->start_freq = trace_clock_frequency();
 	trace->start_tsc = trace_clock_read64();
-	gettimeofday(&trace->start_time, NULL); //ust// changed
+	gettimeofday(&trace->start_time, NULL); //ust// changed /* FIXME: is this ok? */
 //ust//	local_irq_restore(flags);
 
 	for (chan = 0; chan < trace->nr_channels; chan++) {
@@ -760,7 +748,7 @@ traces_error:
 //ust// }
 
 /* Must be called while sure that trace is in the list. */
-static int _ltt_trace_destroy(struct ltt_trace_struct *trace)
+static int _ltt_trace_destroy(struct ust_trace *trace)
 {
 	int err = -EPERM;
 
@@ -794,15 +782,17 @@ traces_error:
 }
 
 /* Sleepable part of the destroy */
-static void __ltt_trace_destroy(struct ltt_trace_struct	*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 */
@@ -837,10 +827,10 @@ static void __ltt_trace_destroy(struct ltt_trace_struct	*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 ltt_trace_struct *trace;
+	struct ust_trace *trace;
 
 	ltt_lock_traces();
 
@@ -852,7 +842,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;
@@ -874,7 +864,7 @@ error:
 }
 
 /* must be called from within a traces lock. */
-static int _ltt_trace_start(struct ltt_trace_struct *trace)
+static int _ltt_trace_start(struct ust_trace *trace)
 {
 	int err = 0;
 
@@ -903,7 +893,7 @@ traces_error:
 int ltt_trace_start(const char *trace_name)
 {
 	int err = 0;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 
 	ltt_lock_traces();
 
@@ -941,7 +931,7 @@ no_trace:
 }
 
 /* must be called from within traces lock */
-static int _ltt_trace_stop(struct ltt_trace_struct *trace)
+static int _ltt_trace_stop(struct ust_trace *trace)
 {
 	int err = -EPERM;
 
@@ -968,7 +958,7 @@ traces_error:
 int ltt_trace_stop(const char *trace_name)
 {
 	int err = 0;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 
 	ltt_lock_traces();
 	trace = _ltt_trace_find(trace_name);
@@ -985,7 +975,7 @@ int ltt_trace_stop(const char *trace_name)
 int ltt_filter_control(enum ltt_filter_control_msg msg, const char *trace_name)
 {
 	int err;
-	struct ltt_trace_struct *trace;
+	struct ust_trace *trace;
 
 	DBG("ltt_filter_control : trace %s", trace_name);
 	ltt_lock_traces();