X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=b35f54a8ecba9cee1f5000323b47b3c082462c7a;hb=00607d510e7568c59206104f424952fa3ca0063c;hp=39620383879b3aae0076bb9aedf710e2d9c88d22;hpb=c34ea0fad3f9900c3b97efa229d221927422dacf;p=babeltrace.git

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 39620383..b35f54a8 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -172,9 +172,21 @@ struct definition *bt_ctf_get_field(struct bt_ctf_event *event,
 		const char *field)
 {
 	struct definition *def;
+	char *field_underscore;
 
 	if (scope) {
 		def = lookup_definition(scope, field);
+		/*
+		 * optionally a field can have an underscore prefix, try
+		 * to lookup the field with this prefix if it failed
+		 */
+		if (!def) {
+			field_underscore = g_new(char, strlen(field) + 2);
+			field_underscore[0] = '_';
+			strcpy(&field_underscore[1], field);
+			def = lookup_definition(scope, field_underscore);
+			g_free(field_underscore);
+		}
 		if (bt_ctf_field_type(def) == CTF_TYPE_VARIANT) {
 			struct definition_variant *variant_definition;
 			variant_definition = container_of(def,
@@ -222,7 +234,7 @@ const char *bt_ctf_event_name(struct bt_ctf_event *event)
 const char *bt_ctf_field_name(const struct definition *def)
 {
 	if (def)
-		return g_quark_to_string(def->name);
+		return rem_(g_quark_to_string(def->name));
 	return NULL;
 }
 
@@ -351,6 +363,84 @@ int bt_ctf_field_get_error(void)
 	return ret;
 }
 
+int bt_ctf_get_int_signedness(const struct definition *field)
+{
+	int ret;
+
+	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
+		ret = get_int_signedness(field);
+	} else {
+		ret = -1;
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
+int bt_ctf_get_int_base(const struct definition *field)
+{
+	int ret;
+
+	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
+		ret = get_int_base(field);
+	} else {
+		ret = -1;
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
+int bt_ctf_get_int_byte_order(const struct definition *field)
+{
+	int ret;
+
+	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
+		ret = get_int_byte_order(field);
+	} else {
+		ret = -1;
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
+enum ctf_string_encoding bt_ctf_get_encoding(const struct definition *field)
+{
+	enum ctf_string_encoding ret = 0;
+
+	if (!field)
+		goto end;
+
+	if (bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
+		ret = get_int_encoding(field);
+	else if (bt_ctf_field_type(field) == CTF_TYPE_STRING)
+		ret = get_string_encoding(field);
+	else
+		goto error;
+
+end:
+	return ret;
+
+error:
+	bt_ctf_field_set_error(-EINVAL);
+	return -1;
+}
+
+int bt_ctf_get_array_len(const struct definition *field)
+{
+	int ret;
+
+	if (field && bt_ctf_field_type(field) == CTF_TYPE_ARRAY) {
+		ret = get_array_len(field);
+	} else {
+		ret = -1;
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
 uint64_t bt_ctf_get_uint64(const struct definition *field)
 {
 	unsigned int ret = 0;