projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Java agent: close session daemon socket on error
[lttng-ust.git]
/
liblttng-ust
/
lttng-filter.c
diff --git
a/liblttng-ust/lttng-filter.c
b/liblttng-ust/lttng-filter.c
index ed41a0efc12b277777523cbf4824346890927641..bbc212892342f988041b025577de506eeaf0e029 100644
(file)
--- a/
liblttng-ust/lttng-filter.c
+++ b/
liblttng-ust/lttng-filter.c
@@
-211,6
+211,9
@@
int apply_field_reloc(struct lttng_event *event,
return -EINVAL;
nr_fields = desc->nr_fields;
for (i = 0; i < nr_fields; i++) {
return -EINVAL;
nr_fields = desc->nr_fields;
for (i = 0; i < nr_fields; i++) {
+ if (fields[i].u.ext.nofilter) {
+ continue;
+ }
if (!strcmp(fields[i].name, field_name)) {
field = &fields[i];
break;
if (!strcmp(fields[i].name, field_name)) {
field = &fields[i];
break;
@@
-219,10
+222,13
@@
int apply_field_reloc(struct lttng_event *event,
switch (fields[i].type.atype) {
case atype_integer:
case atype_enum:
switch (fields[i].type.atype) {
case atype_integer:
case atype_enum:
+ case atype_enum_nestable:
field_offset += sizeof(int64_t);
break;
case atype_array:
field_offset += sizeof(int64_t);
break;
case atype_array:
+ case atype_array_nestable:
case atype_sequence:
case atype_sequence:
+ case atype_sequence_nestable:
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
@@
-255,10
+261,13
@@
int apply_field_reloc(struct lttng_event *event,
switch (field->type.atype) {
case atype_integer:
case atype_enum:
switch (field->type.atype) {
case atype_integer:
case atype_enum:
+ case atype_enum_nestable:
op->op = FILTER_OP_LOAD_FIELD_REF_S64;
break;
case atype_array:
op->op = FILTER_OP_LOAD_FIELD_REF_S64;
break;
case atype_array:
+ case atype_array_nestable:
case atype_sequence:
case atype_sequence:
+ case atype_sequence_nestable:
op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
break;
case atype_string:
op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
break;
case atype_string:
@@
-330,12
+339,15
@@
int apply_context_reloc(struct lttng_event *event,
switch (ctx_field->event_field.type.atype) {
case atype_integer:
case atype_enum:
switch (ctx_field->event_field.type.atype) {
case atype_integer:
case atype_enum:
+ case atype_enum_nestable:
op->op = FILTER_OP_GET_CONTEXT_REF_S64;
break;
/* Sequence and array supported as string */
case atype_string:
case atype_array:
op->op = FILTER_OP_GET_CONTEXT_REF_S64;
break;
/* Sequence and array supported as string */
case atype_string:
case atype_array:
+ case atype_array_nestable:
case atype_sequence:
case atype_sequence:
+ case atype_sequence_nestable:
op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
break;
case atype_float:
op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
break;
case atype_float:
@@
-524,11
+536,12
@@
void lttng_enabler_event_link_bytecode(struct lttng_event *event,
/*
* Insert at specified priority (seqnum) in increasing
/*
* Insert at specified priority (seqnum) in increasing
- * order.
+ * order. If there already is a bytecode of the same priority,
+ * insert the new bytecode right after it.
*/
cds_list_for_each_entry_reverse(runtime,
&event->bytecode_runtime_head, node) {
*/
cds_list_for_each_entry_reverse(runtime,
&event->bytecode_runtime_head, node) {
- if (runtime->bc->bc.seqnum < bc->bc.seqnum) {
+ if (runtime->bc->bc.seqnum <
=
bc->bc.seqnum) {
/* insert here */
insert_loc = &runtime->node;
goto add_within;
/* insert here */
insert_loc = &runtime->node;
goto add_within;
This page took
0.024746 seconds
and
4
git commands to generate.