updateval = stream->timestamp;
updateval &= ~((1ULL << integer_declaration->len) - 1);
updateval += newval;
+ stream->prev_timestamp = stream->timestamp;
stream->timestamp = updateval;
}
}
if (unlikely(id >= stream_class->events_by_id->len)) {
- fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+ fprintf(stderr, "[error] Event id %" PRIu64 " is outside range.\n", id);
return -EINVAL;
}
event = g_ptr_array_index(stream->events_by_id, id);
if (unlikely(!event)) {
- fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+ fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
return -EINVAL;
}
return 0;
error:
- fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
+ fprintf(stderr, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
return ret;
}
}
if (unlikely(id >= stream_class->events_by_id->len)) {
- fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+ fprintf(stderr, "[error] Event id %" PRIu64 " is outside range.\n", id);
return -EINVAL;
}
event = g_ptr_array_index(stream->events_by_id, id);
if (unlikely(!event)) {
- fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+ fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
return -EINVAL;
}
return 0;
error:
- fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
+ fprintf(stderr, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
return ret;
}
/* unmap old base */
ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
if (ret) {
- fprintf(stdout, "[error] Unable to unmap old base: %s.\n",
+ fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
strerror(errno));
assert(0);
}
/* unmap old base */
ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
if (ret) {
- fprintf(stdout, "[error] Unable to unmap old base: %s.\n",
+ fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
strerror(errno));
assert(0);
}
read_next_packet:
switch (whence) {
case SEEK_CUR:
+ {
+ uint32_t events_discarded_diff;
+
+ /* For printing discarded event count */
+ index = &g_array_index(pos->packet_index,
+ struct packet_index, pos->cur_index);
+ events_discarded_diff = index->events_discarded;
+ file_stream->parent.prev_timestamp_end =
+ index->timestamp_end;
+ if (pos->cur_index > 0) {
+ index = &g_array_index(pos->packet_index,
+ struct packet_index,
+ pos->cur_index - 1);
+ events_discarded_diff -= index->events_discarded;
+ }
+ file_stream->parent.events_discarded = events_discarded_diff;
if (pos->offset == EOF)
return;
/* The reader will expect us to skip padding */
assert(pos->offset + offset == pos->content_size);
++pos->cur_index;
+ file_stream->parent.prev_timestamp = file_stream->parent.timestamp;
break;
+ }
case SEEK_SET:
assert(offset == 0); /* only seek supported for now */
pos->cur_index = 0;
+ file_stream->parent.prev_timestamp = 0;
+ file_stream->parent.prev_timestamp_end = 0;
break;
default:
assert(0);
pos->base = mmap(NULL, pos->packet_size / CHAR_BIT, pos->prot,
pos->flags, pos->fd, pos->mmap_offset);
if (pos->base == MAP_FAILED) {
- fprintf(stdout, "[error] mmap error %s.\n",
+ fprintf(stderr, "[error] mmap error %s.\n",
strerror(errno));
assert(0);
}
/* eventually return an error instead of warning */
warning:
- fprintf(stdout, "[warning] Unsupported CTF specification version %u.%u. Trying anyway.\n",
+ fprintf(stderr, "[warning] Unsupported CTF specification version %u.%u. Trying anyway.\n",
major, minor);
return 0;
}
header.packet_size = GUINT32_SWAP_LE_BE(header.packet_size);
}
if (header.checksum)
- fprintf(stdout, "[warning] checksum verification not supported yet.\n");
+ fprintf(stderr, "[warning] checksum verification not supported yet.\n");
if (header.compression_scheme) {
- fprintf(stdout, "[error] compression (%u) not supported yet.\n",
+ fprintf(stderr, "[error] compression (%u) not supported yet.\n",
header.compression_scheme);
return -EINVAL;
}
if (header.encryption_scheme) {
- fprintf(stdout, "[error] encryption (%u) not supported yet.\n",
+ fprintf(stderr, "[error] encryption (%u) not supported yet.\n",
header.encryption_scheme);
return -EINVAL;
}
if (header.checksum_scheme) {
- fprintf(stdout, "[error] checksum (%u) not supported yet.\n",
+ fprintf(stderr, "[error] checksum (%u) not supported yet.\n",
header.checksum_scheme);
return -EINVAL;
}
}
if (babeltrace_debug) {
buf[readlen] = '\0';
- fprintf(stdout, "[debug] metadata packet read: %s\n",
+ fprintf(stderr, "[debug] metadata packet read: %s\n",
buf);
}
toread = (header.packet_size - header.content_size) / CHAR_BIT;
ret = fseek(in, toread, SEEK_CUR);
if (ret < 0) {
- fprintf(stdout, "[warning] Missing padding at end of file\n");
+ fprintf(stderr, "[warning] Missing padding at end of file\n");
ret = 0;
}
return ret;
td->metadata = &metadata_stream->parent;
metadata_stream->pos.fd = openat(td->dirfd, "metadata", O_RDONLY);
if (metadata_stream->pos.fd < 0) {
- fprintf(stdout, "Unable to open metadata.\n");
+ fprintf(stderr, "Unable to open metadata.\n");
return metadata_stream->pos.fd;
}
fp = fdopen(metadata_stream->pos.fd, "r");
if (!fp) {
- fprintf(stdout, "[error] Unable to open metadata stream.\n");
+ fprintf(stderr, "[error] Unable to open metadata stream.\n");
perror("Metadata stream open");
ret = -errno;
goto end_stream;
/* Check text-only metadata header and version */
nr_items = fscanf(fp, "/* CTF %u.%u", &major, &minor);
if (nr_items < 2)
- fprintf(stdout, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n");
+ fprintf(stderr, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n");
if (check_version(major, minor) < 0) {
ret = -EINVAL;
goto end_packet_read;
scanner = ctf_scanner_alloc(fp);
if (!scanner) {
- fprintf(stdout, "[error] Error allocating scanner\n");
+ fprintf(stderr, "[error] Error allocating scanner\n");
ret = -ENOMEM;
goto end_scanner_alloc;
}
ret = ctf_scanner_append_ast(scanner);
if (ret) {
- fprintf(stdout, "[error] Error creating AST\n");
+ fprintf(stderr, "[error] Error creating AST\n");
goto end;
}
if (babeltrace_debug) {
- ret = ctf_visitor_print_xml(stdout, 0, &scanner->ast->root);
+ ret = ctf_visitor_print_xml(stderr, 0, &scanner->ast->root);
if (ret) {
- fprintf(stdout, "[error] Error visiting AST for XML output\n");
+ fprintf(stderr, "[error] Error visiting AST for XML output\n");
goto end;
}
}
- ret = ctf_visitor_semantic_check(stdout, 0, &scanner->ast->root);
+ ret = ctf_visitor_semantic_check(stderr, 0, &scanner->ast->root);
if (ret) {
- fprintf(stdout, "[error] Error in CTF semantic validation %d\n", ret);
+ fprintf(stderr, "[error] Error in CTF semantic validation %d\n", ret);
goto end;
}
- ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root,
+ ret = ctf_visitor_construct_metadata(stderr, 0, &scanner->ast->root,
td, td->byte_order);
if (ret) {
- fprintf(stdout, "[error] Error in CTF metadata constructor %d\n", ret);
+ fprintf(stderr, "[error] Error in CTF metadata constructor %d\n", ret);
goto end;
}
end:
/* unmap old base */
ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
if (ret) {
- fprintf(stdout, "[error] Unable to unmap old base: %s.\n",
+ fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
strerror(errno));
return ret;
}
packet_index.packet_size = 0;
packet_index.timestamp_begin = 0;
packet_index.timestamp_end = 0;
+ packet_index.events_discarded = 0;
/* read and check header, set stream id (and check) */
if (file_stream->parent.trace_packet_header) {
field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
magic = get_unsigned_int(field);
if (magic != CTF_MAGIC) {
- fprintf(stdout, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
+ fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
magic,
file_stream->pos.packet_index->len,
(ssize_t) pos->mmap_offset);
}
ret = uuid_compare(td->uuid, uuidval);
if (ret) {
- fprintf(stdout, "[error] Unique Universal Identifiers do not match.\n");
+ fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
return -EINVAL;
}
}
}
if (!first_packet && file_stream->parent.stream_id != stream_id) {
- fprintf(stdout, "[error] Stream ID is changing within a stream.\n");
+ fprintf(stderr, "[error] Stream ID is changing within a stream.\n");
return -EINVAL;
}
if (first_packet) {
file_stream->parent.stream_id = stream_id;
if (stream_id >= td->streams->len) {
- fprintf(stdout, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
+ fprintf(stderr, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
return -EINVAL;
}
stream = g_ptr_array_index(td->streams, stream_id);
if (!stream) {
- fprintf(stdout, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
+ fprintf(stderr, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
return -EINVAL;
}
file_stream->parent.stream_class = stream;
field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.timestamp_end = get_unsigned_int(field);
}
+
+ /* read events discarded from header */
+ len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
+ if (len_index >= 0) {
+ struct definition *field;
+
+ field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+ packet_index.events_discarded = get_unsigned_int(field);
+ }
} else {
/* Use file size for packet size */
packet_index.content_size = filestats.st_size * CHAR_BIT;
/* Validate content size and packet size values */
if (packet_index.content_size > packet_index.packet_size) {
- fprintf(stdout, "[error] Content size (%zu bits) is larger than packet size (%zu bits).\n",
+ fprintf(stderr, "[error] Content size (%zu bits) is larger than packet size (%zu bits).\n",
packet_index.content_size, packet_index.packet_size);
return -EINVAL;
}
if (packet_index.packet_size > (filestats.st_size - packet_index.offset) * CHAR_BIT) {
- fprintf(stdout, "[error] Packet size (%zu bits) is larger than remaining file size (%zu bits).\n",
+ fprintf(stderr, "[error] Packet size (%zu bits) is larger than remaining file size (%zu bits).\n",
packet_index.content_size, (size_t) (filestats.st_size - packet_index.offset) * CHAR_BIT);
return -EINVAL;
}
struct dirent *dirent;
struct dirent *diriter;
size_t dirent_len;
+ char *respath, *rescolpath;
td->flags = flags;
/* Open trace directory */
td->dir = opendir(path);
if (!td->dir) {
- fprintf(stdout, "[error] Unable to open trace directory.\n");
+ fprintf(stderr, "[error] Unable to open trace directory.\n");
ret = -ENOENT;
goto error;
}
td->dirfd = open(path, 0);
if (td->dirfd < 0) {
- fprintf(stdout, "[error] Unable to open trace directory file descriptor.\n");
+ fprintf(stderr, "[error] Unable to open trace directory file descriptor.\n");
perror("Trace directory open");
ret = -errno;
goto error_dirfd;
}
- strncpy(td->collection_path, collection_path, PATH_MAX);
- td->collection_path[PATH_MAX - 1] = '\0';
- strncpy(td->path, path, PATH_MAX);
- td->path[PATH_MAX - 1] = '\0';
+ rescolpath = realpath(collection_path, td->collection_path);
+ if (!rescolpath) {
+ fprintf(stderr, "[error] collection path resolution failure\n");
+ return -EINVAL;
+ }
+ respath = realpath(path, td->path);
+ if (!respath) {
+ fprintf(stderr, "[error] path resolution failure\n");
+ return -EINVAL;
+ }
init_domain_name(td);
init_proc_name(td);
init_vpid(td);
for (;;) {
ret = readdir_r(td->dir, dirent, &diriter);
if (ret) {
- fprintf(stdout, "[error] Readdir error.\n");
+ fprintf(stderr, "[error] Readdir error.\n");
goto readdir_error;
}
if (!diriter)
continue;
ret = ctf_open_file_stream_read(td, diriter->d_name, flags, move_pos_slow);
if (ret) {
- fprintf(stdout, "[error] Open file stream error.\n");
+ fprintf(stderr, "[error] Open file stream error.\n");
goto readdir_error;
}
}
switch (flags & O_ACCMODE) {
case O_RDONLY:
if (!path) {
- fprintf(stdout, "[error] Path missing for input CTF trace.\n");
+ fprintf(stderr, "[error] Path missing for input CTF trace.\n");
goto error;
}
ret = ctf_open_trace_read(td, collection_path, path, flags, move_pos_slow, metadata_fp);
goto error;
break;
case O_RDWR:
- fprintf(stdout, "[error] Opening CTF traces for output is not supported yet.\n");
+ fprintf(stderr, "[error] Opening CTF traces for output is not supported yet.\n");
goto error;
default:
- fprintf(stdout, "[error] Incorrect open flags.\n");
+ fprintf(stderr, "[error] Incorrect open flags.\n");
goto error;
}
file_stream->parent.stream_id = stream_id;
if (stream_id >= td->streams->len) {
- fprintf(stdout, "[error] Stream %" PRIu64 " is not declared "
+ fprintf(stderr, "[error] Stream %" PRIu64 " is not declared "
"in metadata.\n", stream_id);
ret = -EINVAL;
goto end;
}
stream = g_ptr_array_index(td->streams, stream_id);
if (!stream) {
- fprintf(stdout, "[error] Stream %" PRIu64 " is not declared "
+ fprintf(stderr, "[error] Stream %" PRIu64 " is not declared "
"in metadata.\n", stream_id);
ret = -EINVAL;
goto end;
cds_list_for_each_entry(mmap_info, &mmap_list->head, list) {
ret = ctf_open_mmap_stream_read(td, mmap_info, move_pos_slow);
if (ret) {
- fprintf(stdout, "[error] Open file mmap stream error.\n");
+ fprintf(stderr, "[error] Open file mmap stream error.\n");
goto error;
}
}