{
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;
}
*/
static
int _lttng_filter_event_link_bytecode(struct lttng_event *event,
- struct lttng_ust_filter_bytecode_node *filter_bytecode)
+ struct lttng_ust_filter_bytecode_node *filter_bytecode,
+ struct cds_list_head *insert_loc)
{
int ret, offset, next_offset;
struct bytecode_runtime *runtime = NULL;
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;
goto link_error;
}
runtime->p.filter = lttng_filter_interpret_bytecode;
- /* TODO: add with prio */
- cds_list_add_rcu(&runtime->p.node, &event->bytecode_runtime);
+ 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);
+ cds_list_add_rcu(&runtime->p.node, insert_loc);
dbg_printf("Linking failed.\n");
return ret;
}
-void lttng_filter_event_link_bytecode(struct lttng_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 lttng_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->filter = lttng_filter_interpret_bytecode;
+ else
+ runtime->filter = lttng_filter_false;
}
/*
- * 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 lttng_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.
- */
-int lttng_filter_event_attach_bytecode(struct lttng_event *event,
- struct lttng_ust_filter_bytecode_node *filter_bytecode)
-{
- cds_list_add(&filter_bytecode->node, &event->filter_bytecode);
- return 0;
}
/*
- * Need to attach filter to a wildcard 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_wildcard_attach_bytecode(struct session_wildcard *wildcard,
+int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler,
struct lttng_ust_filter_bytecode_node *filter_bytecode)
{
- cds_list_add(&filter_bytecode->node, &wildcard->filter_bytecode);
+ cds_list_add(&filter_bytecode->node, &enabler->filter_bytecode_head);
return 0;
}
-void lttng_free_event_filter_bytecode(struct lttng_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);
}
}
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);
}
}
projects / lttng-ust.git / blobdiff