projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring: struct lttng_event_field
[lttng-ust.git]
/
liblttng-ust
/
lttng-bytecode.c
diff --git
a/liblttng-ust/lttng-bytecode.c
b/liblttng-ust/lttng-bytecode.c
index 5956f7bab45fe3a942f1219e229dc5a5f6585610..39881be021d896420c97b45aa074da227a1a0cfd 100644
(file)
--- a/
liblttng-ust/lttng-bytecode.c
+++ b/
liblttng-ust/lttng-bytecode.c
@@
-171,14
+171,14
@@
const char *lttng_bytecode_print_op(enum bytecode_op op)
}
static
}
static
-int apply_field_reloc(const struct lttng_event_desc *event_desc,
+int apply_field_reloc(const struct lttng_
ust_
event_desc *event_desc,
struct bytecode_runtime *runtime,
uint32_t runtime_len,
uint32_t reloc_offset,
const char *field_name,
enum bytecode_op bytecode_op)
{
struct bytecode_runtime *runtime,
uint32_t runtime_len,
uint32_t reloc_offset,
const char *field_name,
enum bytecode_op bytecode_op)
{
- const struct lttng_
event_field
*fields, *field = NULL;
+ const struct lttng_
ust_event_field *
*fields, *field = NULL;
unsigned int nr_fields, i;
struct load_op *op;
uint32_t field_offset = 0;
unsigned int nr_fields, i;
struct load_op *op;
uint32_t field_offset = 0;
@@
-193,15
+193,15
@@
int apply_field_reloc(const struct lttng_event_desc *event_desc,
return -EINVAL;
nr_fields = event_desc->nr_fields;
for (i = 0; i < nr_fields; i++) {
return -EINVAL;
nr_fields = event_desc->nr_fields;
for (i = 0; i < nr_fields; i++) {
- if (fields[i]
.u.ext.
nofilter) {
+ if (fields[i]
->
nofilter) {
continue;
}
continue;
}
- if (!strcmp(fields[i]
.
name, field_name)) {
- field =
&
fields[i];
+ if (!strcmp(fields[i]
->
name, field_name)) {
+ field = fields[i];
break;
}
/* compute field offset */
break;
}
/* compute field offset */
- switch (fields[i]
.
type.atype) {
+ switch (fields[i]
->
type.atype) {
case atype_integer:
case atype_enum_nestable:
field_offset += sizeof(int64_t);
case atype_integer:
case atype_enum_nestable:
field_offset += sizeof(int64_t);
@@
-225,7
+225,7
@@
int apply_field_reloc(const struct lttng_event_desc *event_desc,
return -EINVAL;
/* Check if field offset is too large for 16-bit offset */
return -EINVAL;
/* Check if field offset is too large for 16-bit offset */
- if (field_offset > FILTER_BYTECODE_MAX_LEN - 1)
+ if (field_offset >
LTTNG_UST_ABI_
FILTER_BYTECODE_MAX_LEN - 1)
return -EINVAL;
/* set type */
return -EINVAL;
/* set type */
@@
-297,7
+297,7
@@
int apply_context_reloc(struct bytecode_runtime *runtime,
}
}
/* Check if idx is too large for 16-bit offset */
}
}
/* Check if idx is too large for 16-bit offset */
- if (idx > FILTER_BYTECODE_MAX_LEN - 1)
+ if (idx >
LTTNG_UST_ABI_
FILTER_BYTECODE_MAX_LEN - 1)
return -EINVAL;
/* Get context return type */
return -EINVAL;
/* Get context return type */
@@
-341,7
+341,7
@@
int apply_context_reloc(struct bytecode_runtime *runtime,
}
static
}
static
-int apply_reloc(const struct lttng_event_desc *event_desc,
+int apply_reloc(const struct lttng_
ust_
event_desc *event_desc,
struct bytecode_runtime *runtime,
uint32_t runtime_len,
uint32_t reloc_offset,
struct bytecode_runtime *runtime,
uint32_t runtime_len,
uint32_t reloc_offset,
@@
-395,7
+395,7
@@
int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
* bytecode runtime.
*/
static
* bytecode runtime.
*/
static
-int link_bytecode(const struct lttng_event_desc *event_desc,
+int link_bytecode(const struct lttng_
ust_
event_desc *event_desc,
struct lttng_ctx **ctx,
struct lttng_ust_bytecode_node *bytecode,
struct cds_list_head *bytecode_runtime_head,
struct lttng_ctx **ctx,
struct lttng_ust_bytecode_node *bytecode,
struct cds_list_head *bytecode_runtime_head,
@@
-527,7
+527,7
@@
void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
* This function is called after we confirmed that name enabler and the
* instance are name matching (or glob pattern matching).
*/
* This function is called after we confirmed that name enabler and the
* instance are name matching (or glob pattern matching).
*/
-void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
+void lttng_enabler_link_bytecode(const struct lttng_
ust_
event_desc *event_desc,
struct lttng_ctx **ctx,
struct cds_list_head *instance_bytecode_head,
struct cds_list_head *enabler_bytecode_head)
struct lttng_ctx **ctx,
struct cds_list_head *instance_bytecode_head,
struct cds_list_head *enabler_bytecode_head)
@@
-608,13
+608,7
@@
void free_filter_runtime(struct cds_list_head *bytecode_runtime_head)
}
}
}
}
-void lttng_free_event_filter_runtime(struct lttng_
event
*event)
+void lttng_free_event_filter_runtime(struct lttng_
ust_event_common
*event)
{
{
- free_filter_runtime(&event->parent->filter_bytecode_runtime_head);
-}
-
-void lttng_free_event_notifier_filter_runtime(
- struct lttng_event_notifier *event_notifier)
-{
- free_filter_runtime(&event_notifier->filter_bytecode_runtime_head);
+ free_filter_runtime(&event->filter_bytecode_runtime_head);
}
}
This page took
0.025074 seconds
and
4
git commands to generate.