#include "metadata/ctf-ast.h"
#include "events-private.h"
#include <babeltrace/compat/memstream.h>
+#include <babeltrace/compat/fcntl.h>
#define LOG2_CHAR_BIT 3
extern int yydebug;
+/*
+ * TODO: babeltrace_ctf_console_output ensures that we only print
+ * discarded events when ctf-text plugin is used. Should be cleaned up
+ * with the plugin system redesign.
+ */
+int babeltrace_ctf_console_output;
+
static
struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags,
void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
uint64_t oldval, newval, updateval;
if (unlikely(integer_declaration->len == 64)) {
- stream->prev_cycles_timestamp = stream->cycles_timestamp;
stream->cycles_timestamp = integer_definition->value._unsigned;
- stream->prev_real_timestamp = ctf_get_real_timestamp(stream,
- stream->prev_cycles_timestamp);
stream->real_timestamp = ctf_get_real_timestamp(stream,
stream->cycles_timestamp);
return;
updateval = stream->cycles_timestamp;
updateval &= ~((1ULL << integer_declaration->len) - 1);
updateval += newval;
- stream->prev_cycles_timestamp = stream->cycles_timestamp;
stream->cycles_timestamp = updateval;
/* convert to real timestamp */
- stream->prev_real_timestamp = ctf_get_real_timestamp(stream,
- stream->prev_cycles_timestamp);
stream->real_timestamp = ctf_get_real_timestamp(stream,
stream->cycles_timestamp);
}
fprintf(fp, "%x", (unsigned int) uuid[i]);
}
-void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream,
- int end_stream)
+/*
+ * Discarded events can be either:
+ * - discarded after end of previous buffer due to buffer full:
+ * happened within range: [ prev_timestamp_end, timestamp_begin ]
+ * - discarded within current buffer due to either event too large or
+ * nested wrap-around:
+ * happened within range: [ timestamp_begin, timestamp_end ]
+ *
+ * Given we have discarded counters of those two types merged into the
+ * events_discarded counter, we need to use the union of those ranges:
+ * [ prev_timestamp_end, timestamp_end ]
+ */
+static
+void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream)
{
- fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events %sbetween [",
- stream->events_discarded,
- end_stream ? "at end of stream " : "");
+ if (!stream->events_discarded || !babeltrace_ctf_console_output) {
+ return;
+ }
+ fflush(stdout);
+ fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events between [",
+ stream->events_discarded);
if (opt_clock_cycles) {
ctf_print_timestamp(fp, stream,
- stream->prev_cycles_timestamp);
+ stream->prev.cycles.end);
fprintf(fp, "] and [");
ctf_print_timestamp(fp, stream,
- stream->prev_cycles_timestamp_end);
+ stream->current.cycles.end);
} else {
ctf_print_timestamp(fp, stream,
- stream->prev_real_timestamp);
+ stream->prev.real.end);
fprintf(fp, "] and [");
ctf_print_timestamp(fp, stream,
- stream->prev_real_timestamp_end);
+ stream->current.real.end);
}
fprintf(fp, "] in trace UUID ");
print_uuid(fp, stream->stream_class->trace->uuid);
pos->parent.trace = trace;
break;
case O_RDWR:
- pos->prot = PROT_WRITE; /* Write has priority */
+ pos->prot = PROT_READ | PROT_WRITE;
pos->flags = MAP_SHARED;
pos->parent.rw_table = write_dispatch_table;
pos->parent.event_cb = ctf_write_event;
int ctf_fini_pos(struct ctf_stream_pos *pos)
{
- if (pos->prot == PROT_WRITE && pos->content_size_loc)
+ if ((pos->prot & PROT_WRITE) && pos->content_size_loc)
*pos->content_size_loc = pos->offset;
if (pos->base_mma) {
int ret;
uint64_t events_discarded_diff;
/* Update packet index time information */
- stream->prev_cycles_timestamp_end =
- cur_index->ts_cycles.timestamp_end;
- stream->prev_cycles_timestamp =
+
+ /* Current packet begin/end */
+ stream->current.real.begin =
+ cur_index->ts_real.timestamp_begin;
+ stream->current.cycles.begin =
cur_index->ts_cycles.timestamp_begin;
- stream->prev_real_timestamp_end =
+ stream->current.real.end =
cur_index->ts_real.timestamp_end;
- stream->prev_real_timestamp =
- cur_index->ts_real.timestamp_begin;
-
- stream->prev_real_timestamp =
- stream->real_timestamp;
- stream->prev_cycles_timestamp =
- stream->cycles_timestamp;
+ stream->current.cycles.end =
+ cur_index->ts_cycles.timestamp_end;
/* Update packet index discarded event information */
events_discarded_diff = cur_index->events_discarded;
if (prev_index) {
+ /* Previous packet begin/end */
+ stream->prev.cycles.begin =
+ prev_index->ts_cycles.timestamp_begin;
+ stream->prev.real.begin =
+ prev_index->ts_real.timestamp_begin;
+ stream->prev.cycles.end =
+ prev_index->ts_cycles.timestamp_end;
+ stream->prev.real.end =
+ prev_index->ts_real.timestamp_end;
+
events_discarded_diff -= prev_index->events_discarded;
/*
* Deal with 32-bit wrap-around if the tracer provided a
if (prev_index->events_discarded_len == 32) {
events_discarded_diff = (uint32_t) events_discarded_diff;
}
+ } else {
+ /*
+ * First packet: use current packet info as limits for
+ * previous packet.
+ */
+ stream->prev.cycles.begin =
+ stream->prev.cycles.end =
+ stream->current.cycles.begin;
+ stream->prev.real.begin =
+ stream->prev.real.end =
+ stream->current.real.begin;
}
stream->events_discarded = events_discarded_diff;
}
struct ctf_file_stream *file_stream =
container_of(pos, struct ctf_file_stream, pos);
int ret;
- off_t off;
- struct packet_index *packet_index;
+ struct packet_index *packet_index, *prev_index;
switch (whence) {
case SEEK_CUR:
assert(0);
}
- if (pos->prot == PROT_WRITE && pos->content_size_loc)
+ if ((pos->prot & PROT_WRITE) && pos->content_size_loc)
*pos->content_size_loc = pos->offset;
if (pos->base_mma) {
* The caller should never ask for ctf_move_pos across packets,
* except to get exactly at the beginning of the next packet.
*/
- if (pos->prot == PROT_WRITE) {
+ if (pos->prot & PROT_WRITE) {
switch (whence) {
case SEEK_CUR:
/* The writer will add padding */
}
pos->content_size = -1U; /* Unknown at this point */
pos->packet_size = WRITE_PACKET_LEN;
- off = posix_fallocate(pos->fd, pos->mmap_offset,
- pos->packet_size / CHAR_BIT);
- assert(off >= 0);
+ do {
+ ret = bt_posix_fallocate(pos->fd, pos->mmap_offset,
+ pos->packet_size / CHAR_BIT);
+ } while (ret == EINTR);
+ assert(ret == 0);
pos->offset = 0;
} else {
read_next_packet:
switch (whence) {
case SEEK_CUR:
{
- struct packet_index *prev_index = NULL;
-
if (pos->offset == EOF) {
return;
}
assert(pos->cur_index < pos->packet_index->len);
- packet_index = &g_array_index(pos->packet_index,
- struct packet_index, pos->cur_index);
- if (pos->cur_index > 0) {
- prev_index = &g_array_index(pos->packet_index,
- struct packet_index,
- pos->cur_index - 1);
- }
- ctf_update_current_packet_index(&file_stream->parent,
- prev_index, packet_index);
-
/* The reader will expect us to skip padding */
++pos->cur_index;
break;
pos->offset = EOF;
return;
}
- packet_index = &g_array_index(pos->packet_index,
- struct packet_index, index);
- pos->last_events_discarded = packet_index->events_discarded;
pos->cur_index = index;
- file_stream->parent.prev_real_timestamp = 0;
- file_stream->parent.prev_real_timestamp_end = 0;
- file_stream->parent.prev_cycles_timestamp = 0;
- file_stream->parent.prev_cycles_timestamp_end = 0;
break;
default:
assert(0);
}
+
if (pos->cur_index >= pos->packet_index->len) {
- /*
- * We need to check if we are in trace read or
- * called from packet indexing. In this last
- * case, the collection is not there, so we
- * cannot print the timestamps.
- */
- if ((&file_stream->parent)->stream_class->trace->parent.collection) {
- /*
- * When a stream reaches the end of the
- * file, we need to show the number of
- * events discarded ourselves, because
- * there is no next event scheduled to
- * be printed in the output.
- */
- if (file_stream->parent.events_discarded) {
- fflush(stdout);
- ctf_print_discarded(stderr,
- &file_stream->parent,
- 1);
- file_stream->parent.events_discarded = 0;
- }
- }
pos->offset = EOF;
return;
}
+
+ packet_index = &g_array_index(pos->packet_index,
+ struct packet_index, pos->cur_index);
+ if (pos->cur_index > 0) {
+ prev_index = &g_array_index(pos->packet_index,
+ struct packet_index,
+ pos->cur_index - 1);
+ } else {
+ prev_index = NULL;
+ }
+ ctf_update_current_packet_index(&file_stream->parent,
+ prev_index, packet_index);
+
+ /*
+ * We need to check if we are in trace read or called
+ * from packet indexing. In this last case, the
+ * collection is not there, so we cannot print the
+ * timestamps.
+ */
+ if ((&file_stream->parent)->stream_class->trace->parent.collection) {
+ ctf_print_discarded(stderr, &file_stream->parent);
+ }
+
packet_index = &g_array_index(pos->packet_index,
struct packet_index,
pos->cur_index);
}
/* update trace_packet_header and stream_packet_context */
- if (pos->prot != PROT_WRITE && file_stream->parent.trace_packet_header) {
+ if (!(pos->prot & PROT_WRITE) &&
+ file_stream->parent.trace_packet_header) {
/* Read packet header */
ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p);
assert(!ret);
}
- if (pos->prot != PROT_WRITE && file_stream->parent.stream_packet_context) {
+ if (!(pos->prot & PROT_WRITE) &&
+ file_stream->parent.stream_packet_context) {
/* Read packet context */
ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);
assert(!ret);
memcpy(td->uuid, header.uuid, sizeof(header.uuid));
CTF_TRACE_SET_FIELD(td, uuid);
} else {
- if (babeltrace_uuid_compare(header.uuid, td->uuid))
+ if (bt_uuid_compare(header.uuid, td->uuid))
return -EINVAL;
}
if (packet_metadata(td, fp)) {
ret = ctf_trace_metadata_stream_read(td, &fp, &buf);
if (ret) {
- /* Warn about empty metadata */
- fprintf(stderr, "[warning] Empty metadata.\n");
goto end;
}
td->metadata_string = buf;
elem = bt_array_index(defarray, i);
uuidval[i] = bt_get_unsigned_int(elem);
}
- ret = babeltrace_uuid_compare(td->uuid, uuidval);
+ ret = bt_uuid_compare(td->uuid, uuidval);
if (ret) {
fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
return -EINVAL;
goto error;
}
if (be32toh(index_hdr.index_major) != CTF_INDEX_MAJOR) {
- fprintf(stderr, "[error] Incompatible index file %" PRIu64
- ".%" PRIu64 ", supported %d.%d\n",
- be64toh(index_hdr.index_major),
- be64toh(index_hdr.index_minor), CTF_INDEX_MAJOR,
+ fprintf(stderr, "[error] Incompatible index file %" PRIu32
+ ".%" PRIu32 ", supported %d.%d\n",
+ be32toh(index_hdr.index_major),
+ be32toh(index_hdr.index_minor), CTF_INDEX_MAJOR,
CTF_INDEX_MINOR);
ret = -1;
goto error;
ret = 0;
goto fd_is_dir_ok;
}
+ if (!statbuf.st_size) {
+ /** Skip empty files. */
+ ret = 0;
+ goto fd_is_empty_file;
+ }
file_stream = g_new0(struct ctf_file_stream, 1);
file_stream->pos.last_offset = LAST_OFFSET_POISON;
index_name = malloc((strlen(path) + sizeof(INDEX_PATH)) * sizeof(char));
if (!index_name) {
fprintf(stderr, "[error] Cannot allocate index filename\n");
+ ret = -ENOMEM;
goto error_def;
}
snprintf(index_name, strlen(path) + sizeof(INDEX_PATH),
INDEX_PATH, path);
- if (faccessat(td->dirfd, index_name, O_RDONLY, flags) < 0) {
+ if (bt_faccessat(td->dirfd, td->parent.path, index_name, O_RDONLY, 0) < 0) {
ret = create_stream_packet_index(td, file_stream);
if (ret) {
fprintf(stderr, "[error] Stream index creation error.\n");
fprintf(stderr, "Error on ctf_fini_pos\n");
}
g_free(file_stream);
+fd_is_empty_file:
fd_is_dir_ok:
fstat_error:
closeret = close(fd);
ret = ctf_trace_metadata_read(td, metadata_fp, scanner, 0);
ctf_scanner_free(scanner);
if (ret) {
+ if (ret == -ENOENT) {
+ fprintf(stderr, "[warning] Empty metadata.\n");
+ }
fprintf(stderr, "[warning] Unable to open trace metadata for path \"%s\".\n", path);
goto error_metadata;
}
static
int prepare_mmap_stream_definition(struct ctf_trace *td,
- struct ctf_file_stream *file_stream)
+ struct ctf_file_stream *file_stream,
+ void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
+ int whence))
{
struct ctf_stream_declaration *stream;
- uint64_t stream_id = 0;
+ uint64_t stream_id;
int ret;
- file_stream->parent.stream_id = stream_id;
+ /* Ask for the first packet to get the stream_id. */
+ packet_seek(&file_stream->pos.parent, 0, SEEK_SET);
+ stream_id = file_stream->parent.stream_id;
if (stream_id >= td->streams->len) {
fprintf(stderr, "[error] Stream %" PRIu64 " is not declared "
"in metadata.\n", stream_id);
struct ctf_file_stream *file_stream;
file_stream = g_new0(struct ctf_file_stream, 1);
+ file_stream->parent.stream_id = -1ULL;
file_stream->pos.last_offset = LAST_OFFSET_POISON;
ctf_init_mmap_pos(&file_stream->pos, mmap_info);
goto error_def;
}
- ret = prepare_mmap_stream_definition(td, file_stream);
+ ret = prepare_mmap_stream_definition(td, file_stream, packet_seek);
if (ret)
goto error_index;
}
ret = ctf_trace_metadata_read(td, metadata_fp, td->scanner, 0);
if (ret) {
+ if (ret == -ENOENT) {
+ fprintf(stderr, "[warning] Empty metadata.\n");
+ }
goto error;
}
projects / babeltrace.git / blobdiff