X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=da9ca5c5faeabef771f70fcadf5e57599ffc209a;hp=080ea6f17a7182ef7eabc0e3ed34e124e5cc5dba;hb=81dee1bb528a95f7bf2bc622948807150794a75e;hpb=46322b331aefc5739efd841df72d1928e35050e6

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index 080ea6f1..da9ca5c5 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -31,14 +31,11 @@
 /* Preallocate this many fields for structures */
 #define DEFAULT_NR_STRUCT_FIELDS 8
 
+struct ctf_stream;
 struct stream_pos;
 struct format;
 struct definition;
 
-/* Parent of per-plugin positions */
-struct stream_pos {
-};
-
 /* type scope */
 struct declaration_scope {
 	/* Hash table mapping type name GQuark to "struct declaration" */
@@ -94,24 +91,49 @@ struct declaration {
 	struct definition *
 		(*definition_new)(struct declaration *declaration,
 				  struct definition_scope *parent_scope,
-				  GQuark field_name, int index);
+				  GQuark field_name, int index,
+				  const char *root_name);
 	/*
 	 * definition_free called with definition ref is decremented to 0.
 	 */
 	void (*definition_free)(struct definition *definition);
-	/*
-	 * Definition copy function. Knows how to find the child
-	 * definition from the parent definition.
-	 */
-	void (*copy)(struct stream_pos *dest, const struct format *fdest, 
-		     struct stream_pos *src, const struct format *fsrc,
-		     struct definition *definition);
 };
 
 struct definition {
 	struct declaration *declaration;
 	int index;		/* Position of the definition in its container */
+	GQuark name;		/* Field name in its container (or 0 if unset) */
 	int ref;		/* number of references to the definition */
+	GQuark path;
+};
+
+typedef int (*rw_dispatch)(struct stream_pos *pos,
+			   struct definition *definition);
+
+/* Parent of per-plugin positions */
+struct stream_pos {
+	/* read/write dispatch table. Specific to plugin used for stream. */
+	rw_dispatch *rw_table;	/* rw dispatch table */
+	int (*event_cb)(struct stream_pos *pos,
+			struct ctf_stream *stream);
+};
+
+static inline
+int generic_rw(struct stream_pos *pos, struct definition *definition)
+{
+	enum ctf_type_id dispatch_id = definition->declaration->id;
+	rw_dispatch call;
+
+	assert(pos->rw_table[dispatch_id] != NULL);
+	call = pos->rw_table[dispatch_id];
+	return call(pos, definition);
+}
+
+enum ctf_string_encoding {
+	CTF_STRING_NONE = 0,
+	CTF_STRING_UTF8,
+	CTF_STRING_ASCII,
+	CTF_STRING_UNKNOWN,
 };
 
 /*
@@ -124,6 +146,8 @@ struct declaration_integer {
 	size_t len;		/* length, in bits. */
 	int byte_order;		/* byte order */
 	int signedness;
