X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter.c;h=aa258e5c5d76a475999be9d4a96205ae783b5066;hb=a56fd376c76b448c9f639b8ace821471a2fb7b40;hp=d52658ae14dd7f4e135a5e6e0df306069bd94f4b;hpb=93c591bb3a90753ce66197f2c1e41c8ef554506f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter.c b/liblttng-ust/lttng-filter.c
index d52658ae..aa258e5c 100644
--- a/liblttng-ust/lttng-filter.c
+++ b/liblttng-ust/lttng-filter.c
@@ -25,8 +25,13 @@
  */
 
 #define _LGPL_SOURCE
+#include <stddef.h>
+#include <stdint.h>
+
 #include <urcu/rculist.h>
+
 #include "lttng-filter.h"
+#include "ust-events-internal.h"
 
 static const char *opnames[] = {
 	[ FILTER_OP_UNKNOWN ] = "UNKNOWN",
@@ -183,14 +188,13 @@ const char *print_op(enum filter_op op)
 }
 
 static
-int apply_field_reloc(struct lttng_event *event,
+int apply_field_reloc(const struct lttng_event_desc *event_desc,
 		struct bytecode_runtime *runtime,
 		uint32_t runtime_len,
 		uint32_t reloc_offset,
 		const char *field_name,
 		enum filter_op filter_op)
 {
-	const struct lttng_event_desc *desc;
 	const struct lttng_event_field *fields, *field = NULL;
 	unsigned int nr_fields, i;
 	struct load_op *op;
@@ -199,14 +203,16 @@ int apply_field_reloc(struct lttng_event *event,
 	dbg_printf("Apply field reloc: %u %s\n", reloc_offset, field_name);
 
 	/* Lookup event by name */
-	desc = event->desc;
-	if (!desc)
+	if (!event_desc)
 		return -EINVAL;
-	fields = desc->fields;
+	fields = event_desc->fields;
 	if (!fields)
 		return -EINVAL;
-	nr_fields = desc->nr_fields;
+	nr_fields = event_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;
@@ -215,10 +221,13 @@ int apply_field_reloc(struct lttng_event *event,
 		switch (fields[i].type.atype) {
 		case atype_integer:
 		case atype_enum:
+		case atype_enum_nestable:
 			field_offset += sizeof(int64_t);
 			break;
 		case atype_array:
+		case atype_array_nestable:
 		case atype_sequence:
+		case atype_sequence_nestable:
 			field_offset += sizeof(unsigned long);
 			field_offset += sizeof(void *);
 			break;
@@ -251,10 +260,13 @@ int apply_field_reloc(struct lttng_event *event,
 		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:
+		case atype_array_nestable:
 		case atype_sequence:
+		case atype_sequence_nestable:
 			op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
 			break;
 		case atype_string:
@@ -277,8 +289,7 @@ int apply_field_reloc(struct lttng_event *event,
 }
 
 static
-int apply_context_reloc(struct lttng_event *event,
-		struct bytecode_runtime *runtime,
+int apply_context_reloc(struct bytecode_runtime *runtime,
 		uint32_t runtime_len,
 		uint32_t reloc_offset,
 		const char *context_name,
@@ -287,22 +298,21 @@ int apply_context_reloc(struct lttng_event *event,
 	struct load_op *op;
 	struct lttng_ctx_field *ctx_field;
 	int idx;
-	struct lttng_session *session = runtime->p.session;
+	struct lttng_ctx *ctx = *runtime->p.pctx;
 
 	dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
 	/* Get context index */
-	idx = lttng_get_context_index(session->ctx, context_name);
+	idx = lttng_get_context_index(ctx, context_name);
 	if (idx < 0) {
 		if (lttng_context_is_app(context_name)) {
 			int ret;
 
 			ret = lttng_ust_add_app_context_to_ctx_rcu(context_name,
-					&session->ctx);
+					&ctx);
 			if (ret)
 				return ret;
-			idx = lttng_get_context_index(session->ctx,
-				context_name);
+			idx = lttng_get_context_index(ctx, context_name);
 			if (idx < 0)
 				return -ENOENT;
 		} else {
@@ -314,7 +324,7 @@ int apply_context_reloc(struct lttng_event *event,
 		return -EINVAL;
 
 	/* Get context return type */
-	ctx_field = &session->ctx->fields[idx];
+	ctx_field = &ctx->fields[idx];
 	op = (struct load_op *) &runtime->code[reloc_offset];
 
 	switch (filter_op) {
@@ -326,12 +336,15 @@ int apply_context_reloc(struct lttng_event *event,
 		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:
+		case atype_array_nestable:
 		case atype_sequence:
+		case atype_sequence_nestable:
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
 		case atype_float:
@@ -354,7 +367,7 @@ int apply_context_reloc(struct lttng_event *event,
 }
 
 static
-int apply_reloc(struct lttng_event *event,
+int apply_reloc(const struct lttng_event_desc *event_desc,
 		struct bytecode_runtime *runtime,
 		uint32_t runtime_len,
 		uint32_t reloc_offset,
@@ -371,10 +384,10 @@ int apply_reloc(struct lttng_event *event,
 	op = (struct load_op *) &runtime->code[reloc_offset];
 	switch (op->op) {
 	case FILTER_OP_LOAD_FIELD_REF:
-		return apply_field_reloc(event, runtime, runtime_len,
+		return apply_field_reloc(event_desc, runtime, runtime_len,
 			reloc_offset, name, op->op);
 	case FILTER_OP_GET_CONTEXT_REF:
-		return apply_context_reloc(event, runtime, runtime_len,
+		return apply_context_reloc(runtime, runtime_len,
 			reloc_offset, name, op->op);
 	case FILTER_OP_GET_SYMBOL:
 	case FILTER_OP_GET_SYMBOL_FIELD:
@@ -392,12 +405,11 @@ int apply_reloc(struct lttng_event *event,
 
 static
 int bytecode_is_linked(struct lttng_ust_filter_bytecode_node *filter_bytecode,
-		struct lttng_event *event)
+		struct cds_list_head *bytecode_runtime_head)
 {
 	struct lttng_bytecode_runtime *bc_runtime;
 
-	cds_list_for_each_entry(bc_runtime,
-			&event->bytecode_runtime_head, node) {
+	cds_list_for_each_entry(bc_runtime, bytecode_runtime_head, node) {
 		if (bc_runtime->bc == filter_bytecode)
 			return 1;
 	}
@@ -409,7 +421,8 @@ int bytecode_is_linked(struct lttng_ust_filter_bytecode_node *filter_bytecode,
  * bytecode runtime.
  */
 static
-int _lttng_filter_event_link_bytecode(struct lttng_event *event,
+int _lttng_filter_link_bytecode(const struct lttng_event_desc *event_desc,
+		struct lttng_ctx **ctx,
 		struct lttng_ust_filter_bytecode_node *filter_bytecode,
 		struct cds_list_head *insert_loc)
 {
@@ -420,7 +433,7 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
 	if (!filter_bytecode)
 		return 0;
 	/* Bytecode already linked */
-	if (bytecode_is_linked(filter_bytecode, event))
+	if (bytecode_is_linked(filter_bytecode, insert_loc))
 		return 0;
 
 	dbg_printf("Linking...\n");
@@ -433,8 +446,7 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
 		goto alloc_error;
 	}
 	runtime->p.bc = filter_bytecode;
-	runtime->p.session = event->chan->session;
-	runtime->p.event = event;
+	runtime->p.pctx = ctx;
 	runtime->len = filter_bytecode->bc.reloc_offset;
 	/* copy original bytecode */
 	memcpy(runtime->code, filter_bytecode->bc.data, runtime->len);
@@ -450,7 +462,7 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
 		const char *name =
 			(const char *) &filter_bytecode->bc.data[offset + sizeof(uint16_t)];
 
-		ret = apply_reloc(event, runtime, runtime->len, reloc_offset, name);
+		ret = apply_reloc(event_desc, runtime, runtime->len, reloc_offset, name);
 		if (ret) {
 			goto link_error;
 		}
@@ -462,7 +474,7 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
 		goto link_error;
 	}
 	/* Specialize bytecode */
-	ret = lttng_filter_specialize_bytecode(event, runtime);
+	ret = lttng_filter_specialize_bytecode(event_desc, runtime);
 	if (ret) {
 		goto link_error;
 	}
@@ -473,7 +485,7 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
 	return 0;
 
 link_error:
-	runtime->p.filter = lttng_filter_false;
+	runtime->p.filter = lttng_filter_interpret_bytecode_false;
 	runtime->p.link_failed = 1;
 	cds_list_add_rcu(&runtime->p.node, insert_loc);
 alloc_error:
@@ -486,22 +498,23 @@ void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime)
 	struct lttng_ust_filter_bytecode_node *bc = runtime->bc;
 
 	if (!bc->enabler->enabled || runtime->link_failed)
-		runtime->filter = lttng_filter_false;
+		runtime->filter = lttng_filter_interpret_bytecode_false;
 	else
 		runtime->filter = lttng_filter_interpret_bytecode;
 }
 
 /*
- * Link bytecode for all enablers referenced by an event.
+ * Link all bytecodes of the enabler referenced in the provided bytecode list.
  */
-void lttng_enabler_event_link_bytecode(struct lttng_event *event,
+void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
+		struct lttng_ctx **ctx,
+		struct cds_list_head *bytecode_runtime_head,
 		struct lttng_enabler *enabler)
 {
 	struct lttng_ust_filter_bytecode_node *bc;
 	struct lttng_bytecode_runtime *runtime;
 
-	/* Can only be called for events with desc attached */
-	assert(event->desc);
+	assert(event_desc);
 
 	/* Link each bytecode. */
 	cds_list_for_each_entry(bc, &enabler->filter_bytecode_head, node) {
@@ -509,7 +522,7 @@ void lttng_enabler_event_link_bytecode(struct lttng_event *event,
 		struct cds_list_head *insert_loc;
 
 		cds_list_for_each_entry(runtime,
-				&event->bytecode_runtime_head, node) {
+				bytecode_runtime_head, node) {
 			if (runtime->bc == bc) {
 				found = 1;
 				break;
@@ -521,22 +534,24 @@ void lttng_enabler_event_link_bytecode(struct lttng_event *event,
 
 		/*
 		 * 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) {
-			if (runtime->bc->bc.seqnum < bc->bc.seqnum) {
+				bytecode_runtime_head, node) {
+			if (runtime->bc->bc.seqnum <= bc->bc.seqnum) {
 				/* insert here */
 				insert_loc = &runtime->node;
 				goto add_within;
 			}
 		}
+
 		/* Add to head to list */
-		insert_loc = &event->bytecode_runtime_head;
+		insert_loc = bytecode_runtime_head;
 	add_within:
 		dbg_printf("linking bytecode\n");
-		ret = _lttng_filter_event_link_bytecode(event, bc,
-				insert_loc);
+		ret = _lttng_filter_link_bytecode(event_desc, ctx, bc,
+			insert_loc);
 		if (ret) {
 			dbg_printf("[lttng filter] warning: cannot link event bytecode\n");
 		}
@@ -553,23 +568,25 @@ int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler,
 	return 0;
 }
 
-void lttng_free_enabler_filter_bytecode(struct lttng_enabler *enabler)
+static
+void free_filter_runtime(struct cds_list_head *bytecode_runtime_head)
 {
-	struct lttng_ust_filter_bytecode_node *filter_bytecode, *tmp;
+	struct bytecode_runtime *runtime, *tmp;
 
-	cds_list_for_each_entry_safe(filter_bytecode, tmp,
-			&enabler->filter_bytecode_head, node) {
-		free(filter_bytecode);
+	cds_list_for_each_entry_safe(runtime, tmp, bytecode_runtime_head,
+			p.node) {
+		free(runtime->data);
+		free(runtime);
 	}
 }
 
 void lttng_free_event_filter_runtime(struct lttng_event *event)
 {
-	struct bytecode_runtime *runtime, *tmp;
+	free_filter_runtime(&event->filter_bytecode_runtime_head);
+}
 
-	cds_list_for_each_entry_safe(runtime, tmp,
-			&event->bytecode_runtime_head, p.node) {
-		free(runtime->data);
-		free(runtime);
-	}
+void lttng_free_event_notifier_filter_runtime(
+		struct lttng_event_notifier *event_notifier)
+{
+	free_filter_runtime(&event_notifier->filter_bytecode_runtime_head);
 }