X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents.c;h=d9460b169e98e68ebb0c0f6a9630b4f563f4d522;hp=a9f5c22ee170815f0e5450d2c82d78cc27627400;hb=1b8455b701df7ac196e35795b9ab8ef2d402058d;hpb=7f89ddce05f0a5c985d6333fbe70a992da4bd244

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index a9f5c22e..d9460b16 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -17,6 +17,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/babeltrace.h>
@@ -41,8 +49,8 @@ __thread int bt_ctf_last_field_error = 0;
 const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event,
 		enum bt_ctf_scope scope)
 {
-	struct definition *tmp = NULL;
-	struct ctf_event_definition *event;
+	const struct definition *tmp = NULL;
+	const struct ctf_event_definition *event;
 
 	if (!ctf_event)
 		return NULL;
@@ -92,13 +100,13 @@ const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
 		const struct definition *scope,
 		const char *field)
 {
-	struct definition *def;
+	const struct definition *def;
 	char *field_underscore;
 
 	if (!ctf_event || !scope || !field)
 		return NULL;
 
-	def = lookup_definition(scope, field);
+	def = bt_lookup_definition(scope, field);
 	/*
 	 * optionally a field can have an underscore prefix, try
 	 * to lookup the field with this prefix if it failed
@@ -107,13 +115,13 @@ const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
 		field_underscore = g_new(char, strlen(field) + 2);
 		field_underscore[0] = '_';
 		strcpy(&field_underscore[1], field);
-		def = lookup_definition(scope, field_underscore);
+		def = bt_lookup_definition(scope, field_underscore);
 		g_free(field_underscore);
 	}
-	if (bt_ctf_field_type(def) == CTF_TYPE_VARIANT) {
-		struct definition_variant *variant_definition;
+	if (bt_ctf_field_type(bt_ctf_get_decl_from_def(def)) == CTF_TYPE_VARIANT) {
+		const struct definition_variant *variant_definition;
 		variant_definition = container_of(def,
-				struct definition_variant, p);
+				const struct definition_variant, p);
 		return variant_definition->current_field;
 	}
 	return def;
@@ -128,25 +136,25 @@ const struct definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event,
 	if (!ctf_event || !field)
 		return NULL;
 
-	if (bt_ctf_field_type(field) == CTF_TYPE_ARRAY) {
+	if (bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_ARRAY) {
 		struct definition_array *array_definition;
 		array_definition = container_of(field,
 				struct definition_array, p);
-		ret = array_index(array_definition, index);
-	} else if (bt_ctf_field_type(field) == CTF_TYPE_SEQUENCE) {
+		ret = bt_array_index(array_definition, index);
+	} else if (bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_SEQUENCE) {
 		struct definition_sequence *sequence_definition;
 		sequence_definition = container_of(field,
 				struct definition_sequence, p);
-		ret = sequence_index(sequence_definition, index);
+		ret = bt_sequence_index(sequence_definition, index);
 	}
 	return ret;
 }
 
 const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event)
 {
-	struct ctf_event_declaration *event_class;
-	struct ctf_stream_declaration *stream_class;
-	struct ctf_event_definition *event;
+	const struct ctf_event_declaration *event_class;
+	const struct ctf_stream_declaration *stream_class;
+	const struct ctf_event_definition *event;
 
 	if (!ctf_event)
 		return NULL;
@@ -160,18 +168,18 @@ const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event)
 
 const char *bt_ctf_field_name(const struct definition *def)
 {
-	if (!def)
+	if (!def || !def->name)
 		return NULL;
 
 	return rem_(g_quark_to_string(def->name));
 }
 
-enum ctf_type_id bt_ctf_field_type(const struct definition *def)
+enum ctf_type_id bt_ctf_field_type(const struct declaration *decl)
 {
-	if (!def)
+	if (!decl)
 		return CTF_TYPE_UNKNOWN;
 
-	return def->declaration->id;
+	return decl->id;
 }
 
 int bt_ctf_get_field_list(const struct bt_ctf_event *ctf_event,
@@ -182,7 +190,7 @@ int bt_ctf_get_field_list(const struct bt_ctf_event *ctf_event,
 	if (!ctf_event || !scope || !list || !count)
 		return -EINVAL;
 
-	switch (bt_ctf_field_type(scope)) {
+	switch (bt_ctf_field_type(bt_ctf_get_decl_from_def(scope))) {
 	case CTF_TYPE_INTEGER:
 	case CTF_TYPE_FLOAT:
 	case CTF_TYPE_STRING:
@@ -270,15 +278,15 @@ error:
 struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *ctf_event)
 {
 	struct bt_context *ret = NULL;
-	struct ctf_file_stream *cfs;
-	struct ctf_trace *trace;
-	struct ctf_event_definition *event;
+	const struct ctf_file_stream *cfs;
+	const struct ctf_trace *trace;
+	const struct ctf_event_definition *event;
 
 	if (!ctf_event)
 		return NULL;
 
 	event = ctf_event->parent;
-	cfs = container_of(event->stream, struct ctf_file_stream,
+	cfs = container_of(event->stream, const struct ctf_file_stream,
 			parent);
 	trace = cfs->parent.stream_class->trace;
 	if (trace->ctx)
@@ -290,15 +298,15 @@ struct bt_context *bt_ctf_event_get_context(const struct bt_ctf_event *ctf_event
 int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
 {
 	int ret = -1;
-	struct ctf_file_stream *cfs;
-	struct ctf_trace *trace;
-	struct ctf_event_definition *event;
+	const struct ctf_file_stream *cfs;
+	const struct ctf_trace *trace;
+	const struct ctf_event_definition *event;
 
 	if (!ctf_event)
 		return -EINVAL;
 
 	event = ctf_event->parent;
-	cfs = container_of(event->stream, struct ctf_file_stream,
+	cfs = container_of(event->stream, const struct ctf_file_stream,
 			parent);
 	trace = cfs->parent.stream_class->trace;
 	if (trace->handle)
@@ -309,7 +317,7 @@ int bt_ctf_event_get_handle_id(const struct bt_ctf_event *ctf_event)
 
 uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event)
 {
-	struct ctf_event_definition *event;
+	const struct ctf_event_definition *event;
 
 	if (!ctf_event)
 		return -1ULL;
@@ -323,7 +331,7 @@ uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event)
 
 uint64_t bt_ctf_get_cycles(const struct bt_ctf_event *ctf_event)
 {
-	struct ctf_event_definition *event;
+	const struct ctf_event_definition *event;
 
 	if (!ctf_event)
 		return -1ULL;
@@ -349,75 +357,182 @@ int bt_ctf_field_get_error(void)
 	return ret;
 }
 
-int bt_ctf_get_int_signedness(const struct definition *field)
+static const struct declaration_integer *
+get_declaration_integer(const struct declaration *decl)
 {
-	int ret;
+	if (!decl || bt_ctf_field_type(decl) != CTF_TYPE_INTEGER)
+		return NULL;
+	return container_of(decl, const struct declaration_integer, p);
+}
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
-		ret = get_int_signedness(field);
-	} else {
-		ret = -EINVAL;
+static const struct declaration_string *
+get_declaration_string(const struct declaration *decl)
+{
+	if (!decl || bt_ctf_field_type(decl) != CTF_TYPE_STRING)
+		return NULL;
+	return container_of(decl, const struct declaration_string, p);
+}
+
+static const struct declaration_array *
+get_declaration_array(const struct declaration *decl)
+{
+	if (!decl || bt_ctf_field_type(decl) != CTF_TYPE_ARRAY)
+		return NULL;
+	return container_of(decl, const struct declaration_array, p);
+}
+
+static const struct declaration_sequence *
+get_declaration_sequence(const struct declaration *decl)
+{
+	if (!decl || bt_ctf_field_type(decl) != CTF_TYPE_SEQUENCE)
+		return NULL;
+	return container_of(decl, const struct declaration_sequence, p);
+}
+
+int bt_ctf_get_int_signedness(const struct declaration *decl)
+{
+	const struct declaration_integer *integer;
+
+	integer = get_declaration_integer(decl);
+	if (!integer) {
 		bt_ctf_field_set_error(-EINVAL);
+		return -EINVAL;
 	}
-
-	return ret;
+	return integer->signedness;
 }
 
-int bt_ctf_get_int_base(const struct definition *field)
+int bt_ctf_get_int_base(const struct declaration *decl)
 {
-	int ret;
+	const struct declaration_integer *integer;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
-		ret = get_int_base(field);
-	} else {
-		ret = -EINVAL;
+	integer = get_declaration_integer(decl);
+	if (!integer) {
 		bt_ctf_field_set_error(-EINVAL);
+		return -EINVAL;
 	}
+	return integer->base;
+}
 
-	return ret;
+int bt_ctf_get_int_byte_order(const struct declaration *decl)
+{
+	const struct declaration_integer *integer;
+
+	integer = get_declaration_integer(decl);
+	if (!integer) {
+		bt_ctf_field_set_error(-EINVAL);
+		return -EINVAL;
+	}
+	return integer->byte_order;
 }
 
-int bt_ctf_get_int_byte_order(const struct definition *field)
+ssize_t bt_ctf_get_int_len(const struct declaration *decl)
 {
-	int ret;
+	const struct declaration_integer *integer;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
-		ret = get_int_byte_order(field);
-	} else {
-		ret = -EINVAL;
+	integer = get_declaration_integer(decl);
+	if (!integer) {
 		bt_ctf_field_set_error(-EINVAL);
+		return -EINVAL;
 	}
+	return (ssize_t) integer->len;
+}
 
-	return ret;
+const struct definition *bt_ctf_get_enum_int(const struct definition *field)
+{
+	const struct definition_enum *def_enum;
+
+	if (!field || bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) != CTF_TYPE_ENUM) {
+		bt_ctf_field_set_error(-EINVAL);
+		return NULL;
+	}
+	def_enum = container_of(field, const struct definition_enum, p);
+	return &def_enum->integer->p;
 }
 
-ssize_t bt_ctf_get_int_len(const struct definition *field)
+const char *bt_ctf_get_enum_str(const struct definition *field)
 {
-	ssize_t ret;
+	const struct definition_enum *def_enum;
+	const struct declaration_enum *decl_enum;
+	GArray *array;
+	const char *ret;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER) {
-		ret = (ssize_t) get_int_len(field);
-	} else {
-		ret = -EINVAL;
+	if (!field || bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) != CTF_TYPE_ENUM) {
 		bt_ctf_field_set_error(-EINVAL);
+		return NULL;
+	}
+	def_enum = container_of(field, const struct definition_enum, p);
+	decl_enum = def_enum->declaration;
+	if (bt_get_int_signedness(&def_enum->integer->p)) {
+		array = bt_enum_int_to_quark_set(decl_enum,
+			bt_get_signed_int(&def_enum->integer->p));
+	} else {
+		array = bt_enum_uint_to_quark_set(decl_enum,
+			bt_get_unsigned_int(&def_enum->integer->p));
+	}
+	if (!array) {
+		bt_ctf_field_set_error(-ENOENT);
+		return NULL;
 	}
 
+	if (array->len == 0) {
+		g_array_unref(array);
+		bt_ctf_field_set_error(-ENOENT);
+		return NULL;
+	}	
+	/* Return first string. Arbitrary choice. */
+	ret = g_quark_to_string(g_array_index(array, GQuark, 0));
+	g_array_unref(array);
 	return ret;
 }
 
