projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't perform unaligned integer read/writes
[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..9d5123a1fdb5a43c19c4ee0d425f07810eb07524 100644
(file)
--- a/
formats/ctf-text/ctf-text.c
+++ b/
formats/ctf-text/ctf-text.c
@@
-262,13
+262,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
+309,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
+556,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
+576,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.024197 seconds
and
4
git commands to generate.