X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-filter.c;h=11e7e376a03006bec8fb2af8b86f95f16d53874a;hb=ac6b4ac62c8cd22eede4b0fd49706e8f838bf208;hp=6c3eda4ba554a28e692194a71170ae6569d7a824;hpb=f488575f3420027d33050e779e1e3916e3b91c8c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter.c b/liblttng-ust/lttng-filter.c
index 6c3eda4b..11e7e376 100644
--- a/liblttng-ust/lttng-filter.c
+++ b/liblttng-ust/lttng-filter.c
@@ -128,7 +128,7 @@ const char *print_op(enum filter_op op)
 }
 
 static
-int apply_field_reloc(struct ltt_event *event,
+int apply_field_reloc(struct lttng_event *event,
 		struct bytecode_runtime *runtime,
 		uint32_t runtime_len,
 		uint32_t reloc_offset,
@@ -216,11 +216,12 @@ int apply_field_reloc(struct ltt_event *event,
 
 static
 int bytecode_is_linked(struct lttng_ust_filter_bytecode_node *filter_bytecode,
-		struct ltt_event *event)
+		struct lttng_event *event)
 {
 	struct lttng_bytecode_runtime *bc_runtime;
 
-	cds_list_for_each_entry(bc_runtime, &event->bytecode_runtime, node) {
+	cds_list_for_each_entry(bc_runtime,
+			&event->bytecode_runtime_head, node) {
 		if (bc_runtime->bc == filter_bytecode)
 			return 1;
 	}
@@ -232,8 +233,9 @@ int bytecode_is_linked(struct lttng_ust_filter_bytecode_node *filter_bytecode,
  * bytecode runtime.
  */
 static
-int _lttng_filter_event_link_bytecode(struct ltt_event *event,
-		struct lttng_ust_filter_bytecode_node *filter_bytecode)
+int _lttng_filter_event_link_bytecode(struct lttng_event *event,
+		struct lttng_ust_filter_bytecode_node *filter_bytecode,
+		struct cds_list_head *insert_loc)
 {
 	int ret, offset, next_offset;
 	struct bytecode_runtime *runtime = NULL;
@@ -241,9 +243,6 @@ int _lttng_filter_event_link_bytecode(struct ltt_event *event,
 
 	if (!filter_bytecode)
 		return 0;
-	/* Event is not connected to any description */
-	if (!event->desc)
-		return 0;
 	/* Bytecode already linked */
 	if (bytecode_is_linked(filter_bytecode, event))
 		return 0;
@@ -255,7 +254,7 @@ int _lttng_filter_event_link_bytecode(struct ltt_event *event,
 	runtime = zmalloc(runtime_alloc_len);
 	if (!runtime) {
 		ret = -ENOMEM;
-		goto link_error;
+		goto alloc_error;
 	}
 	runtime->p.bc = filter_bytecode;
 	runtime->len = filter_bytecode->bc.reloc_offset;
@@ -290,114 +289,108 @@ int _lttng_filter_event_link_bytecode(struct ltt_event *event,
 		goto link_error;
 	}
 	runtime->p.filter = lttng_filter_interpret_bytecode;
-	/* TODO: add with prio */
-	cds_list_add_rcu(&runtime->p.node, &event->bytecode_runtime);
+	runtime->p.link_failed = 0;
+	cds_list_add_rcu(&runtime->p.node, insert_loc);
 	dbg_printf("Linking successful.\n");
 	return 0;
 
 link_error:
 	runtime->p.filter = lttng_filter_false;
-	/* TODO: add with prio */
-	cds_list_add_rcu(&runtime->p.node, &event->bytecode_runtime);
+	runtime->p.link_failed = 1;
+	cds_list_add_rcu(&runtime->p.node, insert_loc);
+alloc_error:
 	dbg_printf("Linking failed.\n");
 	return ret;
 }
 
-void lttng_filter_event_link_bytecode(struct ltt_event *event)
+void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime)
 {
-	struct lttng_ust_filter_bytecode_node *filter_bytecode;
-	int ret;
-
-	cds_list_for_each_entry(filter_bytecode, &event->filter_bytecode, node) {
-		dbg_printf("linking bytecode\n");
-		ret = _lttng_filter_event_link_bytecode(event, filter_bytecode);
-		if (ret) {
-			dbg_printf("[lttng filter] warning: cannot link event bytecode\n");
-		}
-	}
-}
+	struct lttng_ust_filter_bytecode_node *bc = runtime->bc;
 
-void lttng_filter_event_link_wildcard_bytecode(struct ltt_event *event,
-		struct session_wildcard *wildcard)
-{
-	struct lttng_ust_filter_bytecode_node *filter_bytecode;
-	int ret;
-
-	cds_list_for_each_entry(filter_bytecode, &wildcard->filter_bytecode, node) {
-		dbg_printf("linking bytecode\n");
-		ret = _lttng_filter_event_link_bytecode(event, filter_bytecode);
-		if (ret) {
-			dbg_printf("[lttng filter] error linking wildcard bytecode\n");
-		}
-	}
+	if (!bc->enabler->enabled || runtime->link_failed)
+		runtime->filter = lttng_filter_false;
+	else
+		runtime->filter = lttng_filter_interpret_bytecode;
 }
 
 /*
- * Link bytecode to all events for a wildcard.
- * The "is_linked" check in _lttng_filter_event_link_bytecode() ensures
- * that we don't link the same bytecode to an event more than once.
+ * Link bytecode for all enablers referenced by an event.
  */
-void lttng_filter_wildcard_link_bytecode(struct session_wildcard *wildcard)
+void lttng_enabler_event_link_bytecode(struct lttng_event *event,
+		struct lttng_enabler *enabler)
 {
-	struct ltt_event *event;
-
-	if (cds_list_empty(&wildcard->filter_bytecode))
-		return;
-	cds_list_for_each_entry(event, &wildcard->events, wildcard_list) {
+	struct lttng_ust_filter_bytecode_node *bc;
+	struct lttng_bytecode_runtime *runtime;
+
+	/* Can only be called for events with desc attached */
+	assert(event->desc);
+
+	/* Link each bytecode. */
+	cds_list_for_each_entry(bc, &enabler->filter_bytecode_head, node) {
+		int found = 0, ret;
+		struct cds_list_head *insert_loc;
+
+		cds_list_for_each_entry(runtime,
+				&event->bytecode_runtime_head, node) {
+			if (runtime->bc == bc) {
+				found = 1;
+				break;
+			}
+		}
+		/* Skip bytecode already linked */
+		if (found)
+			continue;
+
+		/*
+		 * Insert at specified priority (seqnum) in increasing
+		 * order.
+		 */
+		cds_list_for_each_entry_reverse(runtime,
+				&event->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;
+	add_within:
 		dbg_printf("linking bytecode\n");
-		lttng_filter_event_link_wildcard_bytecode(event, wildcard);
+		ret = _lttng_filter_event_link_bytecode(event, bc,
+				insert_loc);
+		if (ret) {
+			dbg_printf("[lttng filter] warning: cannot link event bytecode\n");
+		}
 	}
-	return;
 }
 
 /*
- * Need to attach filter to an event before starting tracing for the
- * session. We own the filter_bytecode if we return success.
+ * We own the filter_bytecode if we return success.
  */
-int lttng_filter_event_attach_bytecode(struct ltt_event *event,
+int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler,
 		struct lttng_ust_filter_bytecode_node *filter_bytecode)
 {
-	cds_list_add(&filter_bytecode->node, &event->filter_bytecode);
+	cds_list_add(&filter_bytecode->node, &enabler->filter_bytecode_head);
 	return 0;
 }
 
-/*
- * Need to attach filter to a wildcard before starting tracing for the
- * session. We own the filter_bytecode if we return success.
- */
-int lttng_filter_wildcard_attach_bytecode(struct session_wildcard *wildcard,
-		struct lttng_ust_filter_bytecode_node *filter_bytecode)
-{
-	cds_list_add(&filter_bytecode->node, &wildcard->filter_bytecode);
-	return 0;
-}
-
-void lttng_free_event_filter_bytecode(struct ltt_event *event)
-{
-	struct lttng_ust_filter_bytecode_node *filter_bytecode, *tmp;
-
-	cds_list_for_each_entry_safe(filter_bytecode, tmp,
-			&event->filter_bytecode, node) {
-		free(filter_bytecode);
-	}
-}
-
-void lttng_free_wildcard_filter_bytecode(struct session_wildcard *wildcard)
+void lttng_free_enabler_filter_bytecode(struct lttng_enabler *enabler)
 {
 	struct lttng_ust_filter_bytecode_node *filter_bytecode, *tmp;
 
 	cds_list_for_each_entry_safe(filter_bytecode, tmp,
-			&wildcard->filter_bytecode, node) {
+			&enabler->filter_bytecode_head, node) {
 		free(filter_bytecode);
 	}
 }
 
-void lttng_free_event_filter_runtime(struct ltt_event *event)
+void lttng_free_event_filter_runtime(struct lttng_event *event)
 {
 	struct bytecode_runtime *runtime, *tmp;
 
 	cds_list_for_each_entry_safe(runtime, tmp,
-			&event->bytecode_runtime, p.node) {
+			&event->bytecode_runtime_head, p.node) {
 		free(runtime);
 	}
 }