X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=5b2f694573b65caf00df81ba17a3f4ad912d6999;hp=c6dedc1afbd14279054708add6d766e6a5cd4c76;hb=ae23d232404678391ac28a103af7be54be03aa61;hpb=4c8bfb7e0a9cef6e74cefa38ed54bf8cbd424183

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index c6dedc1a..5b2f6945 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,7 +6,9 @@
  *
  * Trace Format Header
  *
- * Copyright 2010 - 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
@@ -20,61 +22,27 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/ctf/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)(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);
-
-	GQuark (*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 (*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 (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+				int whence), FILE *metadata_fp);
+	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 */