static
int ctf_open_trace_metadata_read(struct ctf_trace *td,
void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
- int whence), FILE *metadata_fp)
+ int whence), FILE *metadata_fp,
+ struct ctf_scanner *scanner)
{
- struct ctf_scanner *scanner;
struct ctf_file_stream *metadata_stream;
FILE *fp;
char *buf = NULL;
if (ret) {
/* Warn about empty metadata */
fprintf(stderr, "[warning] Empty metadata.\n");
- goto end_packet_read;
+ goto end;
}
td->metadata_string = buf;
td->metadata_packetized = 1;
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;
+ goto end;
}
rewind(fp);
}
- scanner = ctf_scanner_alloc(fp);
- if (!scanner) {
- fprintf(stderr, "[error] Error allocating scanner\n");
- ret = -ENOMEM;
- goto end_scanner_alloc;
- }
- ret = ctf_scanner_append_ast(scanner);
+ ret = ctf_scanner_append_ast(scanner, fp);
if (ret) {
fprintf(stderr, "[error] Error creating AST\n");
goto end;
goto end;
}
end:
- ctf_scanner_free(scanner);
-end_scanner_alloc:
-end_packet_read:
if (fp) {
closeret = fclose(fp);
if (closeret) {
int import_stream_packet_index(struct ctf_trace *td,
struct ctf_file_stream *file_stream)
{
- struct ctf_stream_declaration *stream;
struct ctf_stream_pos *pos;
struct ctf_packet_index ctf_index;
struct ctf_packet_index_file_hdr index_hdr;
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);
}
file_stream->parent.stream_id = stream_id;
- stream = g_ptr_array_index(td->streams, 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",
void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
int whence), FILE *metadata_fp)
{
+ struct ctf_scanner *scanner;
int ret, closeret;
struct dirent *dirent;
struct dirent *diriter;
/*
* Keep the metadata file separate.
*/
-
- ret = ctf_open_trace_metadata_read(td, packet_seek, metadata_fp);
+ scanner = ctf_scanner_alloc();
+ if (!scanner) {
+ fprintf(stderr, "[error] Error allocating scanner\n");
+ ret = -ENOMEM;
+ goto error_metadata;
+ }
+ ret = ctf_open_trace_metadata_read(td, packet_seek, metadata_fp,
+ scanner);
+ ctf_scanner_free(scanner);
if (ret) {
fprintf(stderr, "[warning] Unable to open trace metadata for path \"%s\".\n", path);
goto error_metadata;
{
int ret;
struct bt_mmap_stream *mmap_info;
+ struct ctf_scanner *scanner;
- ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp);
+ scanner = ctf_scanner_alloc();
+ if (!scanner) {
+ fprintf(stderr, "[error] Error allocating scanner\n");
+ ret = -ENOMEM;
+ goto error_scanner_alloc;
+ }
+ ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp,
+ scanner);
if (ret) {
goto error;
}
goto error;
}
}
-
+ ctf_scanner_free(scanner);
return 0;
error:
+ ctf_scanner_free(scanner);
+error_scanner_alloc:
return ret;
}