projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add type class/type structure management
[babeltrace.git]
/
include
/
babeltrace
/
format.h
diff --git
a/include/babeltrace/format.h
b/include/babeltrace/format.h
index 7162c0ea0822cbb2320317407aa1be87d0020f5e..24276fa46915275f7b059edde605ad59cef65a70 100644
(file)
--- a/
include/babeltrace/format.h
+++ b/
include/babeltrace/format.h
@@
-6,7
+6,7
@@
*
* Trace Format Header
*
*
* 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
*
* 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,6
+19,7
@@
* all copies or substantial portions of the Software.
*/
* all copies or substantial portions of the Software.
*/
+#include <babeltrace/types.h>
#include <stdint.h>
#include <glib.h>
#include <stdint.h>
#include <glib.h>
@@
-36,9
+37,9
@@
struct format {
const struct type_class_integer *int_class,
int64_t v);
const struct type_class_integer *int_class,
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 *dest
p
,
+ struct stream_pos *src
p
,
+ 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,
double (*double_read)(struct stream_pos *pos,
const struct type_class_float *float_class);
void (*double_write)(struct stream_pos *pos,
@@
-47,13
+48,17
@@
struct format {
void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
const struct type_class_string *string_class);
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,
+ void (*string_read)(char **dest, struct stream_pos *src,
const struct type_class_string *string_class);
const struct type_class_string *string_class);
- void (*string_write)(struct stream_pos *dest, const
unsigned
char *src,
+ void (*string_write)(struct stream_pos *dest, const char *src,
const struct type_class_string *string_class);
const struct type_class_string *string_class);
- void (*string_free_temp)(
unsigned
char *string);
+ void (*string_free_temp)(char *string);
- GQuark (*enum_read)(struct stream_pos *pos,
+ /*
+ * 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,
const struct type_class_enum *src);
void (*enum_write)(struct stream_pos *pos,
const struct type_class_enum *dest,
@@
-62,6
+67,10
@@
struct format {
const struct type_class_struct *struct_class);
void (*struct_end)(struct stream_pos *pos,
const struct type_class_struct *struct_class);
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,
void (*array_begin)(struct stream_pos *pos,
const struct type_class_array *array_class);
void (*array_end)(struct stream_pos *pos,
@@
-73,7
+82,7
@@
struct format {
};
struct format *bt_lookup_format(GQuark qname);
};
struct format *bt_lookup_format(GQuark qname);
-int bt_register_format(
const
struct format *format);
+int bt_register_format(struct format *format);
/* TBD: format unregistration */
/* TBD: format unregistration */
This page took
0.026532 seconds
and
4
git commands to generate.