X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=c50b28dc330b8c81c23aefb4133829974b2f7cce;hb=90bf3cefc3f8799b3a822bf9123f21e81220574e;hp=24276fa46915275f7b059edde605ad59cef65a70;hpb=c054553dac076f91196b372fa19efaf2adc4e4f9;p=babeltrace.git

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 24276fa4..c50b28dc 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,7 +6,9 @@
  *
  * Trace Format Header
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: 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
@@ -21,68 +23,23 @@
 
 #include <babeltrace/types.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <glib.h>
 
+/* Parent trace descriptor */
+struct trace_descriptor {
+};
+
 struct format {
 	GQuark name;
 
-	uint64_t (*uint_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
-	int64_t (*int_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
-	void (*uint_write)(struct stream_pos *pos,
-			   const struct type_class_integer *int_class,
-			   uint64_t v);
-	void (*int_write)(struct stream_pos *pos,
-			  const struct type_class_integer *int_class,
-			  int64_t v);
-
-	void (*float_copy)(struct stream_pos *destp,
-			   struct stream_pos *srcp,
-			   const struct type_class_float *float_class);
-	double (*double_read)(struct stream_pos *pos,
-			      const struct type_class_float *float_class);
-	void (*double_write)(struct stream_pos *pos,
-			     const struct type_class_float *float_class,
-			     double v);
-
-	void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
-			    const struct type_class_string *string_class);
-	void (*string_read)(char **dest, struct stream_pos *src,
-			    const struct type_class_string *string_class);
-	void (*string_write)(struct stream_pos *dest, const char *src,
-			     const struct type_class_string *string_class);
-	void (*string_free_temp)(char *string);
-
-	/*
-	 * enum_read returns a GArray of GQuark. Must be released with
-	 * g_array_unref().
-	 */
-	GArray *(*enum_read)(struct stream_pos *pos,
-			    const struct type_class_enum *src);
-	void (*enum_write)(struct stream_pos *pos,
-			   const struct type_class_enum *dest,
-			   GQuark q);
-	void (*struct_begin)(struct stream_pos *pos,
-			     const struct type_class_struct *struct_class);
-	void (*struct_end)(struct stream_pos *pos,
-			   const struct type_class_struct *struct_class);
-	void (*variant_begin)(struct stream_pos *pos,
-			      const struct type_class_variant *variant_class);
-	void (*variant_end)(struct stream_pos *pos,
-			    const struct type_class_variant *variant_class);
-	void (*array_begin)(struct stream_pos *pos,
-			     const struct type_class_array *array_class);
-	void (*array_end)(struct stream_pos *pos,
-			   const struct type_class_array *array_class);
-	void (*sequence_begin)(struct stream_pos *pos,
-			     const struct type_class_sequence *sequence_class);
-	void (*sequence_end)(struct stream_pos *pos,
-			   const struct type_class_sequence *sequence_class);
+	struct trace_descriptor *(*open_trace)(const char *path, int flags);
+	void (*close_trace)(struct trace_descriptor *descriptor);
 };
 
-struct format *bt_lookup_format(GQuark qname);
-int bt_register_format(struct format *format);
+extern struct format *bt_lookup_format(GQuark qname);
+extern void bt_fprintf_format_list(FILE *fp);
+extern int bt_register_format(struct format *format);
 
 /* TBD: format unregistration */