* 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;
}
*/
static
int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
- void *start_pc, void *pc)
+ char *start_pc, char *pc)
{
int ret = 0;
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++;
}
static
int validate_instruction_context(struct bytecode_runtime *bytecode,
struct vstack *stack,
- void *start_pc,
- void *pc)
+ char *start_pc,
+ char *pc)
{
int ret = 0;
int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
struct mp_table *mp_table,
struct vstack *stack,
- void *start_pc,
- void *pc)
+ char *start_pc,
+ char *pc)
{
int ret, found = 0;
unsigned long target_pc = pc - start_pc;
/* 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;
int exec_insn(struct bytecode_runtime *bytecode,
struct mp_table *mp_table,
struct vstack *stack,
- void **_next_pc,
- void *pc)
+ char **_next_pc,
+ char *pc)
{
int ret = 1;
- void *next_pc = *_next_pc;
+ char *next_pc = *_next_pc;
switch (*(filter_opcode_t *) pc) {
case FILTER_OP_UNKNOWN:
int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
{
struct mp_table *mp_table;
- void *pc, *next_pc, *start_pc;
+ char *pc, *next_pc, *start_pc;
int ret = -EINVAL;
struct vstack stack;