#include <babeltrace/context-internal.h>
#include <babeltrace/compat/uuid.h>
#include <babeltrace/endian.h>
+#include <babeltrace/ctf/ctf-index.h>
#include <inttypes.h>
#include <stdio.h>
#include <sys/mman.h>
#define NSEC_PER_SEC 1000000000ULL
+#define INDEX_PATH "./index/%s.idx"
+
int opt_clock_cycles,
opt_clock_seconds,
opt_clock_date,
parent);
stream_pos = &cfs->pos;
- if (!stream_pos->packet_real_index)
+ if (!stream_pos->packet_index)
goto error;
- if (stream_pos->packet_real_index->len <= 0)
+ if (stream_pos->packet_index->len <= 0)
continue;
+ index = &g_array_index(stream_pos->packet_index,
+ struct packet_index,
+ stream_pos->packet_index->len - 1);
if (type == BT_CLOCK_REAL) {
- index = &g_array_index(stream_pos->packet_real_index,
- struct packet_index,
- stream_pos->packet_real_index->len - 1);
+ if (index->ts_real.timestamp_begin < begin)
+ begin = index->ts_real.timestamp_begin;
} else if (type == BT_CLOCK_CYCLES) {
- index = &g_array_index(stream_pos->packet_cycles_index,
- struct packet_index,
- stream_pos->packet_real_index->len - 1);
-
+ if (index->ts_cycles.timestamp_begin < begin)
+ begin = index->ts_cycles.timestamp_begin;
} else {
goto error;
}
- if (index->timestamp_begin < begin)
- begin = index->timestamp_begin;
}
}
parent);
stream_pos = &cfs->pos;
- if (!stream_pos->packet_real_index)
+ if (!stream_pos->packet_index)
goto error;
- if (stream_pos->packet_real_index->len <= 0)
+ if (stream_pos->packet_index->len <= 0)
continue;
+ index = &g_array_index(stream_pos->packet_index,
+ struct packet_index,
+ stream_pos->packet_index->len - 1);
if (type == BT_CLOCK_REAL) {
- index = &g_array_index(stream_pos->packet_real_index,
- struct packet_index,
- stream_pos->packet_real_index->len - 1);
+ if (index->ts_real.timestamp_end > end)
+ end = index->ts_real.timestamp_end;
} else if (type == BT_CLOCK_CYCLES) {
- index = &g_array_index(stream_pos->packet_cycles_index,
- struct packet_index,
- stream_pos->packet_real_index->len - 1);
-
+ if (index->ts_cycles.timestamp_end > end)
+ end = index->ts_cycles.timestamp_end;
} else {
goto error;
}
- if (index->timestamp_end > end)
- end = index->timestamp_end;
}
}
*/
if (unlikely(pos->offset == EOF))
return EOF;
+
+ /* Stream is inactive for now (live reading). */
+ if (unlikely(pos->content_size == 0))
+ return EAGAIN;
+
+ /*
+ * Packet seeked to by ctf_pos_get_event() only contains
+ * headers, no event. Consider stream as inactive (live
+ * reading).
+ */
+ if (unlikely(pos->data_offset == pos->content_size))
+ return EAGAIN;
+
assert(pos->offset < pos->content_size);
/* Read event header */
goto error;
}
+ if (pos->last_offset == pos->offset) {
+ fprintf(stderr, "[error] Invalid 0 byte event encountered.\n");
+ return -EINVAL;
+ }
+
return 0;
error:
- fprintf(stderr, "[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 packet. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
return ret;
}
return ret;
}
+/*
+ * One side-effect of this function is to unmap pos mmap base if one is
+ * mapped.
+ */
+static
+int find_data_offset(struct ctf_stream_pos *pos,
+ struct ctf_file_stream *file_stream,
+ struct packet_index *packet_index)
+{
+ uint64_t packet_map_len = DEFAULT_HEADER_LEN, tmp_map_len;
+ struct stat filestats;
+ size_t filesize;
+ int ret;
+
+ pos = &file_stream->pos;
+
+ ret = fstat(pos->fd, &filestats);
+ if (ret < 0)
+ return ret;
+ filesize = filestats.st_size;
+
+ /* Deal with empty files */
+ if (!filesize) {
+ return 0;
+ }
+
+begin:
+ if (filesize - pos->mmap_offset < (packet_map_len >> LOG2_CHAR_BIT)) {
+ packet_map_len = (filesize - pos->mmap_offset) << LOG2_CHAR_BIT;
+ }
+
+ if (pos->base_mma) {
+ /* unmap old base */
+ ret = munmap_align(pos->base_mma);
+ if (ret) {
+ fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
+ strerror(errno));
+ return ret;
+ }
+ pos->base_mma = NULL;
+ }
+ /* map new base. Need mapping length from header. */
+ pos->base_mma = mmap_align(packet_map_len >> LOG2_CHAR_BIT, PROT_READ,
+ MAP_PRIVATE, pos->fd, pos->mmap_offset);
+ assert(pos->base_mma != MAP_FAILED);
+
+ pos->content_size = packet_map_len;
+ pos->packet_size = packet_map_len;
+ pos->offset = 0; /* Position of the packet header */
+
+ /* update trace_packet_header and stream_packet_context */
+ if (pos->prot == PROT_READ && file_stream->parent.trace_packet_header) {
+ /* Read packet header */
+ ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p);
+ if (ret) {
+ if (ret == -EFAULT)
+ goto retry;
+ }
+ }
+ if (pos->prot == PROT_READ && file_stream->parent.stream_packet_context) {
+ /* Read packet context */
+ ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);
+ if (ret) {
+ if (ret == -EFAULT)
+ goto retry;
+ }
+ }
+ packet_index->data_offset = pos->offset;
+
+ /* unmap old base */
+ ret = munmap_align(pos->base_mma);
+ if (ret) {
+ fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
+ strerror(errno));
+ return ret;
+ }
+ pos->base_mma = NULL;
+
+ return 0;
+
+ /* Retry with larger mapping */
+retry:
+ if (packet_map_len == ((filesize - pos->mmap_offset) << LOG2_CHAR_BIT)) {
+ /*
+ * Reached EOF, but still expecting header/context data.
+ */
+ fprintf(stderr, "[error] Reached end of file, but still expecting header or context fields.\n");
+ return -EFAULT;
+ }
+ /* Double the mapping len, and retry */
+ tmp_map_len = packet_map_len << 1;
+ if (tmp_map_len >> 1 != packet_map_len) {
+ /* Overflow */
+ fprintf(stderr, "[error] Packet mapping length overflow\n");
+ return -EFAULT;
+ }
+ packet_map_len = tmp_map_len;
+ goto begin;
+}
+
+
int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace,
int fd, int open_flags)
{
pos->fd = fd;
if (fd >= 0) {
- pos->packet_cycles_index = g_array_new(FALSE, TRUE,
- sizeof(struct packet_index));
- pos->packet_real_index = g_array_new(FALSE, TRUE,
+ pos->packet_index = g_array_new(FALSE, TRUE,
sizeof(struct packet_index));
} else {
- pos->packet_cycles_index = NULL;
- pos->packet_real_index = NULL;
+ pos->packet_index = NULL;
}
switch (open_flags & O_ACCMODE) {
case O_RDONLY:
return -1;
}
}
- if (pos->packet_cycles_index)
- (void) g_array_free(pos->packet_cycles_index, TRUE);
- if (pos->packet_real_index)
- (void) g_array_free(pos->packet_real_index, TRUE);
+ if (pos->packet_index)
+ (void) g_array_free(pos->packet_index, TRUE);
return 0;
}
+void ctf_update_current_packet_index(struct ctf_stream_definition *stream,
+ struct packet_index *prev_index,
+ struct packet_index *cur_index)
+{
+ 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 =
+ cur_index->ts_cycles.timestamp_begin;
+ stream->prev_real_timestamp_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;
+
+ /* Update packet index discarded event information */
+ events_discarded_diff = cur_index->events_discarded;
+ if (prev_index) {
+ events_discarded_diff -= prev_index->events_discarded;
+ /*
+ * Deal with 32-bit wrap-around if the tracer provided a
+ * 32-bit field.
+ */
+ if (prev_index->events_discarded_len == 32) {
+ events_discarded_diff = (uint32_t) events_discarded_diff;
+ }
+ }
+ stream->events_discarded = events_discarded_diff;
+}
+
/*
* for SEEK_CUR: go to next packet.
- * for SEEK_POS: go to packet numer (index).
+ * for SEEK_SET: go to packet numer (index).
*/
void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence)
{
switch (whence) {
case SEEK_CUR:
/* The writer will add padding */
- pos->mmap_offset += WRITE_PACKET_LEN / CHAR_BIT;
+ pos->mmap_offset += pos->packet_size / CHAR_BIT;
break;
case SEEK_SET:
assert(index == 0); /* only seek supported for now */
switch (whence) {
case SEEK_CUR:
{
- uint64_t events_discarded_diff;
+ struct packet_index *prev_index = NULL;
if (pos->offset == EOF) {
return;
}
- assert(pos->cur_index < pos->packet_cycles_index->len);
- assert(pos->cur_index < pos->packet_real_index->len);
-
- /* For printing discarded event count */
- packet_index = &g_array_index(pos->packet_cycles_index,
+ assert(pos->cur_index < pos->packet_index->len);
+ packet_index = &g_array_index(pos->packet_index,
struct packet_index, pos->cur_index);
- file_stream->parent.prev_cycles_timestamp_end =
- packet_index->timestamp_end;
- file_stream->parent.prev_cycles_timestamp =
- packet_index->timestamp_begin;
-
- packet_index = &g_array_index(pos->packet_real_index,
- struct packet_index, pos->cur_index);
- file_stream->parent.prev_real_timestamp_end =
- packet_index->timestamp_end;
- file_stream->parent.prev_real_timestamp =
- packet_index->timestamp_begin;
-
- events_discarded_diff = packet_index->events_discarded;
if (pos->cur_index > 0) {
- packet_index = &g_array_index(pos->packet_real_index,
+ prev_index = &g_array_index(pos->packet_index,
struct packet_index,
pos->cur_index - 1);
- events_discarded_diff -= packet_index->events_discarded;
- /*
- * Deal with 32-bit wrap-around if the
- * tracer provided a 32-bit field.
- */
- if (packet_index->events_discarded_len == 32) {
- events_discarded_diff = (uint32_t) events_discarded_diff;
- }
}
- file_stream->parent.events_discarded = events_discarded_diff;
- file_stream->parent.prev_real_timestamp = file_stream->parent.real_timestamp;
- file_stream->parent.prev_cycles_timestamp = file_stream->parent.cycles_timestamp;
+ ctf_update_current_packet_index(&file_stream->parent,
+ prev_index, packet_index);
+
/* The reader will expect us to skip padding */
++pos->cur_index;
break;
}
case SEEK_SET:
- if (index >= pos->packet_cycles_index->len) {
+ if (index >= pos->packet_index->len) {
pos->offset = EOF;
return;
}
- packet_index = &g_array_index(pos->packet_cycles_index,
+ packet_index = &g_array_index(pos->packet_index,
struct packet_index, index);
pos->last_events_discarded = packet_index->events_discarded;
pos->cur_index = index;
default:
assert(0);
}
- if (pos->cur_index >= pos->packet_real_index->len) {
+ 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
pos->offset = EOF;
return;
}
- packet_index = &g_array_index(pos->packet_cycles_index,
+ packet_index = &g_array_index(pos->packet_index,
struct packet_index,
pos->cur_index);
- file_stream->parent.cycles_timestamp = packet_index->timestamp_begin;
+ file_stream->parent.cycles_timestamp = packet_index->ts_cycles.timestamp_begin;
- packet_index = &g_array_index(pos->packet_real_index,
- struct packet_index,
- pos->cur_index);
- file_stream->parent.real_timestamp = packet_index->timestamp_begin;
- pos->mmap_offset = packet_index->offset;
+ file_stream->parent.real_timestamp = packet_index->ts_real.timestamp_begin;
/* Lookup context/packet size in index */
+ if (packet_index->data_offset == -1) {
+ ret = find_data_offset(pos, file_stream, packet_index);
+ if (ret < 0) {
+ return;
+ }
+ }
pos->content_size = packet_index->content_size;
pos->packet_size = packet_index->packet_size;
- if (packet_index->data_offset < packet_index->content_size) {
+ pos->mmap_offset = packet_index->offset;
+ pos->data_offset = packet_index->data_offset;
+ if (pos->data_offset < packet_index->content_size) {
pos->offset = 0; /* will read headers */
- } else if (packet_index->data_offset == packet_index->content_size) {
+ } else if (pos->data_offset == packet_index->content_size) {
/* empty packet */
pos->offset = packet_index->data_offset;
whence = SEEK_CUR;
packet_index.offset = pos->mmap_offset;
packet_index.content_size = 0;
packet_index.packet_size = 0;
- packet_index.timestamp_begin = 0;
- packet_index.timestamp_end = 0;
+ packet_index.ts_real.timestamp_begin = 0;
+ packet_index.ts_real.timestamp_end = 0;
+ packet_index.ts_cycles.timestamp_begin = 0;
+ packet_index.ts_cycles.timestamp_end = 0;
packet_index.events_discarded = 0;
packet_index.events_discarded_len = 0;
if (magic != CTF_MAGIC) {
fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
magic,
- file_stream->pos.packet_cycles_index->len,
+ file_stream->pos.packet_index->len,
(ssize_t) pos->mmap_offset);
return -EINVAL;
}
fprintf(stderr, "[error] Unable to read packet context: %s\n", strerror(-ret));
return ret;
}
- /* read content size from header */
- len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
+ /* read packet size from header */
+ len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
if (len_index >= 0) {
struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
- packet_index.content_size = bt_get_unsigned_int(field);
+ packet_index.packet_size = bt_get_unsigned_int(field);
} else {
/* Use file size for packet size */
- packet_index.content_size = filesize * CHAR_BIT;
+ packet_index.packet_size = filesize * CHAR_BIT;
}
- /* read packet size from header */
- len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
+ /* read content size from header */
+ len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
if (len_index >= 0) {
struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
- packet_index.packet_size = bt_get_unsigned_int(field);
+ packet_index.content_size = bt_get_unsigned_int(field);
} else {
- /* Use content size if non-zero, else file size */
- packet_index.packet_size = packet_index.content_size ? : filesize * CHAR_BIT;
+ /* Use packet size if non-zero, else file size */
+ packet_index.content_size = packet_index.packet_size ? : filesize * CHAR_BIT;
}
/* read timestamp begin from header */
struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
- packet_index.timestamp_begin = bt_get_unsigned_int(field);
+ packet_index.ts_cycles.timestamp_begin = bt_get_unsigned_int(field);
if (file_stream->parent.stream_class->trace->parent.collection) {
- packet_index.timestamp_begin =
+ packet_index.ts_real.timestamp_begin =
ctf_get_real_timestamp(
&file_stream->parent,
- packet_index.timestamp_begin);
+ packet_index.ts_cycles.timestamp_begin);
}
}
struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
- packet_index.timestamp_end = bt_get_unsigned_int(field);
+ packet_index.ts_cycles.timestamp_end = bt_get_unsigned_int(field);
if (file_stream->parent.stream_class->trace->parent.collection) {
- packet_index.timestamp_end =
+ packet_index.ts_real.timestamp_end =
ctf_get_real_timestamp(
&file_stream->parent,
- packet_index.timestamp_end);
+ packet_index.ts_cycles.timestamp_end);
}
}
}
} else {
/* Use file size for packet size */
- packet_index.content_size = filesize * CHAR_BIT;
- /* Use content size if non-zero, else file size */
- packet_index.packet_size = packet_index.content_size ? : filesize * CHAR_BIT;
+ packet_index.packet_size = filesize * CHAR_BIT;
+ /* Use packet size if non-zero, else file size */
+ packet_index.content_size = packet_index.packet_size ? : filesize * CHAR_BIT;
}
/* Validate content size and packet size values */
return -EINVAL;
}
+ if (packet_index.content_size < pos->offset) {
+ fprintf(stderr, "[error] Invalid CTF stream: content size is smaller than packet headers.\n");
+ return -EINVAL;
+ }
+
+ if ((packet_index.packet_size >> LOG2_CHAR_BIT) == 0) {
+ fprintf(stderr, "[error] Invalid CTF stream: packet size needs to be at least one byte\n");
+ return -EINVAL;
+ }
+
/* Save position after header and context */
packet_index.data_offset = pos->offset;
/* add index to packet array */
- g_array_append_val(file_stream->pos.packet_cycles_index, packet_index);
+ g_array_append_val(file_stream->pos.packet_index, packet_index);
pos->mmap_offset += packet_index.packet_size >> LOG2_CHAR_BIT;
return ret;
}
+static
+int import_stream_packet_index(struct ctf_trace *td,
+ struct ctf_file_stream *file_stream)
+{
+ struct ctf_stream_pos *pos;
+ struct ctf_packet_index ctf_index;
+ struct ctf_packet_index_file_hdr index_hdr;
+ struct packet_index index;
+ int ret = 0;
+ int first_packet = 1;
+ size_t len;
+
+ pos = &file_stream->pos;
+
+ len = fread(&index_hdr, sizeof(index_hdr), 1, pos->index_fp);
+ if (len != 1) {
+ perror("read index file header");
+ goto error;
+ }
+
+ /* Check the index header */
+ if (be32toh(index_hdr.magic) != CTF_INDEX_MAGIC) {
+ fprintf(stderr, "[error] wrong index magic\n");
+ ret = -1;
+ 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,
+ CTF_INDEX_MINOR);
+ ret = -1;
+ goto error;
+ }
+ if (index_hdr.packet_index_len == 0) {
+ fprintf(stderr, "[error] Packet index length cannot be 0.\n");
+ ret = -1;
+ goto error;
+ }
+
+ while (fread(&ctf_index, index_hdr.packet_index_len, 1,
+ pos->index_fp) == 1) {
+ uint64_t stream_id;
+ struct ctf_stream_declaration *stream = NULL;
+
+ memset(&index, 0, sizeof(index));
+ index.offset = be64toh(ctf_index.offset);
+ index.packet_size = be64toh(ctf_index.packet_size);
+ index.content_size = be64toh(ctf_index.content_size);
+ index.ts_cycles.timestamp_begin = be64toh(ctf_index.timestamp_begin);
+ index.ts_cycles.timestamp_end = be64toh(ctf_index.timestamp_end);
+ index.events_discarded = be64toh(ctf_index.events_discarded);
+ index.events_discarded_len = 64;
+ index.data_offset = -1;
+ stream_id = be64toh(ctf_index.stream_id);
+
+ if (!first_packet) {
+ /* add index to packet array */
+ g_array_append_val(file_stream->pos.packet_index, index);
+ continue;
+ }
+
+ file_stream->parent.stream_id = stream_id;
+ if (stream_id < td->streams->len) {
+ stream = g_ptr_array_index(td->streams, stream_id);
+ }
+ if (!stream) {
+ fprintf(stderr, "[error] Stream %" PRIu64
+ " is not declared in metadata.\n",
+ stream_id);
+ ret = -EINVAL;
+ goto error;
+ }
+ file_stream->parent.stream_class = stream;
+ ret = create_stream_definitions(td, &file_stream->parent);
+ if (ret)
+ goto error;
+ first_packet = 0;
+ /* add index to packet array */
+ g_array_append_val(file_stream->pos.packet_index, index);
+ }
+
+ /* Index containing only the header. */
+ if (!file_stream->parent.stream_class) {
+ ret = -1;
+ goto error;
+ }
+
+ ret = 0;
+
+error:
+ return ret;
+}
+
/*
* Note: many file streams can inherit from the same stream class
* description (metadata).
int ret, fd, closeret;
struct ctf_file_stream *file_stream;
struct stat statbuf;
+ char *index_name;
fd = openat(td->dirfd, path, flags);
if (fd < 0) {
goto fstat_error;
}
if (S_ISDIR(statbuf.st_mode)) {
- fprintf(stderr, "[warning] Skipping directory '%s' found in trace\n", path);
+ if (strncmp(path, "index", 5) != 0) {
+ fprintf(stderr, "[warning] Skipping directory '%s' "
+ "found in trace\n", path);
+ }
ret = 0;
goto fd_is_dir_ok;
}
file_stream = g_new0(struct ctf_file_stream, 1);
file_stream->pos.last_offset = LAST_OFFSET_POISON;
+ file_stream->pos.fd = -1;
+ file_stream->pos.index_fp = NULL;
strncpy(file_stream->parent.path, path, PATH_MAX);
file_stream->parent.path[PATH_MAX - 1] = '\0';
* For now, only a single clock per trace is supported.
*/
file_stream->parent.current_clock = td->parent.single_clock;
- ret = create_stream_packet_index(td, file_stream);
- if (ret) {
- fprintf(stderr, "[error] Stream index creation error.\n");
- goto error_index;
+
+ /*
+ * Allocate the index name for this stream and try to open it.
+ */
+ index_name = malloc((strlen(path) + sizeof(INDEX_PATH)) * sizeof(char));
+ if (!index_name) {
+ fprintf(stderr, "[error] Cannot allocate index filename\n");
+ goto error_def;
+ }
+ snprintf(index_name, strlen(path) + sizeof(INDEX_PATH),
+ INDEX_PATH, path);
+
+ if (faccessat(td->dirfd, index_name, O_RDONLY, flags) < 0) {
+ ret = create_stream_packet_index(td, file_stream);
+ if (ret) {
+ fprintf(stderr, "[error] Stream index creation error.\n");
+ goto error_index;
+ }
+ } else {
+ ret = openat(td->dirfd, index_name, flags);
+ if (ret < 0) {
+ perror("Index file openat()");
+ ret = -1;
+ goto error_free;
+ }
+ file_stream->pos.index_fp = fdopen(ret, "r");
+ if (!file_stream->pos.index_fp) {
+ perror("fdopen() error");
+ goto error_free;
+ }
+ ret = import_stream_packet_index(td, file_stream);
+ if (ret) {
+ ret = -1;
+ goto error_index;
+ }
+ ret = fclose(file_stream->pos.index_fp);
+ if (ret < 0) {
+ perror("close index");
+ goto error_free;
+ }
}
+ free(index_name);
+
/* Add stream file to stream class */
g_ptr_array_add(file_stream->parent.stream_class->streams,
&file_stream->parent);
return 0;
error_index:
+ if (file_stream->pos.index_fp) {
+ ret = fclose(file_stream->pos.index_fp);
+ if (ret < 0) {
+ perror("close index");
+ }
+ }
if (file_stream->parent.trace_packet_header)
bt_definition_unref(&file_stream->parent.trace_packet_header->p);
+error_free:
+ free(index_name);
error_def:
closeret = ctf_fini_pos(&file_stream->pos);
if (closeret) {
struct dirent *dirent;
struct dirent *diriter;
size_t dirent_len;
+ char *ext;
td->flags = flags;
|| !strcmp(diriter->d_name, "..")
|| !strcmp(diriter->d_name, "metadata"))
continue;
+
+ /* Ignore index files : *.idx */
+ ext = strrchr(diriter->d_name, '.');
+ if (ext && (!strcmp(ext, ".idx"))) {
+ continue;
+ }
+
ret = ctf_open_file_stream_read(td, diriter->d_name,
flags, packet_seek);
if (ret) {
pos->offset = 0;
pos->dummy = false;
pos->cur_index = 0;
- pos->packet_cycles_index = NULL;
- pos->packet_real_index = NULL;
pos->prot = PROT_READ;
pos->flags = MAP_PRIVATE;
pos->parent.rw_table = read_dispatch_table;
pos->parent.event_cb = ctf_read_event;
+ pos->priv = mmap_info->priv;
+ pos->packet_index = g_array_new(FALSE, TRUE,
+ sizeof(struct packet_index));
}
static
goto error;
}
td = g_new0(struct ctf_trace, 1);
+ td->dirfd = -1;
ret = ctf_open_mmap_trace_read(td, mmap_list, packet_seek, metadata_fp);
if (ret)
goto error_free;
cfs = container_of(stream, struct ctf_file_stream,
parent);
stream_pos = &cfs->pos;
- if (!stream_pos->packet_cycles_index)
+ if (!stream_pos->packet_index)
continue;
- for (k = 0; k < stream_pos->packet_cycles_index->len; k++) {
+ for (k = 0; k < stream_pos->packet_index->len; k++) {
struct packet_index *index;
- struct packet_index new_index;
- index = &g_array_index(stream_pos->packet_cycles_index,
+ index = &g_array_index(stream_pos->packet_index,
struct packet_index, k);
- memcpy(&new_index, index,
- sizeof(struct packet_index));
- new_index.timestamp_begin =
+ index->ts_real.timestamp_begin =
ctf_get_real_timestamp(stream,
- index->timestamp_begin);
- new_index.timestamp_end =
+ index->ts_cycles.timestamp_begin);
+ index->ts_real.timestamp_end =
ctf_get_real_timestamp(stream,
- index->timestamp_end);
- g_array_append_val(stream_pos->packet_real_index,
- new_index);
+ index->ts_cycles.timestamp_end);
}
}
}
fprintf(stderr, "Error on ctf_fini_pos\n");
return -1;
}
- ret = close(file_stream->pos.fd);
- if (ret) {
- perror("Error closing file fd");
- return -1;
+ if (file_stream->pos.fd >= 0) {
+ ret = close(file_stream->pos.fd);
+ if (ret) {
+ perror("Error closing file fd");
+ return -1;
+ }
}
return 0;
}
}
}
ctf_destroy_metadata(td);
- ret = close(td->dirfd);
- if (ret) {
- perror("Error closing dirfd");
- return ret;
+ if (td->dirfd >= 0) {
+ ret = close(td->dirfd);
+ if (ret) {
+ perror("Error closing dirfd");
+ return ret;
+ }
}
- ret = closedir(td->dir);
- if (ret) {
- perror("Error closedir");
- return ret;
+ if (td->dir) {
+ ret = closedir(td->dir);
+ if (ret) {
+ perror("Error closedir");
+ return ret;
+ }
}
free(td->metadata_string);
g_free(td);
projects / babeltrace.git / blobdiff