Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

[babeltrace.git] / include / babeltrace / format.h

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index cbba50b0ee26e6e3604ad35035720e0f66ff5401..c50b28dc330b8c81c23aefb4133829974b2f7cce 100644 (file)
--- 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
@@ -31,71 +33,13 @@ struct trace_descriptor {
 struct format {
        GQuark name;
 
-       uint64_t (*uint_read)(struct stream_pos *pos,
-               const struct declaration_integer *integer_declaration);
-       int64_t (*int_read)(struct stream_pos *pos,
-               const struct declaration_integer *integer_declaration);
-       void (*uint_write)(struct stream_pos *pos,
-               const struct declaration_integer *integer_declaration,
-               uint64_t v);
-       void (*int_write)(struct stream_pos *pos,
-               const struct declaration_integer *integer_declaration,
-               int64_t v);
-
-       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 declaration_float *float_declaration);
-       void (*double_write)(struct stream_pos *pos,
-               const struct declaration_float *float_declaration,
-               double v);
-       long double (*ldouble_read)(struct stream_pos *pos,
-               const struct declaration_float *float_declaration);
-       void (*ldouble_write)(struct stream_pos *pos,
-               const struct declaration_float *float_declaration,
-               long double v);
-
-       void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
-               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);
-
-       /*
-        * 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 declaration_enum *dest,
-               GQuark q);
-       void (*struct_begin)(struct stream_pos *pos,
-               const struct declaration_struct *struct_declaration);
-       void (*struct_end)(struct stream_pos *pos,
-               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 declaration_array *array_declaration);
-       void (*array_end)(struct stream_pos *pos,
-               const struct declaration_array *array_declaration);
-       void (*sequence_begin)(struct stream_pos *pos,
-               const struct declaration_sequence *sequence_declaration);
-       void (*sequence_end)(struct stream_pos *pos,
-               const struct declaration_sequence *sequence_declaration);
        struct trace_descriptor *(*open_trace)(const char *path, int flags);
        void (*close_trace)(struct trace_descriptor *descriptor);
 };
 
-struct format *bt_lookup_format(GQuark qname);
-void bt_fprintf_format_list(FILE *fp);
-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 */