From: Julien Desfossez <julien.desfossez@efficios.com>
Date: Thu, 19 Apr 2012 14:56:19 +0000 (-0400)
Subject: backport error handling add_trace_recursive from babeltrace
X-Git-Tag: v0.2~30
X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=commitdiff_plain;h=0d567cf1f52936e1fbabfd5f180072711163a82d;hp=4553b4d1cec894832e19f5702aa33e107e497365

backport error handling add_trace_recursive from babeltrace

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>
---

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 6bd7d67..092ebdf 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -476,7 +476,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 	GArray *trace_ids;
 	char lpath[PATH_MAX];
 	char * const paths[2] = { lpath, NULL };
-	int ret;
+	int ret = -1;
 
 	/*
 	 * Need to copy path, because fts_open can change it.
@@ -532,17 +532,17 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 				node->fts_accpath, format_str,
 				packet_seek, NULL, NULL);
 			if (trace_id < 0) {
-				fprintf(stderr, "[error] [Context] opening trace \"%s\" from %s "
+				fprintf(stderr, "[warning] [Context] opening trace \"%s\" from %s "
 					"for reading.\n", node->fts_accpath, path);
-				ret = trace_id;
-				goto error;
+				/* Allow to skip erroneous traces. */
+				continue;
 			}
 			g_array_append_val(trace_ids, trace_id);
 		}
 	}
 
 	g_array_free(trace_ids, TRUE);
-	return 0;
+	return ret;
 
 error:
 	return ret;