+	int base;		/* Base for pretty-printing: 2, 8, 10, 16 */
+	enum ctf_string_encoding encoding;
 };
 
 struct definition_integer {
@@ -148,6 +172,10 @@ struct declaration_float {
 struct definition_float {
 	struct definition p;
 	struct declaration_float *declaration;
+	struct definition_integer *sign;
+	struct definition_integer *mantissa;
+	struct definition_integer *exp;
+	struct definition_scope *scope;
 	/* Last values read */
 	long double value;
 };
@@ -200,16 +228,11 @@ struct definition_enum {
 	struct definition p;
 	struct definition_integer *integer;
 	struct declaration_enum *declaration;
+	struct definition_scope *scope;
 	/* Last GQuark values read. Keeping a reference on the GQuark array. */
 	GArray *value;
 };
 
-enum ctf_string_encoding {
-	CTF_STRING_UTF8 = 0,
-	CTF_STRING_ASCII,
-	CTF_STRING_UNKNOWN,
-};
-
 struct declaration_string {
 	struct declaration p;
 	enum ctf_string_encoding encoding;
@@ -219,6 +242,7 @@ struct definition_string {
 	struct definition p;
 	struct declaration_string *declaration;
 	char *value;	/* freed at definition_string teardown */
+	size_t len, alloc_len;
 };
 
 struct declaration_field {
@@ -226,11 +250,6 @@ struct declaration_field {
 	struct declaration *declaration;
 };
 
-struct field {
-	GQuark name;
-	struct definition *definition;
-};
-
 struct declaration_struct {
 	struct declaration p;
 	GHashTable *fields_by_name;	/* Tuples (field name, field index) */
@@ -242,7 +261,7 @@ struct definition_struct {
 	struct definition p;
 	struct declaration_struct *declaration;
 	struct definition_scope *scope;
-	GArray *fields;			/* Array of struct field */
+	GPtrArray *fields;		/* Array of pointers to struct definition */
 };
 
 struct declaration_untagged_variant {
@@ -264,8 +283,8 @@ struct definition_variant {
 	struct declaration_variant *declaration;
 	struct definition_scope *scope;
 	struct definition *enum_tag;
-	GArray *fields;			/* Array of struct field */
-	struct field *current_field;	/* Last field read */
+	GPtrArray *fields;		/* Array of pointers to struct definition */
+	struct definition *current_field;	/* Last field read */
 };
 
 struct declaration_array {
@@ -279,12 +298,13 @@ struct definition_array {
 	struct definition p;
 	struct declaration_array *declaration;
 	struct definition_scope *scope;
-	GArray *elems;			/* struct field */
+	GPtrArray *elems;		/* Array of pointers to struct definition */
+	GString *string;		/* String for encoded integer children */
 };
 
 struct declaration_sequence {
 	struct declaration p;
-	struct declaration_integer *len_declaration;
+	GArray *length_name;		/* Array of GQuark */
 	struct declaration *elem;
 	struct declaration_scope *scope;
 };
@@ -293,8 +313,9 @@ struct definition_sequence {
 	struct definition p;
 	struct declaration_sequence *declaration;
 	struct definition_scope *scope;
-	struct definition_integer *len;
-	GArray *elems;			/* struct field */
+	struct definition_integer *length;
+	GPtrArray *elems;		/* Array of pointers to struct definition */
+	GString *string;		/* String for encoded integer children */
 };
 
 int register_declaration(GQuark declaration_name,
@@ -344,12 +365,18 @@ int register_field_definition(GQuark field_name,
 			      struct definition_scope *scope);
 struct definition_scope *
 	new_definition_scope(struct definition_scope *parent_scope,
-			     GQuark field_name);
-void set_dynamic_definition_scope(struct definition *definition,
-				  struct definition_scope *scope,
-				  const char *root_name);
+			     GQuark field_name, const char *root_name);
 void free_definition_scope(struct definition_scope *scope);
 
+GQuark new_definition_path(struct definition_scope *parent_scope,
+			   GQuark field_name, const char *root_name);
+
+static inline
+int compare_definition_path(struct definition *definition, GQuark path)
+{
+	return definition->path == path;
+}
+
 void declaration_ref(struct declaration *declaration);
 void declaration_unref(struct declaration *declaration);
 
@@ -357,7 +384,8 @@ void definition_ref(struct definition *definition);
 void definition_unref(struct definition *definition);
 
 struct declaration_integer *integer_declaration_new(size_t len, int byte_order,
-				      int signedness, size_t alignment);
+				  int signedness, size_t alignment,
+				  int base, enum ctf_string_encoding encoding);
 
 /*
  * mantissa_len is the length of the number of bytes represented by the mantissa
@@ -406,7 +434,8 @@ struct declaration_string *
 	string_declaration_new(enum ctf_string_encoding encoding);
 
 struct declaration_struct *
-	struct_declaration_new(struct declaration_scope *parent_scope);
+	struct_declaration_new(struct declaration_scope *parent_scope,
+			       uint64_t min_align);
 void struct_declaration_add_field(struct declaration_struct *struct_declaration,
 				  const char *field_name,
 				  struct declaration *field_declaration);
@@ -421,9 +450,11 @@ int struct_declaration_lookup_field_index(struct declaration_struct *struct_decl
 struct declaration_field *
 struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration,
 					int index);
-struct field *
+struct definition *
 struct_definition_get_field_from_index(struct definition_struct *struct_definition,
 				       int index);
+int struct_rw(struct stream_pos *pos, struct definition *definition);
+uint64_t struct_declaration_len(struct declaration_struct *struct_declaration);
 
 /*
  * The tag enumeration is validated to ensure that it contains only mappings
@@ -451,7 +482,8 @@ int variant_definition_set_tag(struct definition_variant *variant,
  * field returned only valid as long as the variant structure is not appended
  * to.
  */
-struct field *variant_get_current_field(struct definition_variant *variant);
+struct definition *variant_get_current_field(struct definition_variant *variant);
+int variant_rw(struct stream_pos *pos, struct definition *definition);
 
 /*
  * elem_declaration passed as parameter now belongs to the array. No
@@ -463,21 +495,23 @@ struct declaration_array *
 		struct declaration_scope *parent_scope);
 uint64_t array_len(struct definition_array *array);
 struct definition *array_index(struct definition_array *array, uint64_t i);
+int array_rw(struct stream_pos *pos, struct definition *definition);
 
 /*
  * int_declaration and elem_declaration passed as parameter now belong
  * to the sequence. No need to free them explicitly.
  */
 struct declaration_sequence *
-	sequence_declaration_new(struct declaration_integer *len_declaration, 
+	sequence_declaration_new(const char *length_name,
 		struct declaration *elem_declaration,
 		struct declaration_scope *parent_scope);
 uint64_t sequence_len(struct definition_sequence *sequence);
 struct definition *sequence_index(struct definition_sequence *sequence, uint64_t i);
+int sequence_rw(struct stream_pos *pos, struct definition *definition);
 
 /*
  * in: path (dot separated), out: q (GArray of GQuark)
  */
 void append_scope_path(const char *path, GArray *q);
 
-#endif /* _BABELTRACE_declarationS_H */
+#endif /* _BABELTRACE_TYPES_H */