-enum ctf_string_encoding bt_ctf_get_encoding(const struct definition *field)
+enum ctf_string_encoding bt_ctf_get_encoding(const struct declaration *decl)
 {
 	enum ctf_string_encoding ret = 0;
+	enum ctf_type_id type;
+	const struct declaration_integer *integer;
+	const struct declaration_string *string;
+	const struct declaration_array *array;
+	const struct declaration_sequence *sequence;
 
-	if (!field)
+	if (!decl)
 		goto error;
 
-	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
+	type = bt_ctf_field_type(decl);
+
+	switch (type) {
+	case CTF_TYPE_ARRAY:
+		array = get_declaration_array(decl);
+		if (!array)
+			goto error;
+		integer = get_declaration_integer(array->elem);
+		if (!integer)
+			goto error;
+		ret = integer->encoding;
+		break;
+	case CTF_TYPE_SEQUENCE:
+		sequence = get_declaration_sequence(decl);
+		if (!sequence)
+			goto error;
+		integer = get_declaration_integer(sequence->elem);
+		if (!integer)
+			goto error;
+		ret = integer->encoding;
+		break;
+	case CTF_TYPE_STRING:
+		string = get_declaration_string(decl);
+		if (!string)
+			goto error;
+		ret = string->encoding;
+		break;
+	case CTF_TYPE_INTEGER:
+		integer = get_declaration_integer(decl);
+		if (!integer)
+			goto error;
+		ret = integer->encoding;
+		break;
+	default:
 		goto error;
+	}
 	return ret;
 
 error:
@@ -425,26 +540,26 @@ error:
 	return -1;
 }
 
