X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fevent-class.c;h=6841c1ab0de4309d3d273f4acf0eed86a733541b;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=895557aa9e5911c6cbd0d0ce15ec5e37b51b7642;hpb=65300d60e4b4f167e5fc8f584677757ce09a3844;p=babeltrace.git

diff --git a/lib/trace-ir/event-class.c b/lib/trace-ir/event-class.c
index 895557aa..6841c1ab 100644
--- a/lib/trace-ir/event-class.c
+++ b/lib/trace-ir/event-class.c
@@ -1,8 +1,4 @@
 /*
- * event-class.c
- *
- * Babeltrace trace IR - Event class
- *
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -35,6 +31,7 @@
 #include <babeltrace/trace-ir/field-classes.h>
 #include <babeltrace/trace-ir/field-classes-internal.h>
 #include <babeltrace/trace-ir/event-class.h>
+#include <babeltrace/trace-ir/event-class-const.h>
 #include <babeltrace/trace-ir/event-class-internal.h>
 #include <babeltrace/trace-ir/event-internal.h>
 #include <babeltrace/trace-ir/stream-class.h>
@@ -53,7 +50,8 @@
 #include <stdlib.h>
 
 #define BT_ASSERT_PRE_EVENT_CLASS_HOT(_ec) \
-	BT_ASSERT_PRE_HOT((_ec), "Event class", ": %!+E", (_ec))
+	BT_ASSERT_PRE_HOT(((const struct bt_event_class *) (_ec)),	\
+		"Event class", ": %!+E", (_ec))
 
 static
 void destroy_event_class(struct bt_object *obj)
@@ -64,16 +62,18 @@ void destroy_event_class(struct bt_object *obj)
 
 	if (event_class->name.str) {
 		g_string_free(event_class->name.str, TRUE);
+		event_class->name.str = NULL;
 	}
 
 	if (event_class->emf_uri.str) {
 		g_string_free(event_class->emf_uri.str, TRUE);
+		event_class->emf_uri.str = NULL;
 	}
 
 	BT_LOGD_STR("Putting context field classe.");
-	bt_object_put_ref(event_class->specific_context_fc);
+	BT_OBJECT_PUT_REF_AND_RESET(event_class->specific_context_fc);
 	BT_LOGD_STR("Putting payload field classe.");
-	bt_object_put_ref(event_class->payload_fc);
+	BT_OBJECT_PUT_REF_AND_RESET(event_class->payload_fc);
 	bt_object_pool_finalize(&event_class->event_pool);
 	g_free(obj);
 }
@@ -87,13 +87,14 @@ void free_event(struct bt_event *event,
 
 BT_ASSERT_PRE_FUNC
 static
-bool event_class_id_is_unique(struct bt_stream_class *stream_class, uint64_t id)
+bool event_class_id_is_unique(const struct bt_stream_class *stream_class,
+		uint64_t id)
 {
 	uint64_t i;
 	bool is_unique = true;
 
 	for (i = 0; i < stream_class->event_classes->len; i++) {
-		struct bt_event_class *ec =
+		const struct bt_event_class *ec =
 			stream_class->event_classes->pdata[i];
 
 		if (ec->id == id) {
@@ -187,7 +188,7 @@ struct bt_event_class *bt_event_class_create_with_id(
 	return create_event_class_with_id(stream_class, id);
 }
 
-const char *bt_event_class_get_name(struct bt_event_class *event_class)
+const char *bt_event_class_get_name(const struct bt_event_class *event_class)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	return event_class->name.value;
@@ -205,14 +206,14 @@ int bt_event_class_set_name(struct bt_event_class *event_class,
 	return 0;
 }
 
-uint64_t bt_event_class_get_id(struct bt_event_class *event_class)
+uint64_t bt_event_class_get_id(const struct bt_event_class *event_class)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	return event_class->id;
 }
 
 enum bt_property_availability bt_event_class_get_log_level(
-		struct bt_event_class *event_class,
+		const struct bt_event_class *event_class,
 		enum bt_event_class_log_level *log_level)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
@@ -222,7 +223,8 @@ enum bt_property_availability bt_event_class_get_log_level(
 	return event_class->log_level.base.avail;
 }
 
-int bt_event_class_set_log_level(struct bt_event_class *event_class,
+void bt_event_class_set_log_level(
+		struct bt_event_class *event_class,
 		enum bt_event_class_log_level log_level)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
@@ -230,16 +232,16 @@ int bt_event_class_set_log_level(struct bt_event_class *event_class,
 	bt_property_uint_set(&event_class->log_level,
 		(uint64_t) log_level);
 	BT_LIB_LOGV("Set event class's log level: %!+E", event_class);
-	return 0;
 }
 
-const char *bt_event_class_get_emf_uri(struct bt_event_class *event_class)
+const char *bt_event_class_get_emf_uri(const struct bt_event_class *event_class)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	return event_class->emf_uri.value;
 }
 
-int bt_event_class_set_emf_uri(struct bt_event_class *event_class,
+int bt_event_class_set_emf_uri(
+		struct bt_event_class *event_class,
 		const char *emf_uri)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
@@ -258,8 +260,16 @@ struct bt_stream_class *bt_event_class_borrow_stream_class(
 	return bt_event_class_borrow_stream_class_inline(event_class);
 }
 
-struct bt_field_class *bt_event_class_borrow_specific_context_field_class(
-		struct bt_event_class *event_class)
+const struct bt_stream_class *
+bt_event_class_borrow_stream_class_const(
+		const struct bt_event_class *event_class)
+{
+	return bt_event_class_borrow_stream_class((void *) event_class);
+}
+
+const struct bt_field_class *
+bt_event_class_borrow_specific_context_field_class_const(
+		const struct bt_event_class *event_class)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	return event_class->specific_context_fc;
@@ -304,7 +314,8 @@ int bt_event_class_set_specific_context_field_class(
 
 	bt_field_class_make_part_of_trace(field_class);
 	bt_object_put_ref(event_class->specific_context_fc);
-	event_class->specific_context_fc = bt_object_get_ref(field_class);
+	event_class->specific_context_fc = field_class;
+	bt_object_get_no_null_check(event_class->specific_context_fc);
 	bt_field_class_freeze(field_class);
 	BT_LIB_LOGV("Set event class's specific context field classe: %!+E",
 		event_class);
@@ -313,14 +324,15 @@ end:
 	return ret;
 }
 
-struct bt_field_class *bt_event_class_borrow_payload_field_class(
-		struct bt_event_class *event_class)
+const struct bt_field_class *bt_event_class_borrow_payload_field_class_const(
+		const struct bt_event_class *event_class)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	return event_class->payload_fc;
 }
 
-int bt_event_class_set_payload_field_class(struct bt_event_class *event_class,
+int bt_event_class_set_payload_field_class(
+		struct bt_event_class *event_class,
 		struct bt_field_class *field_class)
 {
 	int ret;
@@ -359,7 +371,8 @@ int bt_event_class_set_payload_field_class(struct bt_event_class *event_class,
 
 	bt_field_class_make_part_of_trace(field_class);
 	bt_object_put_ref(event_class->payload_fc);
-	event_class->payload_fc = bt_object_get_ref(field_class);
+	event_class->payload_fc = field_class;
+	bt_object_get_no_null_check(event_class->payload_fc);
 	bt_field_class_freeze(field_class);
 	BT_LIB_LOGV("Set event class's payload field classe: %!+E", event_class);
 
@@ -368,10 +381,10 @@ end:
 }
 
 BT_HIDDEN
-void _bt_event_class_freeze(struct bt_event_class *event_class)
+void _bt_event_class_freeze(const struct bt_event_class *event_class)
 {
 	/* The field classes are already frozen */
 	BT_ASSERT(event_class);
 	BT_LIB_LOGD("Freezing event class: %!+E", event_class);
-	event_class->frozen = true;
+	((struct bt_event_class *) event_class)->frozen = true;
 }