X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=c521ac1516c459641b24ec476f4c425ad09fcfe4;hp=2fd371c396a9f218c575eaaff704ca2571f33656;hb=37566b71e5598181de2ecdb390a8cab19786f4e1;hpb=65923160260ca0d5928db5d8840e76576cb429c4

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 2fd371c3..c521ac15 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -26,8 +26,6 @@
  * SOFTWARE.
  */
 
-#define _GNU_SOURCE
-#include <config.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/format.h>
 #include <babeltrace/context.h>
@@ -57,6 +55,10 @@
 
 #define DEFAULT_FILE_ARRAY_SIZE	1
 
+#define NET_URL_PREFIX	"net://"
+#define NET4_URL_PREFIX	"net4://"
+#define NET6_URL_PREFIX	"net6://"
+
 static char *opt_input_format, *opt_output_format;
 
 /*
@@ -451,15 +453,20 @@ static int traverse_trace_dir(const char *fpath, const struct stat *sb,
 		/* No meta data, just return */
 		return 0;
 	} else {
+		int err_close = 0;
+
 		closeret = close(metafd);
 		if (closeret < 0) {
 			perror("close");
-			return -1;	/* failure */
+			err_close = 1;
 		}
 		closeret = close(dirfd);
 		if (closeret < 0) {
 			perror("close");
-			return -1;	/* failure */
+			err_close = 1;
+		}
+		if (err_close) {
+			return -1;
 		}
 
 		/* Add path to the global list */
@@ -490,15 +497,22 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		void (*packet_seek)(struct bt_stream_pos *pos,
 			size_t offset, int whence))
 {
+	int ret = 0, trace_ids = 0;
 
-	GArray *trace_ids;
-	int ret = 0;
-
+	if ((strncmp(path, NET4_URL_PREFIX, sizeof(NET4_URL_PREFIX) - 1)) == 0 ||
+			(strncmp(path, NET6_URL_PREFIX, sizeof(NET6_URL_PREFIX) - 1)) == 0 ||
+			(strncmp(path, NET_URL_PREFIX, sizeof(NET_URL_PREFIX) - 1)) == 0) {
+		ret = bt_context_add_trace(ctx,
+				path, format_str, packet_seek, NULL, NULL);
+		if (ret < 0) {
+			fprintf(stderr, "[warning] [Context] cannot open trace \"%s\" "
+					"for reading.\n", path);
+		}
+		return ret;
+	}
 	/* Should lock traversed_paths mutex here if used in multithread */
 
 	traversed_paths = g_ptr_array_new();
-	trace_ids = g_array_new(FALSE, TRUE, sizeof(int));
-
 	ret = nftw(path, traverse_trace_dir, 10, 0);
 
 	/* Process the array if ntfw did not return a fatal error */
@@ -520,7 +534,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 				/* Allow to skip erroneous traces. */
 				ret = 1;	/* partial error */
 			} else {
-				g_array_append_val(trace_ids, trace_id);
+				trace_ids++;
 			}
 			g_string_free(trace_path, TRUE);
 		}
@@ -534,11 +548,10 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 	/*
 	 * Return an error if no trace can be opened.
 	 */
-	if (trace_ids->len == 0) {
+	if (trace_ids == 0) {
 		fprintf(stderr, "[error] Cannot open any trace for reading.\n\n");
 		ret = -ENOENT;		/* failure */
 	}
-	g_array_free(trace_ids, TRUE);
 	return ret;
 }
 
@@ -697,7 +710,7 @@ int main(int argc, char **argv)
 		}
 	}
 	fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format));
-	if (!fmt_read || fmt_read->name != g_quark_from_static_string("ctf")) {
+	if (!fmt_read) {
 		fprintf(stderr, "[error] Format \"%s\" is not supported.\n\n",
 			opt_input_format);
 		partial_error = 1;
@@ -757,10 +770,13 @@ int main(int argc, char **argv)
 		goto error_copy_trace;
 	}
 
-	ret = convert_trace(td_write, ctx);
-	if (ret) {
-		fprintf(stderr, "Error printing trace.\n\n");
-		goto error_copy_trace;
+	/* For now, we support only CTF iterators */
+	if (fmt_read->name == g_quark_from_static_string("ctf")) {
+		ret = convert_trace(td_write, ctx);
+		if (ret) {
+			fprintf(stderr, "Error printing trace.\n\n");
+			goto error_copy_trace;
+		}
 	}
 
 	ret = trace_post_handler(td_write, ctx);