* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <linux/list.h>
+#include <linux/types.h>
#include <linux/jhash.h>
#include <linux/slab.h>
-#include "lttng-filter.h"
+#include <wrapper/list.h>
+#include <lttng-filter.h>
#define MERGE_POINT_TABLE_BITS 7
#define MERGE_POINT_TABLE_SIZE (1U << MERGE_POINT_TABLE_BITS)
memcpy(&mp_node->stack, stack, sizeof(mp_node->stack));
head = &mp_table->mp_head[hash & (MERGE_POINT_TABLE_SIZE - 1)];
- hlist_for_each_entry(lookup_node, head, node) {
+ lttng_hlist_for_each_entry(lookup_node, head, node) {
if (lttng_hash_match(lookup_node, target_pc)) {
found = 1;
break;
target_pc);
return -EINVAL;
}
+ } else {
+ hlist_add_head(&mp_node->node, head);
}
- hlist_add_head(&mp_node->node, head);
return 0;
}
}
case FILTER_OP_LOAD_FIELD_REF_STRING:
case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
+ case FILTER_OP_LOAD_FIELD_REF_USER_STRING:
+ case FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE:
case FILTER_OP_LOAD_FIELD_REF_S64:
case FILTER_OP_GET_CONTEXT_REF_STRING:
case FILTER_OP_GET_CONTEXT_REF_S64:
struct hlist_head *head;
head = &mp_table->mp_head[i];
- hlist_for_each_entry_safe(mp_node, tmp, head, node) {
+ lttng_hlist_for_each_entry_safe(mp_node, tmp, head, node) {
kfree(mp_node);
nr_nodes++;
}
}
case FILTER_OP_LOAD_FIELD_REF_STRING:
case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
+ case FILTER_OP_LOAD_FIELD_REF_USER_STRING:
+ case FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE:
{
struct load_op *insn = (struct load_op *) pc;
struct field_ref *ref = (struct field_ref *) insn->data;
/* Validate merge points */
hash = jhash_1word(target_pc, 0);
head = &mp_table->mp_head[hash & (MERGE_POINT_TABLE_SIZE - 1)];
- hlist_for_each_entry(mp_node, head, node) {
+ lttng_hlist_for_each_entry(mp_node, head, node) {
if (lttng_hash_match(mp_node, target_pc)) {
found = 1;
break;
case FILTER_OP_LOAD_FIELD_REF_STRING:
case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
case FILTER_OP_GET_CONTEXT_REF_STRING:
+ case FILTER_OP_LOAD_FIELD_REF_USER_STRING:
+ case FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE:
{
if (vstack_push(stack)) {
ret = -EINVAL;