Adapted from master branch commit
83b934ad.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
char *channel_name;
uint64_t capacity;
struct cds_lfht_node channels_ht_node;
char *channel_name;
uint64_t capacity;
struct cds_lfht_node channels_ht_node;
+ /* call_rcu delayed reclaim. */
+ struct rcu_head rcu_node;
};
struct notification_thread_command {
};
struct notification_thread_command {
struct channel_key channel_key;
struct cds_list_head list;
struct cds_lfht_node channel_triggers_ht_node;
struct channel_key channel_key;
struct cds_list_head list;
struct cds_lfht_node channel_triggers_ht_node;
+ /* call_rcu delayed reclaim. */
+ struct rcu_head rcu_node;
};
struct lttng_trigger_ht_element {
struct lttng_trigger *trigger;
struct cds_lfht_node node;
};
struct lttng_trigger_ht_element {
struct lttng_trigger *trigger;
struct cds_lfht_node node;
+ /* call_rcu delayed reclaim. */
+ struct rcu_head rcu_node;
};
struct lttng_condition_list_element {
};
struct lttng_condition_list_element {
struct lttng_trigger *trigger;
struct cds_list_head list;
struct cds_lfht_node notification_trigger_ht_node;
struct lttng_trigger *trigger;
struct cds_list_head list;
struct cds_lfht_node notification_trigger_ht_node;
+ /* call_rcu delayed reclaim. */
+ struct rcu_head rcu_node;
};
struct notification_client {
};
struct notification_client {
struct lttng_dynamic_buffer buffer;
} outbound;
} communication;
struct lttng_dynamic_buffer buffer;
} outbound;
} communication;
+ /* call_rcu delayed reclaim. */
+ struct rcu_head rcu_node;
};
struct channel_state_sample {
};
struct channel_state_sample {
struct cds_lfht_node channel_state_ht_node;
uint64_t highest_usage;
uint64_t lowest_usage;
struct cds_lfht_node channel_state_ht_node;
uint64_t highest_usage;
uint64_t lowest_usage;
+ /* call_rcu delayed reclaim. */
+ struct rcu_head rcu_node;
};
static unsigned long hash_channel_key(struct channel_key *key);
};
static unsigned long hash_channel_key(struct channel_key *key);
return key_hash ^ domain_hash;
}
return key_hash ^ domain_hash;
}
+static
+void free_channel_info_rcu(struct rcu_head *node)
+{
+ free(caa_container_of(node, struct channel_info, rcu_node));
+}
+
static
void channel_info_destroy(struct channel_info *channel_info)
{
static
void channel_info_destroy(struct channel_info *channel_info)
{
if (channel_info->channel_name) {
free(channel_info->channel_name);
}
if (channel_info->channel_name) {
free(channel_info->channel_name);
}
+ call_rcu(&channel_info->rcu_node, free_channel_info_rcu);
+static
+void free_notification_client_rcu(struct rcu_head *node)
+{
+ free(caa_container_of(node, struct notification_client, rcu_node));
+}
+
static
void notification_client_destroy(struct notification_client *client,
struct notification_thread_state *state)
static
void notification_client_destroy(struct notification_client *client,
struct notification_thread_state *state)
}
lttng_dynamic_buffer_reset(&client->communication.inbound.buffer);
lttng_dynamic_buffer_reset(&client->communication.outbound.buffer);
}
lttng_dynamic_buffer_reset(&client->communication.inbound.buffer);
lttng_dynamic_buffer_reset(&client->communication.outbound.buffer);
+ call_rcu(&client->rcu_node, free_notification_client_rcu);
channel_key = &new_channel_info->key;
channel_key = &new_channel_info->key;
/* Build a list of all triggers applying to the new channel. */
cds_lfht_for_each_entry(state->triggers_ht, &iter, trigger_ht_element,
node) {
/* Build a list of all triggers applying to the new channel. */
cds_lfht_for_each_entry(state->triggers_ht, &iter, trigger_ht_element,
node) {
new_element = zmalloc(sizeof(*new_element));
if (!new_element) {
new_element = zmalloc(sizeof(*new_element));
if (!new_element) {
}
CDS_INIT_LIST_HEAD(&new_element->node);
new_element->trigger = trigger_ht_element->trigger;
}
CDS_INIT_LIST_HEAD(&new_element->node);
new_element->trigger = trigger_ht_element->trigger;
trigger_count);
channel_trigger_list = zmalloc(sizeof(*channel_trigger_list));
if (!channel_trigger_list) {
trigger_count);
channel_trigger_list = zmalloc(sizeof(*channel_trigger_list));
if (!channel_trigger_list) {
}
channel_trigger_list->channel_key = *channel_key;
CDS_INIT_LIST_HEAD(&channel_trigger_list->list);
cds_lfht_node_init(&channel_trigger_list->channel_triggers_ht_node);
cds_list_splice(&trigger_list, &channel_trigger_list->list);
}
channel_trigger_list->channel_key = *channel_key;
CDS_INIT_LIST_HEAD(&channel_trigger_list->list);
cds_lfht_node_init(&channel_trigger_list->channel_triggers_ht_node);
cds_list_splice(&trigger_list, &channel_trigger_list->list);
/* Add channel to the channel_ht which owns the channel_infos. */
cds_lfht_add(state->channels_ht,
hash_channel_key(channel_key),
/* Add channel to the channel_ht which owns the channel_infos. */
cds_lfht_add(state->channels_ht,
hash_channel_key(channel_key),
rcu_read_unlock();
*cmd_result = LTTNG_OK;
return 0;
rcu_read_unlock();
*cmd_result = LTTNG_OK;
return 0;
+error_unlock:
+ rcu_read_unlock();
error:
/* Empty trigger list */
channel_info_destroy(new_channel_info);
return 1;
}
error:
/* Empty trigger list */
channel_info_destroy(new_channel_info);
return 1;
}
+static
+void free_channel_trigger_list_rcu(struct rcu_head *node)
+{
+ free(caa_container_of(node, struct lttng_channel_trigger_list,
+ rcu_node));
+}
+
+static
+void free_channel_state_sample_rcu(struct rcu_head *node)
+{
+ free(caa_container_of(node, struct channel_state_sample,
+ rcu_node));
+}
+
static
int handle_notification_thread_command_remove_channel(
struct notification_thread_state *state,
static
int handle_notification_thread_command_remove_channel(
struct notification_thread_state *state,
free(trigger_list_element);
}
cds_lfht_del(state->channel_triggers_ht, node);
free(trigger_list_element);
}
cds_lfht_del(state->channel_triggers_ht, node);
+ call_rcu(&trigger_list->rcu_node, free_channel_trigger_list_rcu);
/* Free sampled channel state. */
cds_lfht_lookup(state->channel_state_ht,
/* Free sampled channel state. */
cds_lfht_lookup(state->channel_state_ht,
channel_state_ht_node);
cds_lfht_del(state->channel_state_ht, node);
channel_state_ht_node);
cds_lfht_del(state->channel_state_ht, node);
+ call_rcu(&sample->rcu_node, free_channel_state_sample_rcu);
}
/* Remove the channel from the channels_ht and free it. */
}
/* Remove the channel from the channels_ht and free it. */
+static
+void free_notification_client_list_rcu(struct rcu_head *node)
+{
+ free(caa_container_of(node, struct notification_client_list,
+ rcu_node));
+}
+
+static
+void free_lttng_trigger_ht_element_rcu(struct rcu_head *node)
+{
+ free(caa_container_of(node, struct lttng_trigger_ht_element,
+ rcu_node));
+}
+
static
int handle_notification_thread_command_unregister_trigger(
struct notification_thread_state *state,
static
int handle_notification_thread_command_unregister_trigger(
struct notification_thread_state *state,
free(client_list_element);
}
cds_lfht_del(state->notification_trigger_clients_ht, node);
free(client_list_element);
}
cds_lfht_del(state->notification_trigger_clients_ht, node);
+ call_rcu(&client_list->rcu_node, free_notification_client_list_rcu);
/* Remove trigger from triggers_ht. */
trigger_ht_element = caa_container_of(triggers_ht_node,
/* Remove trigger from triggers_ht. */
trigger_ht_element = caa_container_of(triggers_ht_node,
action = lttng_trigger_get_action(trigger_ht_element->trigger);
lttng_action_destroy(action);
lttng_trigger_destroy(trigger_ht_element->trigger);
action = lttng_trigger_get_action(trigger_ht_element->trigger);
lttng_action_destroy(action);
lttng_trigger_destroy(trigger_ht_element->trigger);
- free(trigger_ht_element);
+ call_rcu(&trigger_ht_element->rcu_node, free_lttng_trigger_ht_element_rcu);
end:
rcu_read_unlock();
if (_cmd_reply) {
end:
rcu_read_unlock();
if (_cmd_reply) {