X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Ftraceset.c;h=b28efb3ac6f490c15377757ee6b2dc227a29fd0d;hb=2bc1bcfb0fdff52b3350804d2824cd023f463f96;hp=181bdd53430de5739316262bc618ebc1e29a2d40;hpb=f61f4dca50e13aa52b1ca3941c8f420848f4353f;p=lttv.git

diff --git a/lttv/lttv/traceset.c b/lttv/lttv/traceset.c
index 181bdd53..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. 
@@ -31,184 +32,262 @@
 */
 
 struct _LttvTraceset {
-  char * filename;
-  GPtrArray *traces;
-  LttvAttribute *a;
+	char * filename;
+	GPtrArray *traces;
+	struct bt_context *context;
+	LttvAttribute *a;
 };
 
 
 struct _LttvTrace {
-  LttTrace *t;
-  LttvAttribute *a;
-  guint ref_count;
+  // Trace id for babeltrace
+	gint id;
+	LttvAttribute *a;
+	guint ref_count;
 };
 
-
 LttvTraceset *lttv_traceset_new() 
 {
-  LttvTraceset *s;
-
-  s = g_new(LttvTraceset, 1);
-  s->filename = NULL;
-  s->traces = g_ptr_array_new();
-  s->a = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
-  return s;
+	LttvTraceset *s;
+
+	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;
 }
 
 char * lttv_traceset_name(LttvTraceset * s)
 {
-  return s->filename;
+	return s->filename;
+}
+
+#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->id = t;
+	new_trace->ref_count = 0;
+	return new_trace;
 }
+#endif
 
-LttvTrace *lttv_trace_new(LttTrace *t) 
+/*
+ * 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->t = t;
+  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) 
 {
-  guint i;
-  LttvTraceset *s;
-  LttvTrace * trace;
-
-  s = g_new(LttvTraceset, 1);
-  s->filename = NULL;
-  s->traces = g_ptr_array_new();
-  for(i=0;i<s_orig->traces->len;i++)
-  {
-    trace = g_ptr_array_index(s_orig->traces, i);
-    trace->ref_count++;
-
-    g_ptr_array_add(s->traces,
-	                  trace);
-  }
-  s->a = LTTV_ATTRIBUTE(lttv_iattribute_deep_copy(LTTV_IATTRIBUTE(s_orig->a)));
-  return s;
+	guint i;
+	LttvTraceset *s;
+	LttvTrace * trace;
+
+	s = g_new(LttvTraceset, 1);
+	s->filename = NULL;
+	s->traces = g_ptr_array_new();
+	for(i=0;i<s_orig->traces->len;i++)
+	{
+		trace = g_ptr_array_index(s_orig->traces, i);
+		trace->ref_count++;
+
+		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;
 }
 
 
 LttvTraceset *lttv_traceset_load(const gchar *filename)
 {
-  LttvTraceset *s = g_new(LttvTraceset,1);
-  FILE *tf;
-  
-  s->filename = g_strdup(filename);
-  tf = fopen(filename,"r");
+	LttvTraceset *s = g_new(LttvTraceset,1);
+	FILE *tf;
+
+	s->filename = g_strdup(filename);
+	tf = fopen(filename,"r");
 
-  g_critical("NOT IMPLEMENTED : load traceset data from a XML file");
-  
-  fclose(tf);
-  return s;
+	g_critical("NOT IMPLEMENTED : load traceset data from a XML file");
+
+	fclose(tf);
+	return s;
 }
 
 gint lttv_traceset_save(LttvTraceset *s)
 {
-  FILE *tf;
+	FILE *tf;
 
-  tf = fopen(s->filename, "w");
-  
-  g_critical("NOT IMPLEMENTED : save traceset data in a XML file");
+	tf = fopen(s->filename, "w");
 
-  fclose(tf);
-  return 0;
+	g_critical("NOT IMPLEMENTED : save traceset data in a XML file");
+
+	fclose(tf);
+	return 0;
 }
 
 void lttv_traceset_destroy(LttvTraceset *s) 
 {
-  guint i;
+	guint i;
+
+	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);
+}
 
-  for(i=0;i<s->traces->len;i++) {
-    LttvTrace *trace = g_ptr_array_index(s->traces, i);
-    lttv_trace_unref(trace);
-    if(lttv_trace_get_ref_number(trace) == 0)
-      lttv_trace_destroy(trace);
-  }
-  g_ptr_array_free(s->traces, TRUE);
-  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);
-  g_free(t);
+	g_object_unref(t->a);
+	g_free(t);
 }
 
 
 void lttv_traceset_add(LttvTraceset *s, LttvTrace *t) 
 {
-  t->ref_count++;
-  g_ptr_array_add(s->traces, t);
+	t->ref_count++;
+	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) 
 {
-  return s->traces->len;
+	return s->traces->len;
 }
 
 
 LttvTrace *lttv_traceset_get(LttvTraceset *s, unsigned i) 
 {
-  g_assert(s->traces->len > i);
-  return ((LttvTrace *)s->traces->pdata[i]);
+	g_assert(s->traces->len > i);
+	return ((LttvTrace *)s->traces->pdata[i]);
 }
 
 
 void lttv_traceset_remove(LttvTraceset *s, unsigned i) 
 {
-  LttvTrace * t;
-  g_assert(s->traces->len > i);
-  t = (LttvTrace *)s->traces->pdata[i];
-  t->ref_count--;
-  g_ptr_array_remove_index(s->traces, i);
+	LttvTrace * t;
+	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);
 }
 
 
 /* A set of attributes is attached to each trace set, trace and tracefile
-   to store user defined data as needed. */
+	 to store user defined data as needed. */
 
 LttvAttribute *lttv_traceset_attribute(LttvTraceset *s) 
 {
-  return s->a;
+	return s->a;
 }
 
 
 LttvAttribute *lttv_trace_attribute(LttvTrace *t)
 {
-  return t->a;
+	return t->a;
 }
 
-
+#ifdef BABEL_CLEANUP
 LttTrace *lttv_trace(LttvTrace *t)
 {
-  return t->t;
+	return t->t;
+}
+#endif
+
+gint lttv_trace_get_id(LttvTrace *t)
+{
+  return t->id;
 }
 
 guint lttv_trace_get_ref_number(LttvTrace * t)
 {
-  return t->ref_count;
+	// todo mdenis: adapt to babeltrace
+	return t->ref_count;
 }
 
 guint lttv_trace_ref(LttvTrace * t)
 {
-  t->ref_count++;
-  
-  return t->ref_count;
+	t->ref_count++;
+
+	return t->ref_count;
 }
 
 guint lttv_trace_unref(LttvTrace * t)
 {
-  if(likely(t->ref_count > 0))
-    t->ref_count--;
+	if(likely(t->ref_count > 0))
+		t->ref_count--;
 
-  return t->ref_count;
+	return t->ref_count;
 }