X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Ftraceset.c;h=b4a14384ef80ec42024ef89ee8a6dabf9a64c92a;hb=3d1e7ee596d5eef4a50ff7e77d3617643eca133e;hp=16487a117ff90b86bf7e3675e7d93762e3a480f6;hpb=7a4bdb546094fea3343bfc80e3744ea26a08dd22;p=lttv.git

diff --git a/lttv/lttv/traceset.c b/lttv/lttv/traceset.c
index 16487a11..b4a14384 100644
--- a/lttv/lttv/traceset.c
+++ b/lttv/lttv/traceset.c
@@ -28,6 +28,11 @@
 #include <babeltrace/context.h>
 #include <babeltrace/iterator.h>
 #include <babeltrace/ctf/events.h>
+
+/* To traverse a tree recursively */
+#include <fcntl.h>
+#include <fts.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. 
    A trace set is defined when several traces are to be analyzed together,
@@ -55,7 +60,7 @@ LttvTraceset *lttv_traceset_new(void)
         //                                NULL);
 	s->iter = 0;
         s->event_hooks = lttv_hooks_new();
-
+	s->state_trace_handle_index =  g_ptr_array_new();
 
 
 
@@ -113,7 +118,11 @@ static LttvTrace *lttv_trace_create(LttvTraceset *ts, const char *path)
   new_trace->traceset = ts;
   new_trace->state = g_new(LttvTraceState,1);
   lttv_trace_state_init(new_trace->state,new_trace);
-  ts->tmpState = new_trace->state;
+
+  /* Add the state to the trace_handle to state index */
+  g_ptr_array_set_size(ts->state_trace_handle_index,id+1);
+  g_ptr_array_index(ts->state_trace_handle_index,id) = new_trace->state;
+
   return new_trace;
 }
 
@@ -145,6 +154,7 @@ LttvTraceset *lttv_traceset_copy(LttvTraceset *s_orig)
 	s = g_new(LttvTraceset, 1);
 	s->filename = NULL;
 	s->traces = g_ptr_array_new();
+	s->state_trace_handle_index = g_ptr_array_new();
 	for(i=0;i<s_orig->traces->len;i++)
 	{
 		trace = g_ptr_array_index(s_orig->traces, i);
@@ -152,6 +162,10 @@ LttvTraceset *lttv_traceset_copy(LttvTraceset *s_orig)
 
 		/* WARNING: this is an alias, not a copy. */
 		g_ptr_array_add(s->traces, trace);
+
+		g_ptr_array_set_size(s->state_trace_handle_index,trace->id+1);
+		g_ptr_array_index(s->state_trace_handle_index,trace->id) = trace->state;
+		
 	}
 	s->context = s_orig->context;
 	bt_context_get(s->context);
@@ -232,11 +246,73 @@ 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)
+int lttv_traceset_add_path(LttvTraceset *ts, 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;
+	FTS *tree;
+	FTSENT *node;
+	char * const paths[2] = { trace_path, NULL };
+	int ret = -1;
+
+	tree = fts_open(paths, FTS_NOCHDIR | FTS_LOGICAL, 0);
+	if (tree == NULL) {
+		g_warning("Cannot traverse \"%s\" for reading.\n",
+				trace_path);
+		return ret;
+	}
+
+	int dirfd, metafd;
+	while ((node = fts_read(tree))) {
+
+		if (!(node->fts_info & FTS_D))
+			continue;
+
+		dirfd = open(node->fts_accpath, 0);
+		if (dirfd < 0) {
+			g_warning("Unable to open trace "
+					"directory file descriptor : %s.", node->fts_accpath);
+			ret = dirfd;
+			goto error;
+		}
+
+		// Check if a metadata file exists in the current directory
+		metafd = openat(dirfd, "metadata", O_RDONLY);
+		if (metafd < 0) {
+			ret = close(dirfd);
+			if (ret < 0) {
+				g_warning("Unable to open metadata "
+						"file descriptor : %s.", node->fts_accpath);
+				goto error;
+			}
+		} else {
+			ret = close(metafd);
+			if (ret < 0) {
+				g_warning("Unable to close metadata "
+						"file descriptor : %s.", node->fts_accpath);
+				goto error;
+			}
+			ret = close(dirfd);
+			if (ret < 0) {
+				g_warning("Unable to close trace "
+						"directory file descriptor : %s.", node->fts_accpath);
+				goto error;
+			}
+
+			ret = lttv_traceset_create_trace(ts, node->fts_accpath);
+			if (ret < 0) {
+				g_warning("Opening trace \"%s\" from %s "
+						"for reading.", node->fts_accpath, trace_path);
+				goto error;
+			}
+		}
+	}
+
+error:
+	ret = fts_close(tree);
+	if (ret < 0) {
+		g_warning("Unable to close tree  "
+				"file descriptor : %s.", trace_path);
+	}
+	return ret;
 }
 
 unsigned lttv_traceset_number(LttvTraceset *s) 
@@ -318,19 +394,30 @@ guint lttv_trace_get_num_cpu(LttvTrace *t)
 
 LttvTracesetPosition *lttv_traceset_create_position(LttvTraceset *traceset)
 {
-#warning "TODO"
-	return NULL;
+	LttvTracesetPosition *traceset_pos;
+	
+	traceset_pos = g_new(LttvTracesetPosition, 1);
+
+	/* Check in the new passed */
+	if(traceset_pos == NULL) {
+		return NULL;
+	}
+
+	traceset_pos->iter = traceset->iter;
+	traceset_pos->bt_pos = bt_iter_get_pos(bt_ctf_get_iter(traceset->iter));
+	
+	return traceset_pos;
 }
 
 void lttv_traceset_destroy_position(LttvTracesetPosition *traceset_pos)
 {
-#warning "TODO"
-	return NULL;
+	bt_iter_free_pos(traceset_pos->bt_pos);
+	g_free(traceset_pos);
 }
 
 void lttv_traceset_seek_to_position(LttvTracesetPosition *traceset_pos)
 {
-#warning "TODO"
+	bt_iter_set_pos(traceset_pos->iter, traceset_pos->bt_pos);
 }
 
 guint lttv_traceset_get_cpuid_from_event(LttvEvent *event)