X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=bindings%2Fpython%2Fpython-complements.c;h=6f947bd04e331cb3675a3820b8166e6e2af18e5f;hp=a4ee37e23262f4c014527061a4016d0ea2d059f0;hb=e11b8d3a38c016ebbbc849e2b1aabf0a80a28ce4;hpb=bb919dd077169b5ee049ba3fc82f8555648cb22e

diff --git a/bindings/python/python-complements.c b/bindings/python/python-complements.c
index a4ee37e2..6f947bd0 100644
--- a/bindings/python/python-complements.c
+++ b/bindings/python/python-complements.c
@@ -19,6 +19,8 @@
  */
 
 #include "python-complements.h"
+#include <babeltrace/ctf-writer/event-types-internal.h>
+#include <babeltrace/ctf-writer/event-fields-internal.h>
 
 /* FILE functions
    ----------------------------------------------------
@@ -44,46 +46,43 @@ void _bt_file_close(FILE *fp)
 */
 
 /* ctf-field-list */
-struct definition **_bt_python_field_listcaller(
+struct bt_definition **_bt_python_field_listcaller(
 		const struct bt_ctf_event *ctf_event,
-		const struct definition *scope)
+		const struct bt_definition *scope,
+		unsigned int *len)
 {
-	struct definition **list;
-	unsigned int count;
+	struct bt_definition **list;
 	int ret;
 
 	ret = bt_ctf_get_field_list(ctf_event, scope,
-		(const struct definition * const **)&list, &count);
+		(const struct bt_definition * const **)&list, len);
 
 	if (ret < 0)	/* For python to know an error occured */
 		list = NULL;
-	else		/* For python to know the end is reached */
-		list[count] = NULL;
 
 	return list;
 }
 
-struct definition *_bt_python_field_one_from_list(
-		struct definition **list, int index)
+struct bt_definition *_bt_python_field_one_from_list(
+		struct bt_definition **list, int index)
 {
 	return list[index];
 }
 
 /* event_decl_list */
 struct bt_ctf_event_decl **_bt_python_event_decl_listcaller(
-		int handle_id, struct bt_context *ctx)
+		int handle_id,
+		struct bt_context *ctx,
+		unsigned int *len)
 {
 	struct bt_ctf_event_decl **list;
-	unsigned int count;
 	int ret;
 
 	ret = bt_ctf_get_event_decl_list(handle_id, ctx,
-		(struct bt_ctf_event_decl * const **)&list, &count);
+		(struct bt_ctf_event_decl * const **)&list, len);
 
 	if (ret < 0)	/* For python to know an error occured */
 		list = NULL;
-	else		/* For python to know the end is reached */
-		list[count] = NULL;
 
 	return list;
 }
@@ -97,19 +96,17 @@ struct bt_ctf_event_decl *_bt_python_decl_one_from_list(
 /* decl_fields */
 struct bt_ctf_field_decl **_by_python_field_decl_listcaller(
 		struct bt_ctf_event_decl *event_decl,
-		enum bt_ctf_scope scope)
+		enum bt_ctf_scope scope,
+		unsigned int *len)
 {
 	struct bt_ctf_field_decl **list;
-	unsigned int count;
 	int ret;
 
 	ret = bt_ctf_get_decl_fields(event_decl, scope,
-		(const struct bt_ctf_field_decl * const **)&list, &count);
+		(const struct bt_ctf_field_decl * const **)&list, len);
 
 	if (ret < 0)	/* For python to know an error occured */
 		list = NULL;
-	else		/* For python to know the end is reached */
-		list[count] = NULL;
 
 	return list;
 }
@@ -119,3 +116,123 @@ struct bt_ctf_field_decl *_bt_python_field_decl_one_from_list(
 {
 	return list[index];
 }
+
+struct definition_array *_bt_python_get_array_from_def(
+		struct bt_definition *field)
+{
+	const struct bt_declaration *array_decl;
+	struct definition_array *array = NULL;
+
+	if (!field) {
+		goto end;
+	}
+
+	array_decl = bt_ctf_get_decl_from_def(field);
+	if (bt_ctf_field_type(array_decl) == CTF_TYPE_ARRAY) {
+		array = container_of(field, struct definition_array, p);
+	}
+end:
+	return array;
+}
+
+struct bt_declaration *_bt_python_get_array_element_declaration(
+		struct bt_declaration *field)
+{
+	struct declaration_array *array_decl;
+	struct bt_declaration *ret = NULL;
+
+	if (!field) {
+		goto end;
+	}
+
+	array_decl = container_of(field, struct declaration_array, p);
+	ret = array_decl->elem;
+end:
+	return ret;
+}
+
+struct bt_declaration *_bt_python_get_sequence_element_declaration(
+		struct bt_declaration *field)
+{
+	struct declaration_sequence *sequence_decl;
+	struct bt_declaration *ret = NULL;
+
+	if (!field) {
+		goto end;
+	}
+
+	sequence_decl = container_of(field, struct declaration_sequence, p);
+	ret = sequence_decl->elem;
+end:
+	return ret;
+}
+
+const char *_bt_python_get_array_string(struct bt_definition *field)
+{
+	struct definition_array *array;
+	const char *ret = NULL;
+
+	if (!field) {
+		goto end;
+	}
+
+	array = container_of(field, struct definition_array, p);
+	ret = array->string->str;
+end:
+	return ret;
+}
+
+const char *_bt_python_get_sequence_string(struct bt_definition *field)
+{
+	struct definition_sequence *sequence;
+	const char *ret = NULL;
+
+	if (!field) {
+		goto end;
+	}
+
+	sequence = container_of(field, struct definition_sequence, p);
+	ret = sequence->string->str;
+end:
+	return ret;
+}
+
+struct definition_sequence *_bt_python_get_sequence_from_def(
+		struct bt_definition *field)
+{
+	if (field && bt_ctf_field_type(
+		bt_ctf_get_decl_from_def(field)) == CTF_TYPE_SEQUENCE) {
+		return container_of(field, struct definition_sequence, p);
+	}
+
+	return NULL;
+}
+
+int _bt_python_field_integer_get_signedness(const struct bt_ctf_field *field)
+{
+	int ret;
+
+	if (!field || field->type->declaration->id != CTF_TYPE_INTEGER) {
+		ret = -1;
+		goto end;
+	}
+
+	const struct bt_ctf_field_type_integer *type = container_of(field->type,
+		const struct bt_ctf_field_type_integer, parent);
+	ret = type->declaration.signedness;
+end:
+	return ret;
+}
+
+enum ctf_type_id _bt_python_get_field_type(const struct bt_ctf_field *field)
+{
+	enum ctf_type_id type_id = CTF_TYPE_UNKNOWN;
+
+	if (!field) {
+		goto end;
+	}
+
+	type_id = field->type->declaration->id;
+end:
+	return type_id;
+}