X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=c44ea2ddbaab3e5bff4aa7072b3ad52062c6ad8b;hb=d11e9c4975d88591e2324b6b11f426a22995833f;hp=d01b672437c5512017c09fa017b55c97dfd51ec3;hpb=0f980a3595f61930659e392b1248c59490dd5a22;p=babeltrace.git

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index d01b6724..c44ea2dd 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -95,13 +95,6 @@ struct declaration {
 	 * 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 {
@@ -110,6 +103,26 @@ struct definition {
 	int ref;		/* number of references to the definition */
 };
 
+typedef void (*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 */
+};
+
+static inline
+void 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];
+	call(pos, definition);
+}
+
 /*
  * Because we address in bits, bitfields end up being exactly the same as
  * integers, except that their read/write functions must be able to deal with
@@ -144,6 +157,9 @@ 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;
 	/* Last values read */
 	long double value;
 };
@@ -215,6 +231,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 {
@@ -420,6 +437,7 @@ struct_declaration_get_field_from_index(struct declaration_struct *struct_declar
 struct field *
 struct_definition_get_field_from_index(struct definition_struct *struct_definition,
 				       int index);
+void struct_rw(struct stream_pos *pos, struct definition *definition);
 
 /*
  * The tag enumeration is validated to ensure that it contains only mappings
@@ -448,6 +466,7 @@ int variant_definition_set_tag(struct definition_variant *variant,
  * to.
  */
 struct field *variant_get_current_field(struct definition_variant *variant);
+void variant_rw(struct stream_pos *pos, struct definition *definition);
 
 /*
  * elem_declaration passed as parameter now belongs to the array. No
@@ -457,7 +476,9 @@ struct field *variant_get_current_field(struct definition_variant *variant);
 struct declaration_array *
 	array_declaration_new(size_t len, struct declaration *elem_declaration,
 		struct declaration_scope *parent_scope);
+uint64_t array_len(struct definition_array *array);
 struct definition *array_index(struct definition_array *array, uint64_t i);
+void array_rw(struct stream_pos *pos, struct definition *definition);
 
 /*
  * int_declaration and elem_declaration passed as parameter now belong
@@ -467,7 +488,9 @@ struct declaration_sequence *
 	sequence_declaration_new(struct declaration_integer *len_declaration, 
 		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);
+void sequence_rw(struct stream_pos *pos, struct definition *definition);
 
 /*
  * in: path (dot separated), out: q (GArray of GQuark)