projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle negative time and offset from Epoch
[babeltrace.git]
/
formats
/
ctf-text
/
ctf-text.c
diff --git
a/formats/ctf-text/ctf-text.c
b/formats/ctf-text/ctf-text.c
index a508cf68b9fe664be39bea14c59d327dfe9902a6..9b1d2b4d6c9352324f5691f1c84fe0b048393d4d 100644
(file)
--- a/
formats/ctf-text/ctf-text.c
+++ b/
formats/ctf-text/ctf-text.c
@@
-42,7
+42,7
@@
#include <unistd.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdlib.h>
-#define NSEC_PER_SEC 1000000000
U
LL
+#define NSEC_PER_SEC 1000000000LL
int opt_all_field_names,
opt_scope_field_names,
int opt_all_field_names,
opt_scope_field_names,
@@
-115,7
+115,8
@@
static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
- Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+ Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+ Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
static
void __attribute__((constructor)) init_quarks(void)
static
void __attribute__((constructor)) init_quarks(void)
@@
-125,6
+126,7
@@
void __attribute__((constructor)) init_quarks(void)
Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED = g_quark_from_static_string("stream.packet.context.events_discarded");
Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE = g_quark_from_static_string("stream.packet.context.content_size");
Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_static_string("stream.packet.context.packet_size");
Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED = g_quark_from_static_string("stream.packet.context.events_discarded");
Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE = g_quark_from_static_string("stream.packet.context.content_size");
Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_static_string("stream.packet.context.packet_size");
+ Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM = g_quark_from_static_string("stream.packet.context.packet_seq_num");
}
static
}
static
@@
-152,6
+154,8
@@
int print_field(struct bt_definition *definition)
return 0;
if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
return 0;
return 0;
if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
return 0;
+ if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+ return 0;
return 1;
}
return 1;
}
@@
-262,13
+266,6
@@
int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
return -EINVAL;
}
return -EINVAL;
}
- /* Print events discarded */
- if (stream->events_discarded) {
- fflush(pos->fp);
- ctf_print_discarded(stderr, stream, 0);
- stream->events_discarded = 0;
- }
-
if (stream->has_timestamp) {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names)
if (stream->has_timestamp) {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names)
@@
-316,12
+313,12
@@
int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
pos->last_cycles_timestamp = stream->cycles_timestamp;
}
pos->last_cycles_timestamp = stream->cycles_timestamp;
}
- if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
+ if ((opt_trace_field || opt_all_fields) && stream_class->trace->pa
rent.pa
th[0] != '\0') {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace = ");
}
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace = ");
}
- fprintf(pos->fp, "%s", stream_class->trace->path);
+ fprintf(pos->fp, "%s", stream_class->trace->pa
rent.pa
th);
if (pos->print_names)
fprintf(pos->fp, ", ");
else
if (pos->print_names)
fprintf(pos->fp, ", ");
else
@@
-563,6
+560,7
@@
struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags,
pos->parent.event_cb = ctf_text_write_event;
pos->parent.trace = &pos->trace_descriptor;
pos->print_names = 0;
pos->parent.event_cb = ctf_text_write_event;
pos->parent.trace = &pos->trace_descriptor;
pos->print_names = 0;
+ babeltrace_ctf_console_output++;
break;
case O_RDONLY:
default:
break;
case O_RDONLY:
default:
@@
-582,6
+580,8
@@
int ctf_text_close_trace(struct bt_trace_descriptor *td)
int ret;
struct ctf_text_stream_pos *pos =
container_of(td, struct ctf_text_stream_pos, trace_descriptor);
int ret;
struct ctf_text_stream_pos *pos =
container_of(td, struct ctf_text_stream_pos, trace_descriptor);
+
+ babeltrace_ctf_console_output--;
if (pos->fp != stdout) {
ret = fclose(pos->fp);
if (ret) {
if (pos->fp != stdout) {
ret = fclose(pos->fp);
if (ret) {
This page took
0.030454 seconds
and
4
git commands to generate.