projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add test traces
[babeltrace.git]
/
converter
/
babeltrace.c
diff --git
a/converter/babeltrace.c
b/converter/babeltrace.c
index b603dee53e22a555b0f7b94c9dda7e3651c71ddf..cc7eabc40264b61324e47099f7d5d7e9f6f2d178 100644
(file)
--- a/
converter/babeltrace.c
+++ b/
converter/babeltrace.c
@@
-69,7
+69,8
@@
static void list_formats(FILE *fp)
static void usage(FILE *fp)
{
static void usage(FILE *fp)
{
- fprintf(fp, "Babeltrace %u.%u\n\n", BABELTRACE_VERSION_MAJOR,
+ fprintf(fp, "BabelTrace Trace Converter %u.%u\n\n",
+ BABELTRACE_VERSION_MAJOR,
BABELTRACE_VERSION_MINOR);
fprintf(fp, "usage : babeltrace [OPTIONS] INPUT OUTPUT\n");
fprintf(fp, "\n");
BABELTRACE_VERSION_MINOR);
fprintf(fp, "usage : babeltrace [OPTIONS] INPUT OUTPUT\n");
fprintf(fp, "\n");
@@
-96,6
+97,11
@@
static int parse_options(int argc, char **argv)
poptContext pc;
int opt, ret = 0;
poptContext pc;
int opt, ret = 0;
+ if (argc == 1) {
+ usage(stdout);
+ return 1; /* exit cleanly */
+ }
+
pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
@@
-127,10
+133,6
@@
static int parse_options(int argc, char **argv)
goto end;
}
opt_output_path = poptGetArg(pc);
goto end;
}
opt_output_path = poptGetArg(pc);
- if (!opt_output_path) {
- ret = -EINVAL;
- goto end;
- }
end:
if (pc) {
poptFreeContext(pc);
end:
if (pc) {
poptFreeContext(pc);
@@
-162,19
+164,19
@@
int main(int argc, char **argv)
printf_verbose("Converting from file: %s\n", opt_input_path);
printf_verbose("Converting from format: %s\n",
printf_verbose("Converting from file: %s\n", opt_input_path);
printf_verbose("Converting from format: %s\n",
- opt_input_format ? : "<autodetect>");
- printf_verbose("Converting to file: %s\n", opt_output_path);
+ opt_input_format ? : "ctf <default>");
+ printf_verbose("Converting to file: %s\n",
+ opt_output_path ? : "<stdout>");
printf_verbose("Converting to format: %s\n",
printf_verbose("Converting to format: %s\n",
- opt_output_format ? : "
ctf
");
+ opt_output_format ? : "
text <default>
");
- if (!opt_input_format) {
- fprintf(stdout, "Error: input format autodetection not implemented yet.\n\n");
- usage(stdout);
- exit(EXIT_FAILURE);
- }
+ if (!opt_input_format)
+ opt_input_format = "ctf";
+ if (!opt_output_format)
+ opt_output_format = "text";
fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format));
if (!fmt_read) {
fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format));
if (!fmt_read) {
- fprintf(stdout, "
Error: f
ormat \"%s\" is not supported.\n\n",
+ fprintf(stdout, "
[error] F
ormat \"%s\" is not supported.\n\n",
opt_input_format);
exit(EXIT_FAILURE);
}
opt_input_format);
exit(EXIT_FAILURE);
}
@@
-182,14
+184,14
@@
int main(int argc, char **argv)
opt_output_format = "ctf";
fmt_write = bt_lookup_format(g_quark_from_static_string(opt_output_format));
if (!fmt_write) {
opt_output_format = "ctf";
fmt_write = bt_lookup_format(g_quark_from_static_string(opt_output_format));
if (!fmt_write) {
- fprintf(stdout, "
Error:
format \"%s\" is not supported.\n\n",
+ fprintf(stdout, "
[error]
format \"%s\" is not supported.\n\n",
opt_output_format);
exit(EXIT_FAILURE);
}
td_read = fmt_read->open_trace(opt_input_path, O_RDONLY);
if (!td_read) {
opt_output_format);
exit(EXIT_FAILURE);
}
td_read = fmt_read->open_trace(opt_input_path, O_RDONLY);
if (!td_read) {
- fprintf(stdout, "
Error
opening trace \"%s\" for reading.\n\n",
+ fprintf(stdout, "
[error]
opening trace \"%s\" for reading.\n\n",
opt_input_path);
goto error_td_read;
}
opt_input_path);
goto error_td_read;
}
@@
-197,15
+199,22
@@
int main(int argc, char **argv)
td_write = fmt_write->open_trace(opt_output_path, O_WRONLY);
if (!td_write) {
fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
td_write = fmt_write->open_trace(opt_output_path, O_WRONLY);
if (!td_write) {
fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
- opt_output_path);
+ opt_output_path
? : "<none>"
);
goto error_td_write;
}
goto error_td_write;
}
+ ret = convert_trace(td_write, td_read);
+ if (ret) {
+ fprintf(stdout, "Error printing trace.\n\n");
+ goto error_copy_trace;
+ }
+
fmt_write->close_trace(td_write);
fmt_read->close_trace(td_read);
exit(EXIT_SUCCESS);
/* Error handling */
fmt_write->close_trace(td_write);
fmt_read->close_trace(td_read);
exit(EXIT_SUCCESS);
/* Error handling */
+error_copy_trace:
fmt_write->close_trace(td_write);
error_td_write:
fmt_read->close_trace(td_read);
fmt_write->close_trace(td_write);
error_td_write:
fmt_read->close_trace(td_read);
This page took
0.025289 seconds
and
4
git commands to generate.