Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ stream_class->event_classes_ht = g_hash_table_new_full(g_int64_hash,
+ g_int64_equal, g_free, NULL);
+
ret = init_event_header(stream_class);
if (ret) {
goto error;
ret = init_event_header(stream_class);
if (ret) {
goto error;
struct bt_ctf_event_class *event_class)
{
int ret = 0;
struct bt_ctf_event_class *event_class)
{
int ret = 0;
+ int64_t *event_id = NULL;
struct bt_ctf_trace *trace = NULL;
struct bt_ctf_stream_class *old_stream_class = NULL;
struct bt_ctf_validation_output validation_output = { 0 };
struct bt_ctf_trace *trace = NULL;
struct bt_ctf_stream_class *old_stream_class = NULL;
struct bt_ctf_validation_output validation_output = { 0 };
+ event_id = g_new(int64_t, 1);
+ if (!event_id) {
+ ret = -1;
+ goto end;
+ }
+
/* Check for duplicate event classes */
struct search_query query = { .value = event_class, .found = 0 };
g_ptr_array_foreach(stream_class->event_classes, event_class_exists,
/* Check for duplicate event classes */
struct search_query query = { .value = event_class, .found = 0 };
g_ptr_array_foreach(stream_class->event_classes, event_class_exists,
}
/* Only set an event ID if none was explicitly set before */
}
/* Only set an event ID if none was explicitly set before */
- event_id = bt_ctf_event_class_get_id(event_class);
+ *event_id = bt_ctf_event_class_get_id(event_class);
if (event_id < 0) {
if (bt_ctf_event_class_set_id(event_class,
stream_class->next_event_id++)) {
ret = -1;
goto end;
}
if (event_id < 0) {
if (bt_ctf_event_class_set_id(event_class,
stream_class->next_event_id++)) {
ret = -1;
goto end;
}
+ *event_id = stream_class->next_event_id;
}
ret = bt_ctf_event_class_set_stream_id(event_class, stream_class->id);
}
ret = bt_ctf_event_class_set_stream_id(event_class, stream_class->id);
/* Add to the event classes of the stream class */
g_ptr_array_add(stream_class->event_classes, event_class);
/* Add to the event classes of the stream class */
g_ptr_array_add(stream_class->event_classes, event_class);
+ g_hash_table_insert(stream_class->event_classes_ht, event_id,
+ event_class);
+ event_id = NULL;
/* Freeze the event class */
bt_ctf_event_class_freeze(event_class);
/* Freeze the event class */
bt_ctf_event_class_freeze(event_class);
assert(!stream_event_ctx_type);
assert(!event_context_type);
assert(!event_payload_type);
assert(!stream_event_ctx_type);
assert(!event_context_type);
assert(!event_payload_type);
struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id(
struct bt_ctf_stream_class *stream_class, uint32_t id)
{
struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id(
struct bt_ctf_stream_class *stream_class, uint32_t id)
{
struct bt_ctf_event_class *event_class = NULL;
if (!stream_class) {
goto end;
}
struct bt_ctf_event_class *event_class = NULL;
if (!stream_class) {
goto end;
}
- for (i = 0; i < stream_class->event_classes->len; i++) {
- struct bt_ctf_event_class *current_event_class =
- g_ptr_array_index(stream_class->event_classes, i);
-
- if (bt_ctf_event_class_get_id(current_event_class) == id) {
- event_class = current_event_class;
- bt_get(event_class);
- goto end;
- }
- }
+ event_class = g_hash_table_lookup(stream_class->event_classes_ht,
+ &id_key);
+ bt_get(event_class);
end:
return event_class;
}
end:
return event_class;
}
stream_class = container_of(obj, struct bt_ctf_stream_class, base);
bt_put(stream_class->clock);
stream_class = container_of(obj, struct bt_ctf_stream_class, base);
bt_put(stream_class->clock);
+ if (stream_class->event_classes_ht) {
+ g_hash_table_destroy(stream_class->event_classes_ht);
+ }
if (stream_class->event_classes) {
g_ptr_array_free(stream_class->event_classes, TRUE);
}
if (stream_class->event_classes) {
g_ptr_array_free(stream_class->event_classes, TRUE);
}
GString *name;
struct bt_ctf_clock *clock;
GPtrArray *event_classes; /* Array of pointers to bt_ctf_event_class */
GString *name;
struct bt_ctf_clock *clock;
GPtrArray *event_classes; /* Array of pointers to bt_ctf_event_class */
+ /* event class id (int64_t) to event class */
+ GHashTable *event_classes_ht;
int id_set;
uint32_t id;
uint32_t next_event_id;
int id_set;
uint32_t id;
uint32_t next_event_id;