X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=590ab4cb1cca73ef14c14aff98d3e7d45a261b35;hp=7162c0ea0822cbb2320317407aa1be87d0020f5e;hb=7fb210365ad968646a0088d80f709165bf068950;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 7162c0ea..590ab4cb 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,7 +6,7 @@
  *
  * Trace Format Header
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -19,61 +19,72 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <babeltrace/types.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <glib.h>
 
 struct format {
 	GQuark name;
 
 	uint64_t (*uint_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
+		const struct declaration_integer *integer_declaration);
 	int64_t (*int_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
+		const struct declaration_integer *integer_declaration);
 	void (*uint_write)(struct stream_pos *pos,
-			   const struct type_class_integer *int_class,
-			   uint64_t v);
+		const struct declaration_integer *integer_declaration,
+		uint64_t v);
 	void (*int_write)(struct stream_pos *pos,
-			  const struct type_class_integer *int_class,
-			  int64_t v);
+		const struct declaration_integer *integer_declaration,
+		int64_t v);
 
-	void (*float_copy)(struct stream_pos *dest,
-			   struct stream_pos *src,
-			   const struct type_class_float *src);
+	void (*float_copy)(struct stream_pos *destp,
+		struct stream_pos *srcp,
+		const struct declaration_float *float_declaration);
 	double (*double_read)(struct stream_pos *pos,
-			      const struct type_class_float *float_class);
+		const struct declaration_float *float_declaration);
 	void (*double_write)(struct stream_pos *pos,
-			     const struct type_class_float *float_class,
-			     double v);
+		const struct declaration_float *float_declaration,
+		double v);
 
 	void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
-			    const struct type_class_string *string_class);
-	void (*string_read)(unsigned char **dest, struct stream_pos *src,
-			    const struct type_class_string *string_class);
-	void (*string_write)(struct stream_pos *dest, const unsigned char *src,
-			     const struct type_class_string *string_class);
-	void (*string_free_temp)(unsigned char *string);
+		const struct declaration_string *string_declaration);
+	void (*string_read)(char **dest, struct stream_pos *src,
+		const struct declaration_string *string_declaration);
+	void (*string_write)(struct stream_pos *dest, const char *src,
+		const struct declaration_string *string_declaration);
+	void (*string_free_temp)(char *string);
 
-	GQuark (*enum_read)(struct stream_pos *pos,
-			    const struct type_class_enum *src);
+	/*
+	 * enum_read returns a GArray of GQuark. Must be released with
+	 * g_array_unref().
+	 */
+	GArray *(*enum_read)(struct stream_pos *pos,
+		const struct declaration_enum *src);
 	void (*enum_write)(struct stream_pos *pos,
-			   const struct type_class_enum *dest,
-			   GQuark q);
+		const struct declaration_enum *dest,
+		GQuark q);
 	void (*struct_begin)(struct stream_pos *pos,
-			     const struct type_class_struct *struct_class);
+		const struct declaration_struct *struct_declaration);
 	void (*struct_end)(struct stream_pos *pos,
-			   const struct type_class_struct *struct_class);
+		const struct declaration_struct *struct_declaration);
+	void (*variant_begin)(struct stream_pos *pos,
+		const struct declaration_variant *variant_declaration);
+	void (*variant_end)(struct stream_pos *pos,
+		const struct declaration_variant *variant_declaration);
 	void (*array_begin)(struct stream_pos *pos,
-			     const struct type_class_array *array_class);
+		const struct declaration_array *array_declaration);
 	void (*array_end)(struct stream_pos *pos,
-			   const struct type_class_array *array_class);
+		const struct declaration_array *array_declaration);
 	void (*sequence_begin)(struct stream_pos *pos,
-			     const struct type_class_sequence *sequence_class);
+		const struct declaration_sequence *sequence_declaration);
 	void (*sequence_end)(struct stream_pos *pos,
-			   const struct type_class_sequence *sequence_class);
+		const struct declaration_sequence *sequence_declaration);
 };
 
 struct format *bt_lookup_format(GQuark qname);
-int bt_register_format(const struct format *format);
+void bt_fprintf_format_list(FILE *fp);
+int bt_register_format(struct format *format);
 
 /* TBD: format unregistration */