packet_index.timestamp_begin = 0;
packet_index.timestamp_end = 0;
packet_index.events_discarded = 0;
+ packet_index.events_discarded_len = 0;
/* read and check header, set stream id (and check) */
if (file_stream->parent.trace_packet_header) {
continue;
for (j = 0; j < stream->streams->len; j++) {
struct ctf_file_stream *file_stream;
- file_stream = container_of(g_ptr_array_index(stream->streams, j), struct ctf_file_stream, parent);
+ file_stream = container_of(g_ptr_array_index(stream->streams, j),
+ struct ctf_file_stream, parent);
ctf_close_file_stream(file_stream);
}
-
- }
- g_ptr_array_free(td->streams, TRUE);
- }
-
- if (td->event_declarations) {
- for (i = 0; i < td->event_declarations->len; i++) {
- struct bt_ctf_event_decl *event;
-
- event = g_ptr_array_index(td->event_declarations, i);
- if (event->context_decl)
- g_ptr_array_free(event->context_decl, TRUE);
- if (event->fields_decl)
- g_ptr_array_free(event->fields_decl, TRUE);
- if (event->packet_header_decl)
- g_ptr_array_free(event->packet_header_decl, TRUE);
- if (event->event_context_decl)
- g_ptr_array_free(event->event_context_decl, TRUE);
- if (event->event_header_decl)
- g_ptr_array_free(event->event_header_decl, TRUE);
- if (event->packet_context_decl)
- g_ptr_array_free(event->packet_context_decl, TRUE);
- g_free(event);
}
- g_ptr_array_free(td->event_declarations, TRUE);
}
+ ctf_destroy_metadata(td);
closedir(td->dir);
g_free(td);
}
fprintf(fd, "[error] %s: cannot create array declaration.\n", __func__);
return NULL;
}
+ declaration_unref(nested_declaration);
declaration = &array_declaration->p;
break;
}
sequence_declaration = sequence_declaration_new(length_name, nested_declaration, declaration_scope);
if (!sequence_declaration) {
fprintf(fd, "[error] %s: cannot create sequence declaration.\n", __func__);
+ g_free(length_name);
return NULL;
}
+ declaration_unref(nested_declaration);
declaration = &sequence_declaration->p;
+ g_free(length_name);
break;
}
default:
struct_declaration_add_field(struct_declaration,
g_quark_to_string(field_name),
field_declaration);
+ declaration_unref(field_declaration);
}
return 0;
}
return -EINVAL;
}
-
untagged_variant_declaration_add_field(untagged_variant_declaration,
g_quark_to_string(field_name),
field_declaration);
+ declaration_unref(field_declaration);
}
return 0;
}
type_declaration->declaration_free(type_declaration);
return ret;
}
+ declaration_unref(type_declaration);
}
return 0;
}
err = register_declaration(alias_q, type_declaration, scope);
if (err)
goto error;
+ declaration_unref(type_declaration);
return 0;
error:
struct_declaration =
lookup_struct_declaration(g_quark_from_string(name),
declaration_scope);
+ declaration_ref(&struct_declaration->p);
return &struct_declaration->p;
} else {
uint64_t min_align_value = 0;
untagged_variant_declaration =
lookup_variant_declaration(g_quark_from_string(name),
declaration_scope);
+ declaration_ref(&untagged_variant_declaration->p);
} else {
/* For unnamed variant, create type */
/* For named variant (with body), create type and add to declaration scope */
enum_declaration =
lookup_enum_declaration(g_quark_from_string(name),
declaration_scope);
+ declaration_ref(&enum_declaration->p);
return &enum_declaration->p;
} else {
/* For unnamed enum, create type */
enum_declaration,
declaration_scope);
assert(!ret);
+ declaration_unref(&enum_declaration->p);
}
return &enum_declaration->p;
}
id_q = g_quark_from_string(str_c);
g_free(str_c);
declaration = lookup_declaration(id_q, declaration_scope);
+ declaration_ref(declaration);
return declaration;
}
strncpy(env->procname, right, TRACER_ENV_LEN);
env->procname[TRACER_ENV_LEN - 1] = '\0';
printf_verbose("env.procname = \"%s\"\n", env->procname);
+ g_free(right);
} else if (!strcmp(left, "hostname")) {
char *right;
strncpy(env->hostname, right, TRACER_ENV_LEN);
env->hostname[TRACER_ENV_LEN - 1] = '\0';
printf_verbose("env.hostname = \"%s\"\n", env->hostname);
+ g_free(right);
} else if (!strcmp(left, "domain")) {
char *right;
strncpy(env->domain, right, TRACER_ENV_LEN);
env->domain[TRACER_ENV_LEN - 1] = '\0';
printf_verbose("env.domain = \"%s\"\n", env->domain);
+ g_free(right);
} else if (!strcmp(left, "sysname")) {
char *right;
strncpy(env->sysname, right, TRACER_ENV_LEN);
env->sysname[TRACER_ENV_LEN - 1] = '\0';
printf_verbose("env.sysname = \"%s\"\n", env->sysname);
+ g_free(right);
} else if (!strcmp(left, "kernel_release")) {
char *right;
strncpy(env->release, right, TRACER_ENV_LEN);
env->release[TRACER_ENV_LEN - 1] = '\0';
printf_verbose("env.release = \"%s\"\n", env->release);
+ g_free(right);
} else if (!strcmp(left, "kernel_version")) {
char *right;
strncpy(env->version, right, TRACER_ENV_LEN);
env->version[TRACER_ENV_LEN - 1] = '\0';
printf_verbose("env.version = \"%s\"\n", env->version);
+ g_free(right);
} else {
if (is_unary_string(&node->u.ctf_expression.right)) {
char *right;
right = concatenate_unary_strings(&node->u.ctf_expression.right);
printf_verbose("env.%s = \"%s\"\n", left, right);
+ g_free(right);
} else if (is_unary_unsigned(&node->u.ctf_expression.right)) {
uint64_t v;
int ret;
return 0;
}
-/* TODO: missing metadata "destroy" (memory leak) */
int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node,
struct ctf_trace *trace, int byte_order)
{
g_hash_table_destroy(trace->clocks);
return ret;
}
+
+int ctf_destroy_metadata(struct ctf_trace *trace)
+{
+ int i, j, k;
+ struct ctf_file_stream *metadata_stream;
+
+ if (trace->streams) {
+ for (i = 0; i < trace->streams->len; i++) {
+ struct ctf_stream_declaration *stream;
+
+ stream = g_ptr_array_index(trace->streams, i);
+ if (!stream)
+ continue;
+ for (j = 0; j < stream->streams->len; j++) {
+ struct ctf_stream_definition *stream_def;
+
+ stream_def = g_ptr_array_index(stream->streams, j);
+ if (!stream_def)
+ continue;
+ for (k = 0; k < stream_def->events_by_id->len; k++) {
+ struct ctf_event_definition *event;
+
+ event = g_ptr_array_index(stream_def->events_by_id, k);
+ if (!event)
+ continue;
+ if (&event->event_fields->p)
+ definition_unref(&event->event_fields->p);
+ if (&event->event_context->p)
+ definition_unref(&event->event_context->p);
+ g_free(event);
+ }
+ if (&stream_def->trace_packet_header->p)
+ definition_unref(&stream_def->trace_packet_header->p);
+ if (&stream_def->stream_event_header->p)
+ definition_unref(&stream_def->stream_event_header->p);
+ if (&stream_def->stream_packet_context->p)
+ definition_unref(&stream_def->stream_packet_context->p);
+ if (&stream_def->stream_event_context->p)
+ definition_unref(&stream_def->stream_event_context->p);
+ g_ptr_array_free(stream_def->events_by_id, TRUE);
+ g_free(stream_def);
+ }
+ if (stream->event_header_decl)
+ declaration_unref(&stream->event_header_decl->p);
+ if (stream->event_context_decl)
+ declaration_unref(&stream->event_context_decl->p);
+ if (stream->packet_context_decl)
+ declaration_unref(&stream->packet_context_decl->p);
+ g_ptr_array_free(stream->streams, TRUE);
+ g_ptr_array_free(stream->events_by_id, TRUE);
+ g_hash_table_destroy(stream->event_quark_to_id);
+ free_declaration_scope(stream->declaration_scope);
+ g_free(stream);
+ }
+ g_ptr_array_free(trace->streams, TRUE);
+ }
+
+ if (trace->event_declarations) {
+ for (i = 0; i < trace->event_declarations->len; i++) {
+ struct bt_ctf_event_decl *event_decl;
+ struct ctf_event_declaration *event;
+
+ event_decl = g_ptr_array_index(trace->event_declarations, i);
+ if (event_decl->context_decl)
+ g_ptr_array_free(event_decl->context_decl, TRUE);
+ if (event_decl->fields_decl)
+ g_ptr_array_free(event_decl->fields_decl, TRUE);
+ if (event_decl->packet_header_decl)
+ g_ptr_array_free(event_decl->packet_header_decl, TRUE);
+ if (event_decl->event_context_decl)
+ g_ptr_array_free(event_decl->event_context_decl, TRUE);
+ if (event_decl->event_header_decl)
+ g_ptr_array_free(event_decl->event_header_decl, TRUE);
+ if (event_decl->packet_context_decl)
+ g_ptr_array_free(event_decl->packet_context_decl, TRUE);
+
+ event = &event_decl->parent;
+ if (event->fields_decl)
+ declaration_unref(&event->fields_decl->p);
+ if (event->context_decl)
+ declaration_unref(&event->context_decl->p);
+ free_declaration_scope(event->declaration_scope);
+
+ g_free(event);
+ }
+ g_ptr_array_free(trace->event_declarations, TRUE);
+ }
+ if (trace->packet_header_decl)
+ declaration_unref(&trace->packet_header_decl->p);
+
+ free_declaration_scope(trace->root_declaration_scope);
+ free_declaration_scope(trace->declaration_scope);
+
+ g_hash_table_destroy(trace->callsites);
+ g_hash_table_destroy(trace->clocks);
+
+ metadata_stream = container_of(trace->metadata, struct ctf_file_stream, parent);
+ g_free(metadata_stream);
+
+ return 0;
+}