X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode.c;h=a30dd1825cec23e021ec1590d198d5d889feb990;hb=185c782861fe6ed224d14293afc57c46ab5e7aed;hp=9153674d81f268b032dcfdc273ba22ff37bfc819;hpb=04aa13f8c2944839f6514e3841b93057b443a783;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index 9153674d..a30dd182 100644
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -298,21 +298,21 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
 	struct load_op *op;
 	struct lttng_ctx_field *ctx_field;
 	int idx;
-	struct lttng_ctx *ctx = *runtime->p.pctx;
+	struct lttng_ctx **pctx = runtime->p.pctx;
 
 	dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
 	/* Get context index */
-	idx = lttng_get_context_index(ctx, context_name);
+	idx = lttng_get_context_index(*pctx, 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,
-					&ctx);
+					pctx);
 			if (ret)
 				return ret;
-			idx = lttng_get_context_index(ctx, context_name);
+			idx = lttng_get_context_index(*pctx, context_name);
 			if (idx < 0)
 				return -ENOENT;
 		} else {
@@ -324,7 +324,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
 		return -EINVAL;
 
 	/* Get context return type */
-	ctx_field = &ctx->fields[idx];
+	ctx_field = &(*pctx)->fields[idx];
 	op = (struct load_op *) &runtime->code[reloc_offset];
 
 	switch (bytecode_op) {
@@ -421,7 +421,7 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
  * bytecode runtime.
  */
 static
-int _lttng_filter_link_bytecode(const struct lttng_event_desc *event_desc,
+int link_bytecode(const struct lttng_event_desc *event_desc,
 		struct lttng_ctx **ctx,
 		struct lttng_ust_bytecode_node *bytecode,
 		struct cds_list_head *insert_loc)
@@ -478,14 +478,35 @@ int _lttng_filter_link_bytecode(const struct lttng_event_desc *event_desc,
 	if (ret) {
 		goto link_error;
 	}
-	runtime->p.filter = lttng_bytecode_filter_interpret;
+
+	switch (bytecode->type) {
+	case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
+		runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret;
+		break;
+	case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE:
+		runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret;
+		break;
+	default:
+		abort();
+	}
+
 	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_bytecode_filter_interpret_false;
+	switch (bytecode->type) {
+	case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
+		runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
+		break;
+	case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE:
+		runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+		break;
+	default:
+		abort();
+	}
+
 	runtime->p.link_failed = 1;
 	cds_list_add_rcu(&runtime->p.node, insert_loc);
 alloc_error:
@@ -493,42 +514,64 @@ alloc_error:
 	return ret;
 }
 
-void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime)
+void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
 {
 	struct lttng_ust_bytecode_node *bc = runtime->bc;
 
 	if (!bc->enabler->enabled || runtime->link_failed)
-		runtime->filter = lttng_bytecode_filter_interpret_false;
+		runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
 	else
-		runtime->filter = lttng_bytecode_filter_interpret;
+		runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
+}
+
+void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
+{
+	struct lttng_ust_bytecode_node *bc = runtime->bc;
+
+	if (!bc->enabler->enabled || runtime->link_failed)
+		runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+	else
+		runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret;
 }
 
 /*
- * Link all bytecodes of the enabler referenced in the provided bytecode list.
+ * Given the lists of bytecode programs of an instance (trigger or event) and
+ * of a matching enabler, try to link all the enabler's bytecode programs with
+ * the instance.
+ *
+ * This function is called after we confirmed that name enabler and the
+ * instance are name matching (or glob pattern matching).
  */
 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 cds_list_head *instance_bytecode_head,
+		struct cds_list_head *enabler_bytecode_head)
 {
-	struct lttng_ust_bytecode_node *bc;
+	struct lttng_ust_bytecode_node *enabler_bc;
 	struct lttng_bytecode_runtime *runtime;
 
 	assert(event_desc);
 
-	/* Link each bytecode. */
-	cds_list_for_each_entry(bc, &enabler->filter_bytecode_head, node) {
+	/* Go over all the bytecode programs of the enabler. */
+	cds_list_for_each_entry(enabler_bc, enabler_bytecode_head, node) {
 		int found = 0, ret;
 		struct cds_list_head *insert_loc;
 
-		cds_list_for_each_entry(runtime,
-				bytecode_runtime_head, node) {
-			if (runtime->bc == bc) {
+		/*
+		 * Check if the current enabler bytecode program is already
+		 * linked with the instance.
+		 */
+		cds_list_for_each_entry(runtime, instance_bytecode_head, node) {
+			if (runtime->bc == enabler_bc) {
 				found = 1;
 				break;
 			}
 		}
-		/* Skip bytecode already linked */
+
+		/*
+		 * Skip bytecode already linked, go to the next enabler
+		 * bytecode program.
+		 */
 		if (found)
 			continue;
 
@@ -538,8 +581,8 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
 		 * insert the new bytecode right after it.
 		 */
 		cds_list_for_each_entry_reverse(runtime,
-				bytecode_runtime_head, node) {
-			if (runtime->bc->bc.seqnum <= bc->bc.seqnum) {
+				instance_bytecode_head, node) {
+			if (runtime->bc->bc.seqnum <= enabler_bc->bc.seqnum) {
 				/* insert here */
 				insert_loc = &runtime->node;
 				goto add_within;
@@ -547,11 +590,10 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
 		}
 
 		/* Add to head to list */
-		insert_loc = bytecode_runtime_head;
+		insert_loc = instance_bytecode_head;
 	add_within:
 		dbg_printf("linking bytecode\n");
-		ret = _lttng_filter_link_bytecode(event_desc, ctx, bc,
-			insert_loc);
+		ret = link_bytecode(event_desc, ctx, enabler_bc, insert_loc);
 		if (ret) {
 			dbg_printf("[lttng filter] warning: cannot link event bytecode\n");
 		}
@@ -590,3 +632,8 @@ void lttng_free_event_notifier_filter_runtime(
 {
 	free_filter_runtime(&event_notifier->filter_bytecode_runtime_head);
 }
+
+/* For backward compatibility. Leave those exported symbols in place. */
+void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime)
+{
+}