X-Git-Url: http://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=1a71131f0f90d398c37468db093372a3449120e8;hp=9bf146d3773ce6c4cb5a9ee894fbad6cdb481630;hb=ac16173e318279dee29504820e3c2ad8ea597712;hpb=d02d7404fac685cd836b53e121afc64af71af140 diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c index 9bf146d37..1a71131f0 100644 --- a/src/bin/lttng-sessiond/notification-thread-events.c +++ b/src/bin/lttng-sessiond/notification-thread-events.c @@ -281,6 +281,17 @@ int match_trigger(struct cds_lfht_node *node, const void *key) return !!lttng_trigger_is_equal(trigger_key, trigger_ht_element->trigger); } +static +int match_trigger_token(struct cds_lfht_node *node, const void *key) +{ + const uint64_t *_key = key; + struct notification_trigger_tokens_ht_element *element; + + element = caa_container_of(node, + struct notification_trigger_tokens_ht_element, node); + return *_key == element->token; +} + static int match_client_list_condition(struct cds_lfht_node *node, const void *key) { @@ -1910,7 +1921,6 @@ int handle_notification_thread_command_add_tracer_event_source( goto end; } - CDS_INIT_LIST_HEAD(&element->node); element->fd = tracer_event_source_fd; element->domain = domain_type; @@ -1945,6 +1955,7 @@ int handle_notification_thread_command_remove_tracer_event_source( enum lttng_error_code *_cmd_result) { int ret = 0; + bool found = false; enum lttng_error_code cmd_result = LTTNG_OK; struct notification_event_tracer_event_source_element *source_element = NULL, *tmp; @@ -1958,11 +1969,19 @@ int handle_notification_thread_command_remove_tracer_event_source( tracer_event_source_fd, lttng_domain_type_str(source_element->domain)); cds_list_del(&source_element->node); + found = true; break; } - /* It should always be found. */ - assert(source_element); + if (!found) { + /* + * This is temporarily allowed since the poll activity set is + * not properly cleaned-up for the moment. This is adressed in + * an upcoming fix. + */ + source_element = NULL; + goto end; + } if (!source_element->is_fd_in_poll_set) { /* Skip the poll set removal. */ @@ -1983,6 +2002,8 @@ int handle_notification_thread_command_remove_tracer_event_source( goto end; } + source_element->is_fd_in_poll_set = false; + end: free(source_element); *_cmd_result = cmd_result; @@ -2322,6 +2343,7 @@ int handle_notification_thread_command_register_trigger( struct notification_client_list *client_list = NULL; struct lttng_trigger_ht_element *trigger_ht_element = NULL; struct notification_client_list_element *client_list_element; + struct notification_trigger_tokens_ht_element *trigger_tokens_ht_element = NULL; struct cds_lfht_node *node; struct cds_lfht_iter iter; const char* trigger_name; @@ -2400,10 +2422,47 @@ int handle_notification_thread_command_register_trigger( goto error_free_ht_element; } + if (lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_EVENT_RULE_HIT) { + trigger_tokens_ht_element = zmalloc(sizeof(*trigger_tokens_ht_element)); + if (!trigger_tokens_ht_element) { + /* Fatal error. */ + ret = -1; + cds_lfht_del(state->triggers_ht, + &trigger_ht_element->node); + cds_lfht_del(state->triggers_by_name_uid_ht, + &trigger_ht_element->node_by_name_uid); + goto error_free_ht_element; + } + + /* Add trigger token to the trigger_tokens_ht. */ + cds_lfht_node_init(&trigger_tokens_ht_element->node); + trigger_tokens_ht_element->token = + LTTNG_OPTIONAL_GET(trigger->tracer_token); + trigger_tokens_ht_element->trigger = trigger; + + node = cds_lfht_add_unique(state->trigger_tokens_ht, + hash_key_u64(&trigger_tokens_ht_element->token, + lttng_ht_seed), + match_trigger_token, + &trigger_tokens_ht_element->token, + &trigger_tokens_ht_element->node); + if (node != &trigger_tokens_ht_element->node) { + /* Internal corruption, fatal error. */ + ret = -1; + *cmd_result = LTTNG_ERR_TRIGGER_EXISTS; + cds_lfht_del(state->triggers_ht, + &trigger_ht_element->node); + cds_lfht_del(state->triggers_by_name_uid_ht, + &trigger_ht_element->node_by_name_uid); + goto error_free_ht_element; + } + } + /* * Ownership of the trigger and of its wrapper was transfered to - * the triggers_ht. + * the triggers_ht. Same for token ht element if necessary. */ + trigger_tokens_ht_element = NULL; trigger_ht_element = NULL; free_trigger = false; @@ -2585,6 +2644,7 @@ error_free_ht_element: free_lttng_trigger_ht_element_rcu); } + free(trigger_tokens_ht_element); error: if (free_trigger) { lttng_trigger_destroy(trigger); @@ -2600,10 +2660,17 @@ void free_lttng_trigger_ht_element_rcu(struct rcu_head *node) rcu_node)); } +static +void free_notification_trigger_tokens_ht_element_rcu(struct rcu_head *node) +{ + free(caa_container_of(node, struct notification_trigger_tokens_ht_element, + rcu_node)); +} + static int handle_notification_thread_command_unregister_trigger( struct notification_thread_state *state, - struct lttng_trigger *trigger, + const struct lttng_trigger *trigger, enum lttng_error_code *_cmd_reply) { struct cds_lfht_iter iter; @@ -2611,7 +2678,7 @@ int handle_notification_thread_command_unregister_trigger( struct lttng_channel_trigger_list *trigger_list; struct notification_client_list *client_list; struct lttng_trigger_ht_element *trigger_ht_element = NULL; - struct lttng_condition *condition = lttng_trigger_get_condition( + const struct lttng_condition *condition = lttng_trigger_get_const_condition( trigger); enum lttng_error_code cmd_reply; @@ -2648,6 +2715,28 @@ int handle_notification_thread_command_unregister_trigger( } } + if (lttng_condition_get_type(condition) == + LTTNG_CONDITION_TYPE_EVENT_RULE_HIT) { + struct notification_trigger_tokens_ht_element + *trigger_tokens_ht_element; + + cds_lfht_for_each_entry (state->trigger_tokens_ht, &iter, + trigger_tokens_ht_element, node) { + if (!lttng_trigger_is_equal(trigger, + trigger_tokens_ht_element->trigger)) { + continue; + } + + DBG("[notification-thread] Removed trigger from tokens_ht"); + cds_lfht_del(state->trigger_tokens_ht, + &trigger_tokens_ht_element->node); + call_rcu(&trigger_tokens_ht_element->rcu_node, + free_notification_trigger_tokens_ht_element_rcu); + + break; + } + } + if (is_trigger_action_notify(trigger)) { /* * Remove and release the client list from @@ -2703,14 +2792,15 @@ int handle_notification_thread_command( switch (cmd->type) { case NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER: DBG("[notification-thread] Received register trigger command"); - ret = handle_notification_thread_command_register_trigger( - state, cmd->parameters.trigger, + ret = handle_notification_thread_command_register_trigger(state, + cmd->parameters.register_trigger.trigger, &cmd->reply_code); break; case NOTIFICATION_COMMAND_TYPE_UNREGISTER_TRIGGER: DBG("[notification-thread] Received unregister trigger command"); ret = handle_notification_thread_command_unregister_trigger( - state, cmd->parameters.trigger, + state, + cmd->parameters.unregister_trigger.trigger, &cmd->reply_code); break; case NOTIFICATION_COMMAND_TYPE_ADD_CHANNEL: