X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fctf-meta-update-meanings.c;h=1e2bb1ae9ae8fddc2cbd4cbd4aba599fcfb67a54;hb=939190b374e61ac2a31e38ecc6c31f2f986690ab;hp=075ac2d65a60549e889e06e775f30daad4ccca20;hpb=108b91d0ffd01cce874850b767c0f358eb642523;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/ctf-meta-update-meanings.c b/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
index 075ac2d6..1e2bb1ae 100644
--- a/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
+++ b/plugins/ctf/common/metadata/ctf-meta-update-meanings.c
@@ -26,40 +26,40 @@
 #include "ctf-meta-visitors.h"
 
 static
-int set_int_field_type_meaning_by_name(struct ctf_field_type *ft,
+int set_int_field_class_meaning_by_name(struct ctf_field_class *fc,
 		const char *field_name, const char *id_name,
-		enum ctf_field_type_meaning meaning)
+		enum ctf_field_class_meaning meaning)
 {
 	int ret = 0;
 	uint64_t i;
 
-	if (!ft) {
+	if (!fc) {
 		goto end;
 	}
 
-	switch (ft->id) {
-	case CTF_FIELD_TYPE_ID_INT:
-	case CTF_FIELD_TYPE_ID_ENUM:
+	switch (fc->id) {
+	case CTF_FIELD_CLASS_ID_INT:
+	case CTF_FIELD_CLASS_ID_ENUM:
 	{
-		struct ctf_field_type_int *int_ft = (void *) ft;
+		struct ctf_field_class_int *int_fc = (void *) fc;
 
 		if (field_name && strcmp(field_name, id_name) == 0) {
-			int_ft->meaning = meaning;
+			int_fc->meaning = meaning;
 		}
 
 		break;
 	}
-	case CTF_FIELD_TYPE_ID_STRUCT:
+	case CTF_FIELD_CLASS_ID_STRUCT:
 	{
-		struct ctf_field_type_struct *struct_ft = (void *) ft;
+		struct ctf_field_class_struct *struct_fc = (void *) fc;
 
-		for (i = 0; i < struct_ft->members->len; i++) {
-			struct ctf_named_field_type *named_ft =
-				ctf_field_type_struct_borrow_member_by_index(
-					struct_ft, i);
+		for (i = 0; i < struct_fc->members->len; i++) {
+			struct ctf_named_field_class *named_fc =
+				ctf_field_class_struct_borrow_member_by_index(
+					struct_fc, i);
 
-			ret = set_int_field_type_meaning_by_name(named_ft->ft,
-				named_ft->name->str, id_name, meaning);
+			ret = set_int_field_class_meaning_by_name(named_fc->fc,
+				named_fc->name->str, id_name, meaning);
 			if (ret) {
 				goto end;
 			}
@@ -67,16 +67,16 @@ int set_int_field_type_meaning_by_name(struct ctf_field_type *ft,
 
 		break;
 	}
-	case CTF_FIELD_TYPE_ID_VARIANT:
+	case CTF_FIELD_CLASS_ID_VARIANT:
 	{
-		struct ctf_field_type_variant *var_ft = (void *) ft;
+		struct ctf_field_class_variant *var_fc = (void *) fc;
 
-		for (i = 0; i < var_ft->options->len; i++) {
-			struct ctf_named_field_type *named_ft =
-				ctf_field_type_variant_borrow_option_by_index(
-					var_ft, i);
+		for (i = 0; i < var_fc->options->len; i++) {
+			struct ctf_named_field_class *named_fc =
+				ctf_field_class_variant_borrow_option_by_index(
+					var_fc, i);
 
-			ret = set_int_field_type_meaning_by_name(named_ft->ft,
+			ret = set_int_field_class_meaning_by_name(named_fc->fc,
 				NULL, id_name, meaning);
 			if (ret) {
 				goto end;
@@ -85,12 +85,12 @@ int set_int_field_type_meaning_by_name(struct ctf_field_type *ft,
 
 		break;
 	}
-	case CTF_FIELD_TYPE_ID_ARRAY:
-	case CTF_FIELD_TYPE_ID_SEQUENCE:
+	case CTF_FIELD_CLASS_ID_ARRAY:
+	case CTF_FIELD_CLASS_ID_SEQUENCE:
 	{
-		struct ctf_field_type_array_base *array_ft = (void *) ft;
+		struct ctf_field_class_array_base *array_fc = (void *) fc;
 
-		ret = set_int_field_type_meaning_by_name(array_ft->elem_ft,
+		ret = set_int_field_class_meaning_by_name(array_fc->elem_fc,
 			NULL, id_name, meaning);
 		if (ret) {
 			goto end;
@@ -110,56 +110,56 @@ static
 int update_stream_class_meanings(struct ctf_stream_class *sc)
 {
 	int ret = 0;
-	struct ctf_field_type_int *int_ft;
+	struct ctf_field_class_int *int_fc;
 	uint64_t i;
 
 	if (!sc->is_translated) {
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) sc->packet_context_ft, "timestamp_begin");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_PACKET_BEGINNING_TIME;
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) sc->packet_context_fc, "timestamp_begin");
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_PACKET_BEGINNING_TIME;
 		}
 
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) sc->packet_context_ft, "timestamp_end");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_PACKET_END_TIME;
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) sc->packet_context_fc, "timestamp_end");
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_PACKET_END_TIME;
 
 			/*
 			 * Remove mapped clock class to avoid updating
 			 * the clock immediately when decoding.
 			 */
-			int_ft->mapped_clock_class = NULL;
+			int_fc->mapped_clock_class = NULL;
 		}
 
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) sc->packet_context_ft, "events_discarded");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_DISC_EV_REC_COUNTER_SNAPSHOT;
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) sc->packet_context_fc, "events_discarded");
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_DISC_EV_REC_COUNTER_SNAPSHOT;
 		}
 
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) sc->packet_context_ft, "packet_seq_num");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_PACKET_COUNTER_SNAPSHOT;
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) sc->packet_context_fc, "packet_seq_num");
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_PACKET_COUNTER_SNAPSHOT;
 
 		}
 
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) sc->packet_context_ft, "packet_size");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_EXP_PACKET_TOTAL_SIZE;
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) sc->packet_context_fc, "packet_size");
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_EXP_PACKET_TOTAL_SIZE;
 		}
 
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) sc->packet_context_ft, "content_size");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_EXP_PACKET_CONTENT_SIZE;
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) sc->packet_context_fc, "content_size");
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_EXP_PACKET_CONTENT_SIZE;
 		}
 
-		ret = set_int_field_type_meaning_by_name(
-			sc->event_header_ft, NULL, "id",
-			CTF_FIELD_TYPE_MEANING_EVENT_CLASS_ID);
+		ret = set_int_field_class_meaning_by_name(
+			sc->event_header_fc, NULL, "id",
+			CTF_FIELD_CLASS_MEANING_EVENT_CLASS_ID);
 		if (ret) {
 			goto end;
 		}
@@ -181,37 +181,37 @@ BT_HIDDEN
 int ctf_trace_class_update_meanings(struct ctf_trace_class *ctf_tc)
 {
 	int ret = 0;
-	struct ctf_field_type_int *int_ft;
-	struct ctf_named_field_type *named_ft;
+	struct ctf_field_class_int *int_fc;
+	struct ctf_named_field_class *named_fc;
 	uint64_t i;
 
 	if (!ctf_tc->is_translated) {
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) ctf_tc->packet_header_ft, "magic");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_MAGIC;
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) ctf_tc->packet_header_fc, "magic");
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_MAGIC;
 		}
 
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) ctf_tc->packet_header_ft, "stream_id");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_STREAM_CLASS_ID;
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) ctf_tc->packet_header_fc, "stream_id");
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_STREAM_CLASS_ID;
 		}
 
-		int_ft = ctf_field_type_struct_borrow_member_int_field_type_by_name(
-			(void *) ctf_tc->packet_header_ft,
+		int_fc = ctf_field_class_struct_borrow_member_int_field_class_by_name(
+			(void *) ctf_tc->packet_header_fc,
 			"stream_instance_id");
-		if (int_ft) {
-			int_ft->meaning = CTF_FIELD_TYPE_MEANING_DATA_STREAM_ID;
+		if (int_fc) {
+			int_fc->meaning = CTF_FIELD_CLASS_MEANING_DATA_STREAM_ID;
 		}
 
-		named_ft = ctf_field_type_struct_borrow_member_by_name(
-			(void *) ctf_tc->packet_header_ft, "uuid");
-		if (named_ft && named_ft->ft->id == CTF_FIELD_TYPE_ID_ARRAY) {
-			struct ctf_field_type_array *array_ft =
-				(void *) named_ft->ft;
+		named_fc = ctf_field_class_struct_borrow_member_by_name(
+			(void *) ctf_tc->packet_header_fc, "uuid");
+		if (named_fc && named_fc->fc->id == CTF_FIELD_CLASS_ID_ARRAY) {
+			struct ctf_field_class_array *array_fc =
+				(void *) named_fc->fc;
 
-			array_ft->meaning = CTF_FIELD_TYPE_MEANING_UUID;
+			array_fc->meaning = CTF_FIELD_CLASS_MEANING_UUID;
 		}
 	}