projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start packet mmap work
[babeltrace.git]
/
types
/
struct.c
diff --git
a/types/struct.c
b/types/struct.c
index 03c92ea4093bff548ea398cf955a7f687fe3a862..ea2e28c14c29884e5b1faf8551504913d15bbb06 100644
(file)
--- a/
types/struct.c
+++ b/
types/struct.c
@@
-25,7
+25,8
@@
static
struct definition *_struct_definition_new(struct declaration *declaration,
static
struct definition *_struct_definition_new(struct declaration *declaration,
- struct definition_scope *parent_scope);
+ struct definition_scope *parent_scope,
+ GQuark field_name, int index);
static
void _struct_definition_free(struct definition *definition);
static
void _struct_definition_free(struct definition *definition);
@@
-39,7
+40,8
@@
void struct_copy(struct stream_pos *dest, const struct format *fdest,
unsigned long i;
fsrc->struct_begin(src, struct_declaration);
unsigned long i;
fsrc->struct_begin(src, struct_declaration);
- fdest->struct_begin(dest, struct_declaration);
+ if (fdest)
+ fdest->struct_begin(dest, struct_declaration);
for (i = 0; i < _struct->fields->len; i++) {
struct field *field = &g_array_index(_struct->fields,
for (i = 0; i < _struct->fields->len; i++) {
struct field *field = &g_array_index(_struct->fields,
@@
-50,7
+52,8
@@
void struct_copy(struct stream_pos *dest, const struct format *fdest,
}
fsrc->struct_end(src, struct_declaration);
}
fsrc->struct_end(src, struct_declaration);
- fdest->struct_end(dest, struct_declaration);
+ if (fdest)
+ fdest->struct_end(dest, struct_declaration);
}
static
}
static
@@
-73,8
+76,8
@@
void _struct_declaration_free(struct declaration *declaration)
g_free(struct_declaration);
}
g_free(struct_declaration);
}
-struct declaration_struct *
struct_declaration_new(const char *name,
-
struct declaration_scope *parent_scope)
+struct declaration_struct *
+
struct_declaration_new(
struct declaration_scope *parent_scope)
{
struct declaration_struct *struct_declaration;
struct declaration *declaration;
{
struct declaration_struct *struct_declaration;
struct declaration *declaration;
@@
-88,7
+91,6
@@
struct declaration_struct *struct_declaration_new(const char *name,
DEFAULT_NR_STRUCT_FIELDS);
struct_declaration->scope = new_declaration_scope(parent_scope);
declaration->id = CTF_TYPE_STRUCT;
DEFAULT_NR_STRUCT_FIELDS);
struct_declaration->scope = new_declaration_scope(parent_scope);
declaration->id = CTF_TYPE_STRUCT;
- declaration->name = g_quark_from_string(name);
declaration->alignment = 1;
declaration->copy = struct_copy;
declaration->declaration_free = _struct_declaration_free;
declaration->alignment = 1;
declaration->copy = struct_copy;
declaration->declaration_free = _struct_declaration_free;
@@
-101,7
+103,8
@@
struct declaration_struct *struct_declaration_new(const char *name,
static
struct definition *
_struct_definition_new(struct declaration *declaration,
static
struct definition *
_struct_definition_new(struct declaration *declaration,
- struct definition_scope *parent_scope)
+ struct definition_scope *parent_scope,
+ GQuark field_name, int index)
{
struct declaration_struct *struct_declaration =
container_of(declaration, struct declaration_struct, p);
{
struct declaration_struct *struct_declaration =
container_of(declaration, struct declaration_struct, p);
@@
-114,7
+117,8
@@
struct definition *
_struct->p.declaration = declaration;
_struct->declaration = struct_declaration;
_struct->p.ref = 1;
_struct->p.declaration = declaration;
_struct->declaration = struct_declaration;
_struct->p.ref = 1;
- _struct->scope = new_definition_scope(parent_scope);
+ _struct->p.index = index;
+ _struct->scope = new_definition_scope(parent_scope, field_name);
_struct->fields = g_array_sized_new(FALSE, TRUE,
sizeof(struct field),
DEFAULT_NR_STRUCT_FIELDS);
_struct->fields = g_array_sized_new(FALSE, TRUE,
sizeof(struct field),
DEFAULT_NR_STRUCT_FIELDS);
@@
-129,7
+133,8
@@
struct definition *
field->name = declaration_field->name;
field->definition =
declaration_field->declaration->definition_new(declaration_field->declaration,
field->name = declaration_field->name;
field->definition =
declaration_field->declaration->definition_new(declaration_field->declaration,
- _struct->scope);
+ _struct->scope,
+ field->name, i);
ret = register_field_definition(field->name,
field->definition,
_struct->scope);
ret = register_field_definition(field->name,
field->definition,
_struct->scope);
@@
-181,15
+186,24
@@
void struct_declaration_add_field(struct declaration_struct *struct_declaration,
field_declaration->alignment);
}
field_declaration->alignment);
}
-unsigned long
- struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration,
+/*
+ * struct_declaration_lookup_field_index - returns field index
+ *
+ * Returns the index of a field in a structure, or -1 if it does not
+ * exist.
+ */
+int struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration,
GQuark field_name)
{
GQuark field_name)
{
- unsigned long index;
-
- index = (unsigned long) g_hash_table_lookup(struct_declaration->fields_by_name,
- (gconstpointer) (unsigned long) field_name);
- return index;
+ gpointer index;
+ gboolean found;
+
+ found = g_hash_table_lookup_extended(struct_declaration->fields_by_name,
+ (gconstpointer) (unsigned long) field_name,
+ NULL, &index);
+ if (!found)
+ return -1;
+ return (int) (unsigned long) index;
}
/*
}
/*
@@
-197,8
+211,10
@@
unsigned long
*/
struct declaration_field *
struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration,
*/
struct declaration_field *
struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration,
-
unsigned long
index)
+
int
index)
{
{
+ if (index < 0)
+ return NULL;
return &g_array_index(struct_declaration->fields, struct declaration_field, index);
}
return &g_array_index(struct_declaration->fields, struct declaration_field, index);
}
@@
-207,7
+223,9
@@
struct declaration_field *
*/
struct field *
struct_definition_get_field_from_index(struct definition_struct *_struct,
*/
struct field *
struct_definition_get_field_from_index(struct definition_struct *_struct,
-
unsigned long
index)
+
int
index)
{
{
+ if (index < 0)
+ return NULL;
return &g_array_index(_struct->fields, struct field, index);
}
return &g_array_index(_struct->fields, struct field, index);
}
This page took
0.024581 seconds
and
4
git commands to generate.