From: mdenis <mathieu.denis@polymtl.ca>
Date: Wed, 4 Apr 2012 16:45:12 +0000 (-0400)
Subject: Traverse a path recursively to add all traces within
X-Git-Tag: v1.5-beta1~74
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3685e022fa515d5d17a4b8a81fa596408d0cd4ab;p=lttv.git

Traverse a path recursively to add all traces within

Signed-off-by: Mathieu Denis <mathieu.denis@polymtl.ca>
Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
---

diff --git a/lttv/lttv/traceset.c b/lttv/lttv/traceset.c
index 16487a11..35c84395 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,
@@ -232,11 +237,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) 
diff --git a/lttv/lttv/traceset.h b/lttv/lttv/traceset.h
index 9d626876..63b1df97 100644
--- a/lttv/lttv/traceset.h
+++ b/lttv/lttv/traceset.h
@@ -85,18 +85,16 @@ void lttv_traceset_destroy(LttvTraceset *s);
 void lttv_traceset_add(LttvTraceset *s, LttvTrace *t);
 
 /*
- * lttv_traceset_add_path : Add all traces recursively to a traceset
+ * lttv_trace_create : Add all traces recursively to a traceset from a path
  *
  * ts is the traceset in which will be contained the traces
  *
- * path is a path to a trace(s). It cannot be NULL and it is not parse
- * recursively.
- * todo mdenis: implement algorithm to go through all folders recursively to
- * find all traces in the path
+ * trace_path is the path where to find a set of trace.
+ * Traverse the path recursively to add all traces within.
  *
- * @return 0 on success, -1 on failure
+ * return 0 on success or a negative integer on failure
  */
-int lttv_traceset_add_path(LttvTraceset *ts, const char *path);
+int lttv_traceset_add_path(LttvTraceset *ts, char *path);
 
 unsigned lttv_traceset_number(LttvTraceset *s);
 
diff --git a/lttv/modules/text/batchAnalysis.c b/lttv/modules/text/batchAnalysis.c
index c830509c..cfd2bab7 100644
--- a/lttv/modules/text/batchAnalysis.c
+++ b/lttv/modules/text/batchAnalysis.c
@@ -78,7 +78,7 @@ void lttv_trace_option(void *hook_data)
   lttv_traceset_add(traceset, lttv_trace_new(trace));*/
 
   if(lttv_traceset_add_path(traceset, trace_path) < 0) {
-    printf("Cannot add trace %s", trace_path);
+    g_error("Cannot add trace %s", trace_path);
   }
 }