X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttv%2Flttv%2Ftraceset.c;h=b28efb3ac6f490c15377757ee6b2dc227a29fd0d;hb=2bc1bcfb0fdff52b3350804d2824cd023f463f96;hp=45d63143c7a92adf22a410e6b192db5166842ce0;hpb=90e19f82bca635a1ba52b8a50b64e484bd19c14f;p=lttv.git

diff --git a/lttv/lttv/traceset.c b/lttv/lttv/traceset.c
index 45d63143..b28efb3a 100644
--- a/lttv/lttv/traceset.c
+++ b/lttv/lttv/traceset.c
@@ -23,6 +23,7 @@
 #include <lttv/traceset.h>
 #include <lttv/iattribute.h>
 #include <stdio.h>
+#include <babeltrace/context.h>
 
 /* A trace is a sequence of events gathered in the same tracing session. The
    events may be stored in several tracefiles in the same directory. 
@@ -33,17 +34,18 @@
 struct _LttvTraceset {
 	char * filename;
 	GPtrArray *traces;
+	struct bt_context *context;
 	LttvAttribute *a;
 };
 
 
 struct _LttvTrace {
-	LttTrace *t;
+  // Trace id for babeltrace
+	gint id;
 	LttvAttribute *a;
 	guint ref_count;
 };
 
-
 LttvTraceset *lttv_traceset_new() 
 {
 	LttvTraceset *s;
@@ -51,6 +53,7 @@ LttvTraceset *lttv_traceset_new()
 	s = g_new(LttvTraceset, 1);
 	s->filename = NULL;
 	s->traces = g_ptr_array_new();
+	s->context = bt_context_create();
 	s->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
 	return s;
 }
@@ -60,17 +63,70 @@ char * lttv_traceset_name(LttvTraceset * s)
 	return s->filename;
 }
 
-LttvTrace *lttv_trace_new(LttTrace *t) 
+#ifdef BABEL_CLEANUP
+LttvTrace *lttv_trace_new(LttTrace *t)
 {
 	LttvTrace *new_trace;
 
 	new_trace = g_new(LttvTrace, 1);
 	new_trace->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
-	new_trace->t = t;
+	new_trace->id = t;
 	new_trace->ref_count = 0;
 	return new_trace;
 }
+#endif
 
+/*
+ * lttv_trace_create : Create a trace from a path
+ *
+ * ts is the traceset in which will be contained the trace
+ *
+ * path is the path where to find a trace. It is not recursive.
+ *
+ * This function is static since a trace should always be contained in a
+ * traceset.
+ *
+ * return the created trace or NULL on failure
+ */
+static LttvTrace *lttv_trace_create(LttvTraceset *ts, const char *path)
+{
+  int id = bt_context_add_trace(lttv_traceset_get_context(ts),
+            path,
+            "ctf",
+            NULL,
+            NULL,
+            NULL);
+  if (id < 0) {
+    return NULL;
+  }
+  // Create the trace and save the trace handle id returned by babeltrace
+  LttvTrace *new_trace;
+
+  new_trace = g_new(LttvTrace, 1);
+  new_trace->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
+  new_trace->id = id;
+  new_trace->ref_count = 0;
+  return new_trace;
+}
+
+/*
+ * lttv_trace_create : Create and add a single trace to a traceset
+ *
+ * ts is the traceset in which will be contained the trace
+ *
+ * path is the path where to find a trace. It is not recursive.
+ *
+ * return a positive integer (>=0)on success or -1 on failure
+ */
+static int lttv_traceset_create_trace(LttvTraceset *ts, const char *path)
+{
+  LttvTrace *trace = lttv_trace_create(ts, path);
+  if (trace == NULL) {
+    return -1;
+  }
+  lttv_traceset_add(ts, trace);
+  return 0;
+}
 
 LttvTraceset *lttv_traceset_copy(LttvTraceset *s_orig) 
 {
@@ -88,6 +144,8 @@ LttvTraceset *lttv_traceset_copy(LttvTraceset *s_orig)
 
 		g_ptr_array_add(s->traces, trace);
 	}
+	s->context = s_orig->context;
+	bt_context_get(s->context);
 	s->a = LTTV_ATTRIBUTE(lttv_iattribute_deep_copy(LTTV_IATTRIBUTE(s_orig->a)));
 	return s;
 }
@@ -126,14 +184,22 @@ void lttv_traceset_destroy(LttvTraceset *s)
 	for(i=0;i<s->traces->len;i++) {
 		LttvTrace *trace = g_ptr_array_index(s->traces, i);
 		lttv_trace_unref(trace);
+		// todo mdenis 2012-03-27: uncomment when babeltrace gets fixed
+		//bt_context_remove_trace(lttv_traceset_get_context(s), trace->id);
 		if(lttv_trace_get_ref_number(trace) == 0)
 			lttv_trace_destroy(trace);
 	}
 	g_ptr_array_free(s->traces, TRUE);
+	bt_context_put(s->context);
 	g_object_unref(s->a);
 	g_free(s);
 }
 
+struct bt_context *lttv_traceset_get_context(LttvTraceset *s)
+{
+	return s->context;
+}
+
 void lttv_trace_destroy(LttvTrace *t) 
 {
 	g_object_unref(t->a);
@@ -147,6 +213,12 @@ void lttv_traceset_add(LttvTraceset *s, LttvTrace *t)
 	g_ptr_array_add(s->traces, t);
 }
 
+int lttv_traceset_add_path(LttvTraceset *ts, const char *trace_path)
+{
+  // todo mdenis 2012-03-27: add trace recursively and update comment
+  int ret = lttv_traceset_create_trace(ts, trace_path);
+  return ret;
+}
 
 unsigned lttv_traceset_number(LttvTraceset *s) 
 {
@@ -167,6 +239,7 @@ void lttv_traceset_remove(LttvTraceset *s, unsigned i)
 	g_assert(s->traces->len > i);
 	t = (LttvTrace *)s->traces->pdata[i];
 	t->ref_count--;
+	bt_context_remove_trace(lttv_traceset_get_context(s), t->id);
 	g_ptr_array_remove_index(s->traces, i);
 }
 
@@ -185,14 +258,21 @@ LttvAttribute *lttv_trace_attribute(LttvTrace *t)
 	return t->a;
 }
 
-
+#ifdef BABEL_CLEANUP
 LttTrace *lttv_trace(LttvTrace *t)
 {
 	return t->t;
 }
+#endif
+
+gint lttv_trace_get_id(LttvTrace *t)
+{
+  return t->id;
+}
 
 guint lttv_trace_get_ref_number(LttvTrace * t)
 {
+	// todo mdenis: adapt to babeltrace
 	return t->ref_count;
 }