*/
#include <babeltrace/ctf-writer/clock.h>
-#include <babeltrace/ctf-ir/clock-internal.h>
+#include <babeltrace/ctf-writer/clock-internal.h>
+#include <babeltrace/ctf-ir/clock-class-internal.h>
#include <babeltrace/ctf-writer/event.h>
#include <babeltrace/ctf-ir/event-class-internal.h>
#include <babeltrace/ctf-ir/event-internal.h>
goto error;
}
+ 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;
goto end;
}
- clock = stream_class->clock;
- bt_get(clock);
+ clock = bt_get(stream_class->clock);
end:
return clock;
}
}
/*
- * Look for a "timestamp" field in the stream class' event header type
- * and map the stream's clock to that field if no current mapping is
- * currently set.
+ * Look for a "timestamp" integer field type in the stream
+ * class's event header field type and map the stream class's
+ * clock's class to that field type if there's no current
+ * mapping.
*/
timestamp_field = bt_ctf_field_type_structure_get_field_type_by_name(
stream_class->event_header_type, "timestamp");
if (timestamp_field) {
- struct bt_ctf_clock *mapped_clock;
-
- mapped_clock = bt_ctf_field_type_integer_get_mapped_clock(
- timestamp_field);
- if (mapped_clock) {
- bt_put(mapped_clock);
- goto end;
+ struct bt_ctf_clock_class *mapped_clock_class =
+ bt_ctf_field_type_integer_get_mapped_clock_class(
+ timestamp_field);
+
+ if (!mapped_clock_class) {
+ ret = bt_ctf_field_type_integer_set_mapped_clock_class(
+ timestamp_field, clock->clock_class);
+ if (ret) {
+ goto end;
+ }
}
- ret = bt_ctf_field_type_integer_set_mapped_clock(
- timestamp_field, clock);
- if (ret) {
- goto end;
- }
+ BT_PUT(mapped_clock_class);
}
- if (stream_class->clock) {
- bt_put(stream_class->clock);
- }
+ /* Replace the current clock of this stream class. */
+ bt_put(stream_class->clock);
+ stream_class->clock = bt_get(clock);
- stream_class->clock = clock;
- bt_get(clock);
end:
- if (timestamp_field) {
- bt_put(timestamp_field);
- }
+ bt_put(timestamp_field);
return ret;
}
struct bt_ctf_event_class *event_class)
{
int ret = 0;
- int64_t event_id;
+ 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 };
goto end;
}
+ 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,
}
/* Only set an event ID if none was explicitly set before */
- event_id = bt_ctf_event_class_get_id(event_class);
- if (event_id < 0) {
+ *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;
}
+ *event_id = stream_class->next_event_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);
+ 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);
/* Notifiy listeners of the trace's schema modification. */
if (trace) {
- struct bt_ctf_ir_element element = { .element = event_class,
- .type = BT_CTF_IR_TYPE_EVENT_CLASS };
+ struct bt_ctf_object obj = { .object = event_class,
+ .type = BT_CTF_OBJECT_TYPE_EVENT_CLASS };
- (void) bt_ctf_trace_element_modification(&element, trace);
+ (void) bt_ctf_trace_object_modification(&obj, trace);
}
end:
BT_PUT(trace);
assert(!stream_event_ctx_type);
assert(!event_context_type);
assert(!event_payload_type);
+ g_free(event_id);
return ret;
}
struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id(
struct bt_ctf_stream_class *stream_class, uint32_t id)
{
- size_t i;
+ int64_t id_key = id;
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;
}
goto end;
}
- assert(stream_class->packet_context_type);
bt_get(stream_class->packet_context_type);
ret = stream_class->packet_context_type;
end:
{
int ret = 0;
- if (!stream_class || !packet_context_type || stream_class->frozen) {
+ if (!stream_class || stream_class->frozen) {
ret = -1;
goto end;
}
- assert(stream_class->packet_context_type);
- if (stream_class->packet_context_type == packet_context_type) {
- goto end;
- }
- if (bt_ctf_field_type_get_type_id(packet_context_type) !=
- BT_CTF_TYPE_ID_STRUCT) {
- /* A packet context must be a structure */
+ if (packet_context_type &&
+ bt_ctf_field_type_get_type_id(packet_context_type) !=
+ BT_CTF_TYPE_ID_STRUCT) {
+ /* A packet context must be a structure. */
ret = -1;
goto end;
}
goto end;
}
- assert(stream_class->event_header_type);
bt_get(stream_class->event_header_type);
ret = stream_class->event_header_type;
end:
{
int ret = 0;
- if (!stream_class || !event_header_type || stream_class->frozen) {
+ if (!stream_class || stream_class->frozen) {
ret = -1;
goto end;
}
- assert(stream_class->event_header_type);
- if (stream_class->event_header_type == event_header_type) {
- goto end;
- }
- if (bt_ctf_field_type_get_type_id(event_header_type) !=
- BT_CTF_TYPE_ID_STRUCT) {
- /* An event header must be a structure */
+ if (event_header_type &&
+ bt_ctf_field_type_get_type_id(event_header_type) !=
+ BT_CTF_TYPE_ID_STRUCT) {
+ /* An event header must be a structure. */
ret = -1;
goto end;
}
bt_put(stream_class->event_header_type);
- bt_get(event_header_type);
- stream_class->event_header_type = event_header_type;
+ stream_class->event_header_type = bt_get(event_header_type);
end:
return ret;
}
goto end;
}
- assert(stream_class->event_context_type);
bt_get(stream_class->event_context_type);
ret = stream_class->event_context_type;
end:
{
int ret = 0;
- if (!stream_class || !event_context_type || stream_class->frozen) {
+ if (!stream_class || stream_class->frozen) {
ret = -1;
goto end;
}
- if (bt_ctf_field_type_get_type_id(event_context_type) !=
- BT_CTF_TYPE_ID_STRUCT) {
- /* A packet context must be a structure */
+ if (event_context_type &&
+ bt_ctf_field_type_get_type_id(event_context_type) !=
+ BT_CTF_TYPE_ID_STRUCT) {
+ /* A packet context must be a structure. */
ret = -1;
goto end;
}
bt_put(stream_class->event_context_type);
- bt_get(event_context_type);
- stream_class->event_context_type = event_context_type;
+ stream_class->event_context_type = bt_get(event_context_type);
end:
return ret;
}
}
static
-int visit_event_class(void *element, bt_ctf_ir_visitor visitor,void *data)
+int visit_event_class(void *object, bt_ctf_visitor visitor,void *data)
{
- struct bt_ctf_ir_element ir_element =
- { .element = element,
- .type = BT_CTF_IR_TYPE_EVENT_CLASS };
+ struct bt_ctf_object obj =
+ { .object = object,
+ .type = BT_CTF_OBJECT_TYPE_EVENT_CLASS };
- return visitor(&ir_element, data);
+ return visitor(&obj, data);
}
int bt_ctf_stream_class_visit(struct bt_ctf_stream_class *stream_class,
- bt_ctf_ir_visitor visitor, void *data)
+ bt_ctf_visitor visitor, void *data)
{
int ret;
- struct bt_ctf_ir_element element =
- { .element = stream_class,
- .type = BT_CTF_IR_TYPE_STREAM_CLASS };
+ struct bt_ctf_object obj =
+ { .object = stream_class,
+ .type = BT_CTF_OBJECT_TYPE_STREAM_CLASS };
if (!stream_class || !visitor) {
ret = -1;
goto end;
}
- ret = visitor_helper(&element, get_event_class_count,
+ ret = visitor_helper(&obj, get_event_class_count,
get_event_class,
visit_event_class, visitor, data);
end:
bt_ctf_field_type_freeze(stream_class->event_header_type);
bt_ctf_field_type_freeze(stream_class->packet_context_type);
bt_ctf_field_type_freeze(stream_class->event_context_type);
- bt_ctf_clock_freeze(stream_class->clock);
+
+ if (stream_class->clock) {
+ bt_ctf_clock_class_freeze(stream_class->clock->clock_class);
+ }
}
BT_HIDDEN
goto end;
}
- g_string_append(context->string, ";\n\n\tpacket.context := ");
- ret = bt_ctf_field_type_serialize(stream_class->packet_context_type,
- context);
- if (ret) {
- goto end;
+ if (stream_class->packet_context_type) {
+ g_string_append(context->string, ";\n\n\tpacket.context := ");
+ ret = bt_ctf_field_type_serialize(stream_class->packet_context_type,
+ context);
+ if (ret) {
+ goto end;
+ }
}
if (stream_class->event_context_type) {
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);
}
projects / babeltrace.git / blobdiff