X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=83f300c5d9b2fa7635614fa477b173621f6a68b2;hp=099a9fa6d62ea50b17164f523573cb9648ca8070;hb=05cab52530332c97aca9d8c78a8cae2f82f00896;hpb=f133896d405417ba90ac250d243d4b8e539e98f1

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 099a9fa6..83f300c5 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #define _GNU_SOURCE
@@ -47,14 +55,20 @@
 #define PARTIAL_ERROR_SLEEP	3	/* 3 seconds */
 
 #define DEFAULT_FILE_ARRAY_SIZE	1
+
 static char *opt_input_format, *opt_output_format;
-/* Pointer into const argv */
-static const char *opt_input_format_arg, *opt_output_format_arg;
 
+/*
+ * We are not freeing opt_input_paths ipath elements when exiting from
+ * main() for backward compatibility with libpop 0.13, which does not
+ * allocate copies for arguments returned by poptGetArg(), and for
+ * general compatibility with the documented behavior. This is known to
+ * cause a small memory leak with libpop 0.16.
+ */
 static GPtrArray *opt_input_paths;
-static const char *opt_output_path;
+static char *opt_output_path;
 
-static struct format *fmt_read;
+static struct bt_format *fmt_read;
 
 static
 void strlower(char *str)
@@ -67,6 +81,9 @@ void strlower(char *str)
 
 enum {
 	OPT_NONE = 0,
+	OPT_OUTPUT_PATH,
+	OPT_INPUT_FORMAT,
+	OPT_OUTPUT_FORMAT,
 	OPT_HELP,
 	OPT_LIST,
 	OPT_VERBOSE,
@@ -82,11 +99,19 @@ enum {
 	OPT_CLOCK_FORCE_CORRELATE,
 };
 
+/*
+ * We are _not_ using POPT_ARG_STRING ability to store directly into
+ * variables, because we want to cast the return to non-const, which is
+ * not possible without using poptGetOptArg explicitly. This helps us
+ * controlling memory allocation correctly without making assumptions
+ * about undocumented behaviors. poptGetOptArg is documented as
+ * requiring the returned const char * to be freed by the caller.
+ */
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{ "output", 'w', POPT_ARG_STRING, &opt_output_path, OPT_NONE, NULL, NULL },
-	{ "input-format", 'i', POPT_ARG_STRING, &opt_input_format_arg, OPT_NONE, NULL, NULL },
-	{ "output-format", 'o', POPT_ARG_STRING, &opt_output_format_arg, OPT_NONE, NULL, NULL },
+	{ "output", 'w', POPT_ARG_STRING, NULL, OPT_OUTPUT_PATH, NULL, NULL },
+	{ "input-format", 'i', POPT_ARG_STRING, NULL, OPT_INPUT_FORMAT, NULL, NULL },
+	{ "output-format", 'o', POPT_ARG_STRING, NULL, OPT_OUTPUT_FORMAT, NULL, NULL },
 	{ "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
 	{ "list", 'l', POPT_ARG_NONE, NULL, OPT_LIST, NULL, NULL },
 	{ "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
@@ -151,6 +176,7 @@ static void usage(FILE *fp)
 static int get_names_args(poptContext *pc)
 {
 	char *str, *strlist, *strctx;
+	int ret = 0;
 
 	opt_payload_field_names = 0;
 	opt_context_field_names = 0;
@@ -178,15 +204,19 @@ static int get_names_args(poptContext *pc)
 			opt_payload_field_names = 0;
 		} else {
 			fprintf(stderr, "[error] unknown field name type %s\n", str);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto end;
 		}
 	} while ((str = strtok_r(NULL, ",", &strctx)));
-	return 0;
+end:
+	free(strlist);
+	return ret;
 }
 
 static int get_fields_args(poptContext *pc)
 {
 	char *str, *strlist, *strctx;
+	int ret = 0;
 
 	strlist = (char *) poptGetOptArg(*pc);
 	if (!strlist) {
@@ -215,10 +245,13 @@ static int get_fields_args(poptContext *pc)
 			opt_callsite_field = 1;
 		else {
 			fprintf(stderr, "[error] unknown field type %s\n", str);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto end;
 		}
 	} while ((str = strtok_r(NULL, ",", &strctx)));
-	return 0;
+end:
+	free(strlist);
+	return ret;
 }
 
 /*
@@ -245,6 +278,27 @@ static int parse_options(int argc, char **argv)
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
+		case OPT_OUTPUT_PATH:
+			opt_output_path = (char *) poptGetOptArg(pc);
+			if (!opt_output_path) {
+				ret = -EINVAL;
+				goto end;
+			}
+			break;
+		case OPT_INPUT_FORMAT:
+			opt_input_format = (char *) poptGetOptArg(pc);
+			if (!opt_input_format) {
+				ret = -EINVAL;
+				goto end;
+			}
+			break;
+		case OPT_OUTPUT_FORMAT:
+			opt_output_format = (char *) poptGetOptArg(pc);
+			if (!opt_output_format) {
+				ret = -EINVAL;
+				goto end;
+			}
+			break;
 		case OPT_HELP:
 			usage(stdout);
 			ret = 1;	/* exit cleanly */
@@ -279,10 +333,10 @@ static int parse_options(int argc, char **argv)
 			break;
 		case OPT_CLOCK_OFFSET:
 		{
-			const char *str;
+			char *str;
 			char *endptr;
 
-			str = poptGetOptArg(pc);
+			str = (char *) poptGetOptArg(pc);
 			if (!str) {
 				fprintf(stderr, "[error] Missing --clock-offset argument\n");
 				ret = -EINVAL;
@@ -293,8 +347,10 @@ static int parse_options(int argc, char **argv)
 			if (*endptr != '\0' || str == endptr || errno != 0) {
 				fprintf(stderr, "[error] Incorrect --clock-offset argument: %s\n", str);
 				ret = -EINVAL;
+				free(str);
 				goto end;
 			}
+			free(str);
 			break;
 		}
 		case OPT_CLOCK_SECONDS:
@@ -389,6 +445,7 @@ static int traverse_trace_dir(const char *fpath, const struct stat *sb,
 
 	return 0;
 }
+
 /*
  * bt_context_add_traces_recursive: Open a trace recursively
  *
@@ -403,13 +460,12 @@ static int traverse_trace_dir(const char *fpath, const struct stat *sb,
  */
 int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		const char *format_str,
-		void (*packet_seek)(struct stream_pos *pos,
+		void (*packet_seek)(struct bt_stream_pos *pos,
 			size_t offset, int whence))
 {
 
 	GArray *trace_ids;
 	int ret = 0;
-	int i;
 
 	/* Should lock traversed_paths mutex here if used in multithread */
 
@@ -420,6 +476,8 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 
 	/* Process the array if ntfw did not return a fatal error */
 	if (ret >= 0) {
+		int i;
+
 		for (i = 0; i < traversed_paths->len; i++) {
 			GString *trace_path = g_ptr_array_index(traversed_paths,
 								i);
@@ -440,6 +498,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 			g_string_free(trace_path, TRUE);
 		}
 	}
+
 	g_ptr_array_free(traversed_paths, TRUE);
 	traversed_paths = NULL;
 
@@ -456,7 +515,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 	return ret;
 }
 
-int convert_trace(struct trace_descriptor *td_write,
+int convert_trace(struct bt_trace_descriptor *td_write,
 		  struct bt_context *ctx)
 {
 	struct bt_ctf_iter *iter;
@@ -495,8 +554,8 @@ error_iter:
 int main(int argc, char **argv)
 {
 	int ret, partial_error = 0, open_success = 0;
-	struct format *fmt_write;
-	struct trace_descriptor *td_write;
+	struct bt_format *fmt_write;
+	struct bt_trace_descriptor *td_write;
 	struct bt_context *ctx;
 	int i;
 
@@ -515,22 +574,10 @@ int main(int argc, char **argv)
 	printf_verbose("Verbose mode active.\n");
 	printf_debug("Debug mode active.\n");
 
-	if (opt_input_format_arg) {
-		opt_input_format = strdup(opt_input_format_arg);
-		if (!opt_input_format) {
-			partial_error = 1;
-			goto end;
-		}
+	if (opt_input_format)
 		strlower(opt_input_format);
-	}
-	if (opt_output_format_arg) {
-		opt_output_format = strdup(opt_output_format_arg);
-		if (!opt_output_format) {
-			partial_error = 1;
-			goto end;
-		}
+	if (opt_output_format)
 		strlower(opt_output_format);
-	}
 
 	printf_verbose("Converting from directory(ies):\n");
 	for (i = 0; i < opt_input_paths->len; i++) {
@@ -559,7 +606,7 @@ int main(int argc, char **argv)
 		}
 	}
 	fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format));
-	if (!fmt_read) {
+	if (!fmt_read || fmt_read->name != g_quark_from_static_string("ctf")) {
 		fprintf(stderr, "[error] Format \"%s\" is not supported.\n\n",
 			opt_input_format);
 		partial_error = 1;
@@ -638,6 +685,7 @@ error_td_read:
 end:
 	free(opt_input_format);
 	free(opt_output_format);
+	free(opt_output_path);
 	g_ptr_array_free(opt_input_paths, TRUE);
 	if (partial_error)
 		exit(EXIT_FAILURE);