-int bt_ctf_get_array_len(const struct definition *field)
+int bt_ctf_get_array_len(const struct declaration *decl)
 {
-	int ret;
+	const struct declaration_array *array;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_ARRAY) {
-		ret = get_array_len(field);
-	} else {
-		ret = -1;
-		bt_ctf_field_set_error(-EINVAL);
-	}
+	array = get_declaration_array(decl);
+	if (!array)
+		goto error;
+	return array->len;
 
-	return ret;
+error:
+	bt_ctf_field_set_error(-EINVAL);
+	return -1;
 }
 
 uint64_t bt_ctf_get_uint64(const struct definition *field)
 {
 	uint64_t ret = 0;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
-		ret = get_unsigned_int(field);
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_INTEGER)
+		ret = bt_get_unsigned_int(field);
 	else
 		bt_ctf_field_set_error(-EINVAL);
 
@@ -455,24 +570,29 @@ int64_t bt_ctf_get_int64(const struct definition *field)
 {
 	int64_t ret = 0;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_INTEGER)
-		ret = get_signed_int(field);
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_INTEGER)
+		ret = bt_get_signed_int(field);
 	else
 		bt_ctf_field_set_error(-EINVAL);
 
 	return ret;
-
 }
 
 char *bt_ctf_get_char_array(const struct definition *field)
 {
 	char *ret = NULL;
+	GString *char_array;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_ARRAY)
-		ret = get_char_array(field)->str;
-	else
-		bt_ctf_field_set_error(-EINVAL);
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_ARRAY) {
+		char_array = bt_get_char_array(field);
+		if (char_array) {
+			ret = char_array->str;
+			goto end;
+		}
+	}
+	bt_ctf_field_set_error(-EINVAL);
 
