projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update help
[babeltrace.git]
/
converter
/
babeltrace.c
diff --git
a/converter/babeltrace.c
b/converter/babeltrace.c
index f872e6dc30ccea4ca06b9f84cae475f4e0a2bb5b..2701a0cd2517661122fec747e6038c3748b87f95 100644
(file)
--- a/
converter/babeltrace.c
+++ b/
converter/babeltrace.c
@@
-24,7
+24,7
@@
#include <babeltrace/format.h>
#include <babeltrace/context.h>
#include <babeltrace/ctf/types.h>
#include <babeltrace/format.h>
#include <babeltrace/context.h>
#include <babeltrace/ctf/types.h>
-#include <
b
abeltrace/ctf-text/types.h>
+#include <abeltrace/ctf-text/types.h>
#include <babeltrace/iterator.h>
#include <popt.h>
#include <errno.h>
#include <babeltrace/iterator.h>
#include <popt.h>
#include <errno.h>
@@
-101,7
+101,7
@@
static void list_formats(FILE *fp)
static void usage(FILE *fp)
{
static void usage(FILE *fp)
{
- fprintf(fp, "BabelTrace Trace Converter %s\n\n", VERSION);
+ fprintf(fp, "BabelTrace Trace
Viewer and
Converter %s\n\n", VERSION);
fprintf(fp, "usage : babeltrace [OPTIONS] INPUT <OUTPUT>\n");
fprintf(fp, "\n");
fprintf(fp, " INPUT Input trace path\n");
fprintf(fp, "usage : babeltrace [OPTIONS] INPUT <OUTPUT>\n");
fprintf(fp, "\n");
fprintf(fp, " INPUT Input trace path\n");
@@
-167,7
+167,6
@@
static int get_fields_args(poptContext *pc)
{
char *str, *strlist, *strctx;
{
char *str, *strlist, *strctx;
- opt_payload_field_names = 0;
strlist = (char *) poptGetOptArg(*pc);
if (!strlist) {
return -EINVAL;
strlist = (char *) poptGetOptArg(*pc);
if (!strlist) {
return -EINVAL;
@@
-482,36
+481,36
@@
error:
int convert_trace(struct trace_descriptor *td_write,
struct bt_context *ctx)
{
int convert_trace(struct trace_descriptor *td_write,
struct bt_context *ctx)
{
- struct b
abeltrace
_iter *iter;
+ struct b
t
_iter *iter;
struct ctf_stream *stream;
struct ctf_stream_event *event;
struct ctf_text_stream_pos *sout;
struct ctf_stream *stream;
struct ctf_stream_event *event;
struct ctf_text_stream_pos *sout;
- struct
trace_collection
_pos begin_pos;
+ struct
bt_iter
_pos begin_pos;
int ret;
sout = container_of(td_write, struct ctf_text_stream_pos,
trace_descriptor);
begin_pos.type = BT_SEEK_BEGIN;
int ret;
sout = container_of(td_write, struct ctf_text_stream_pos,
trace_descriptor);
begin_pos.type = BT_SEEK_BEGIN;
- iter = b
abeltrace
_iter_create(ctx, &begin_pos, NULL);
+ iter = b
t
_iter_create(ctx, &begin_pos, NULL);
if (!iter) {
ret = -1;
goto error_iter;
}
if (!iter) {
ret = -1;
goto error_iter;
}
- while (b
abeltrace
_iter_read_event(iter, &stream, &event) == 0) {
+ while (b
t
_iter_read_event(iter, &stream, &event) == 0) {
ret = sout->parent.event_cb(&sout->parent, stream);
if (ret) {
fprintf(stderr, "[error] Writing event failed.\n");
goto end;
}
ret = sout->parent.event_cb(&sout->parent, stream);
if (ret) {
fprintf(stderr, "[error] Writing event failed.\n");
goto end;
}
- ret = b
abeltrace
_iter_next(iter);
+ ret = b
t
_iter_next(iter);
if (ret < 0)
goto end;
}
ret = 0;
end:
if (ret < 0)
goto end;
}
ret = 0;
end:
- b
abeltrace
_iter_destroy(iter);
+ b
t
_iter_destroy(iter);
error_iter:
return ret;
}
error_iter:
return ret;
}
This page took
0.025929 seconds
and
4
git commands to generate.