projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename ctf_stream to ctf_stream_definition
[babeltrace.git]
/
include
/
babeltrace
/
types.h
diff --git
a/include/babeltrace/types.h
b/include/babeltrace/types.h
index ad2b42d0a92d7d020ff8ab17f36a88b605122ff7..845a8ae91500a4744e82c520cd2cfc8c9cd8320d 100644
(file)
--- a/
include/babeltrace/types.h
+++ b/
include/babeltrace/types.h
@@
-34,7
+34,7
@@
/* Preallocate this many fields for structures */
#define DEFAULT_NR_STRUCT_FIELDS 8
/* Preallocate this many fields for structures */
#define DEFAULT_NR_STRUCT_FIELDS 8
-struct ctf_stream;
+struct ctf_stream
_definition
;
struct stream_pos;
struct format;
struct definition;
struct stream_pos;
struct format;
struct definition;
@@
-106,7
+106,7
@@
struct stream_pos {
/* read/write dispatch table. Specific to plugin used for stream. */
rw_dispatch *rw_table; /* rw dispatch table */
int (*event_cb)(struct stream_pos *pos,
/* read/write dispatch table. Specific to plugin used for stream. */
rw_dispatch *rw_table; /* rw dispatch table */
int (*event_cb)(struct stream_pos *pos,
- struct ctf_stream *stream);
+ struct ctf_stream
_definition
*stream);
};
static inline
};
static inline
@@
-120,13
+120,6
@@
int generic_rw(struct stream_pos *pos, struct definition *definition)
return call(pos, definition);
}
return call(pos, definition);
}
-enum ctf_string_encoding {
- CTF_STRING_NONE = 0,
- CTF_STRING_UTF8,
- CTF_STRING_ASCII,
- CTF_STRING_UNKNOWN,
-};
-
/*
* Because we address in bits, bitfields end up being exactly the same as
* integers, except that their read/write functions must be able to deal with
/*
* Because we address in bits, bitfields end up being exactly the same as
* integers, except that their read/write functions must be able to deal with
@@
-375,6
+368,10
@@
struct declaration_integer *integer_declaration_new(size_t len, int byte_order,
struct ctf_clock *clock);
uint64_t get_unsigned_int(const struct definition *field);
int64_t get_signed_int(const struct definition *field);
struct ctf_clock *clock);
uint64_t get_unsigned_int(const struct definition *field);
int64_t get_signed_int(const struct definition *field);
+int get_int_signedness(const struct definition *field);
+int get_int_byte_order(const struct definition *field);
+int get_int_base(const struct definition *field);
+enum ctf_string_encoding get_int_encoding(const struct definition *field);
/*
* mantissa_len is the length of the number of bytes represented by the mantissa
/*
* mantissa_len is the length of the number of bytes represented by the mantissa
@@
-422,6
+419,7
@@
struct declaration_enum *
struct declaration_string *
string_declaration_new(enum ctf_string_encoding encoding);
char *get_string(const struct definition *field);
struct declaration_string *
string_declaration_new(enum ctf_string_encoding encoding);
char *get_string(const struct definition *field);
+enum ctf_string_encoding get_string_encoding(const struct definition *field);
struct declaration_struct *
struct_declaration_new(struct declaration_scope *parent_scope,
struct declaration_struct *
struct_declaration_new(struct declaration_scope *parent_scope,
@@
-487,6
+485,7
@@
uint64_t array_len(struct definition_array *array);
struct definition *array_index(struct definition_array *array, uint64_t i);
int array_rw(struct stream_pos *pos, struct definition *definition);
GString *get_char_array(const struct definition *field);
struct definition *array_index(struct definition_array *array, uint64_t i);
int array_rw(struct stream_pos *pos, struct definition *definition);
GString *get_char_array(const struct definition *field);
+int get_array_len(const struct definition *field);
/*
* int_declaration and elem_declaration passed as parameter now belong
/*
* int_declaration and elem_declaration passed as parameter now belong
@@
-508,15
+507,24
@@
void append_scope_path(const char *path, GArray *q);
/*
* Lookup helpers.
*/
/*
* Lookup helpers.
*/
-struct definition *lookup_definition(struct definition *definition,
+struct definition *lookup_definition(
const
struct definition *definition,
const char *field_name);
const char *field_name);
-struct definition_integer *lookup_integer(struct definition *definition,
+struct definition_integer *lookup_integer(
const
struct definition *definition,
const char *field_name,
int signedness);
const char *field_name,
int signedness);
-struct definition_enum *lookup_enum(struct definition *definition,
+struct definition_enum *lookup_enum(
const
struct definition *definition,
const char *field_name,
int signedness);
const char *field_name,
int signedness);
-struct definition *lookup_variant(struct definition *definition,
+struct definition *lookup_variant(
const
struct definition *definition,
const char *field_name);
const char *field_name);
+static inline
+const char *rem_(const char *str)
+{
+ if (str[0] == '_')
+ return &str[1];
+ else
+ return str;
+}
+
#endif /* _BABELTRACE_TYPES_H */
#endif /* _BABELTRACE_TYPES_H */
This page took
0.023599 seconds
and
4
git commands to generate.