+end:
 	return ret;
 }
 
@@ -480,8 +600,8 @@ char *bt_ctf_get_string(const struct definition *field)
 {
 	char *ret = NULL;
 
-	if (field && bt_ctf_field_type(field) == CTF_TYPE_STRING)
-		ret = get_string(field);
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_STRING)
+		ret = bt_get_string(field);
 	else
 		bt_ctf_field_set_error(-EINVAL);
 
@@ -493,7 +613,7 @@ int bt_ctf_get_event_decl_list(int handle_id, struct bt_context *ctx,
 		unsigned int *count)
 {
 	struct bt_trace_handle *handle;
-	struct trace_descriptor *td;
+	struct bt_trace_descriptor *td;
 	struct ctf_trace *tin;
 
 	if (!ctx || !list || !count)
@@ -646,3 +766,20 @@ const char *bt_ctf_get_decl_field_name(const struct bt_ctf_field_decl *field)
 
 	return rem_(g_quark_to_string(((struct declaration_field *) field)->name));
 }
+
+const struct declaration *bt_ctf_get_decl_from_def(const struct definition *def)
+{
+	if (def)
+		return def->declaration;
+
+	return NULL;
+}
+
+const struct declaration *bt_ctf_get_decl_from_field_decl(
+		const struct bt_ctf_field_decl *field)
+{
+	if (field)
+		return ((struct declaration_field *) field)->declaration;
+
+	return NULL;
+}