X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftracker.cpp;h=526e51b6bc847ad47f7b4ceec872f95c975cbba7;hb=HEAD;hp=10f8dd59811a4e99f51d6c5fba025e347c4d7df8;hpb=0114db0ec2407029052eb61a0189c9b1cd64d520;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/tracker.cpp b/src/bin/lttng-sessiond/tracker.cpp index 10f8dd598..526e51b6b 100644 --- a/src/bin/lttng-sessiond/tracker.cpp +++ b/src/bin/lttng-sessiond/tracker.cpp @@ -6,26 +6,29 @@ * */ -#include "lttng/tracker.h" #include "common/dynamic-array.hpp" #include "common/macros.hpp" +#include "lttng/tracker.h" #define _LGPL_SOURCE -#include -#include -#include -#include -#include -#include -#include - #include "tracker.hpp" + #include #include #include #include #include +#include + #include +#include +#include +#include +#include +#include +#include +#include + struct process_attr_tracker { enum lttng_tracking_policy policy; struct cds_lfht *inclusion_set_ht; @@ -41,26 +44,25 @@ struct process_attr_tracker_value_node { static void process_attr_tracker_value_node_rcu_free(struct rcu_head *rcu_head) { - struct process_attr_tracker_value_node *node = lttng::utils::container_of( - rcu_head, &process_attr_tracker_value_node::rcu_head); + struct process_attr_tracker_value_node *node = + lttng::utils::container_of(rcu_head, &process_attr_tracker_value_node::rcu_head); free(node); } -struct process_attr_tracker *process_attr_tracker_create(void) +struct process_attr_tracker *process_attr_tracker_create() { struct process_attr_tracker *tracker; tracker = zmalloc(); if (!tracker) { - return NULL; + return nullptr; } - (void) process_attr_tracker_set_tracking_policy( - tracker, LTTNG_TRACKING_POLICY_INCLUDE_ALL); + (void) process_attr_tracker_set_tracking_policy(tracker, LTTNG_TRACKING_POLICY_INCLUDE_ALL); - tracker->inclusion_set_ht = cds_lfht_new(DEFAULT_HT_SIZE, 1, 0, - CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL); + tracker->inclusion_set_ht = cds_lfht_new( + DEFAULT_HT_SIZE, 1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, nullptr); if (!tracker->inclusion_set_ht) { goto error; } @@ -68,22 +70,19 @@ struct process_attr_tracker *process_attr_tracker_create(void) return tracker; error: process_attr_tracker_destroy(tracker); - return NULL; + return nullptr; } -static void process_attr_tracker_remove_value_node( - struct process_attr_tracker *tracker, - struct process_attr_tracker_value_node *value_node) +static void +process_attr_tracker_remove_value_node(struct process_attr_tracker *tracker, + struct process_attr_tracker_value_node *value_node) { - cds_lfht_del(tracker->inclusion_set_ht, - &value_node->inclusion_set_ht_node); + cds_lfht_del(tracker->inclusion_set_ht, &value_node->inclusion_set_ht_node); process_attr_value_destroy(value_node->value); - call_rcu(&value_node->rcu_head, - process_attr_tracker_value_node_rcu_free); + call_rcu(&value_node->rcu_head, process_attr_tracker_value_node_rcu_free); } -static void process_attr_tracker_clear_inclusion_set( - struct process_attr_tracker *tracker) +static void process_attr_tracker_clear_inclusion_set(struct process_attr_tracker *tracker) { int ret; struct lttng_ht_iter iter; @@ -93,23 +92,25 @@ static void process_attr_tracker_clear_inclusion_set( return; } - rcu_read_lock(); - cds_lfht_for_each_entry (tracker->inclusion_set_ht, &iter.iter, - value_node, inclusion_set_ht_node) { - process_attr_tracker_remove_value_node(tracker, value_node); + { + lttng::urcu::read_lock_guard read_lock; + + cds_lfht_for_each_entry ( + tracker->inclusion_set_ht, &iter.iter, value_node, inclusion_set_ht_node) { + process_attr_tracker_remove_value_node(tracker, value_node); + } } - rcu_read_unlock(); - ret = cds_lfht_destroy(tracker->inclusion_set_ht, NULL); + + ret = cds_lfht_destroy(tracker->inclusion_set_ht, nullptr); LTTNG_ASSERT(ret == 0); - tracker->inclusion_set_ht = NULL; + tracker->inclusion_set_ht = nullptr; } -static int process_attr_tracker_create_inclusion_set( - struct process_attr_tracker *tracker) +static int process_attr_tracker_create_inclusion_set(struct process_attr_tracker *tracker) { LTTNG_ASSERT(!tracker->inclusion_set_ht); - tracker->inclusion_set_ht = cds_lfht_new(DEFAULT_HT_SIZE, 1, 0, - CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL); + tracker->inclusion_set_ht = cds_lfht_new( + DEFAULT_HT_SIZE, 1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, nullptr); return tracker->inclusion_set_ht ? 0 : -1; } @@ -123,15 +124,14 @@ void process_attr_tracker_destroy(struct process_attr_tracker *tracker) free(tracker); } -enum lttng_tracking_policy process_attr_tracker_get_tracking_policy( - const struct process_attr_tracker *tracker) +enum lttng_tracking_policy +process_attr_tracker_get_tracking_policy(const struct process_attr_tracker *tracker) { return tracker->policy; } -int process_attr_tracker_set_tracking_policy( - struct process_attr_tracker *tracker, - enum lttng_tracking_policy tracking_policy) +int process_attr_tracker_set_tracking_policy(struct process_attr_tracker *tracker, + enum lttng_tracking_policy tracking_policy) { int ret = 0; @@ -149,50 +149,47 @@ end: return ret; } -static int match_inclusion_set_value( - struct cds_lfht_node *node, const void *key) +static int match_inclusion_set_value(struct cds_lfht_node *node, const void *key) { const struct process_attr_value *value_key = (process_attr_value *) key; - const struct process_attr_tracker_value_node *value_node = - caa_container_of(node, - struct process_attr_tracker_value_node, - inclusion_set_ht_node); + const struct process_attr_tracker_value_node *value_node = caa_container_of( + node, struct process_attr_tracker_value_node, inclusion_set_ht_node); return process_attr_tracker_value_equal(value_node->value, value_key); } -static struct process_attr_tracker_value_node *process_attr_tracker_lookup( - const struct process_attr_tracker *tracker, - const struct process_attr_value *value) +static struct process_attr_tracker_value_node * +process_attr_tracker_lookup(const struct process_attr_tracker *tracker, + const struct process_attr_value *value) { struct cds_lfht_iter iter; struct cds_lfht_node *node; LTTNG_ASSERT(tracker->policy == LTTNG_TRACKING_POLICY_INCLUDE_SET); - rcu_read_lock(); + lttng::urcu::read_lock_guard read_lock; cds_lfht_lookup(tracker->inclusion_set_ht, process_attr_value_hash(value), - match_inclusion_set_value, value, &iter); + match_inclusion_set_value, + value, + &iter); node = cds_lfht_iter_get_node(&iter); - rcu_read_unlock(); - return node ? lttng::utils::container_of(node, - &process_attr_tracker_value_node::inclusion_set_ht_node) : - NULL; + return node ? lttng::utils::container_of( + node, &process_attr_tracker_value_node::inclusion_set_ht_node) : + nullptr; } /* Protected by session mutex held by caller. */ -enum process_attr_tracker_status process_attr_tracker_inclusion_set_add_value( - struct process_attr_tracker *tracker, - const struct process_attr_value *value) +enum process_attr_tracker_status +process_attr_tracker_inclusion_set_add_value(struct process_attr_tracker *tracker, + const struct process_attr_value *value) { - enum process_attr_tracker_status status = - PROCESS_ATTR_TRACKER_STATUS_OK; - struct process_attr_value *value_copy = NULL; - struct process_attr_tracker_value_node *value_node = NULL; + enum process_attr_tracker_status status = PROCESS_ATTR_TRACKER_STATUS_OK; + struct process_attr_value *value_copy = nullptr; + struct process_attr_tracker_value_node *value_node = nullptr; - rcu_read_lock(); + lttng::urcu::read_lock_guard read_lock; if (tracker->policy != LTTNG_TRACKING_POLICY_INCLUDE_SET) { status = PROCESS_ATTR_TRACKER_STATUS_INVALID_TRACKING_POLICY; goto end; @@ -217,10 +214,10 @@ enum process_attr_tracker_status process_attr_tracker_inclusion_set_add_value( value_node->value = value_copy; cds_lfht_add(tracker->inclusion_set_ht, - process_attr_value_hash(value_copy), - &value_node->inclusion_set_ht_node); - value_copy = NULL; - value_node = NULL; + process_attr_value_hash(value_copy), + &value_node->inclusion_set_ht_node); + value_copy = nullptr; + value_node = nullptr; end: if (value_copy) { process_attr_value_destroy(value_copy); @@ -228,21 +225,18 @@ end: if (value_node) { free(value_node); } - rcu_read_unlock(); return status; } /* Protected by session mutex held by caller. */ enum process_attr_tracker_status -process_attr_tracker_inclusion_set_remove_value( - struct process_attr_tracker *tracker, - const struct process_attr_value *value) +process_attr_tracker_inclusion_set_remove_value(struct process_attr_tracker *tracker, + const struct process_attr_value *value) { struct process_attr_tracker_value_node *value_node; - enum process_attr_tracker_status status = - PROCESS_ATTR_TRACKER_STATUS_OK; + enum process_attr_tracker_status status = PROCESS_ATTR_TRACKER_STATUS_OK; - rcu_read_lock(); + lttng::urcu::read_lock_guard read_lock; if (tracker->policy != LTTNG_TRACKING_POLICY_INCLUDE_SET) { status = PROCESS_ATTR_TRACKER_STATUS_INVALID_TRACKING_POLICY; goto end; @@ -256,20 +250,18 @@ process_attr_tracker_inclusion_set_remove_value( process_attr_tracker_remove_value_node(tracker, value_node); end: - rcu_read_unlock(); return status; } -enum process_attr_tracker_status process_attr_tracker_get_inclusion_set( - const struct process_attr_tracker *tracker, - struct lttng_process_attr_values **_values) +enum process_attr_tracker_status +process_attr_tracker_get_inclusion_set(const struct process_attr_tracker *tracker, + struct lttng_process_attr_values **_values) { struct lttng_ht_iter iter; struct process_attr_tracker_value_node *value_node; - enum process_attr_tracker_status status = - PROCESS_ATTR_TRACKER_STATUS_OK; + enum process_attr_tracker_status status = PROCESS_ATTR_TRACKER_STATUS_OK; struct lttng_process_attr_values *values; - struct process_attr_value *new_value = NULL; + struct process_attr_value *new_value = nullptr; values = lttng_process_attr_values_create(); if (!values) { @@ -282,31 +274,32 @@ enum process_attr_tracker_status process_attr_tracker_get_inclusion_set( goto error; } - rcu_read_lock(); - cds_lfht_for_each_entry (tracker->inclusion_set_ht, &iter.iter, - value_node, inclusion_set_ht_node) { - int ret; + { + lttng::urcu::read_lock_guard read_lock; - new_value = process_attr_value_copy(value_node->value); - if (!new_value) { - status = PROCESS_ATTR_TRACKER_STATUS_ERROR; - goto error_unlock; - } + cds_lfht_for_each_entry ( + tracker->inclusion_set_ht, &iter.iter, value_node, inclusion_set_ht_node) { + int ret; - ret = lttng_dynamic_pointer_array_add_pointer( - &values->array, new_value); - if (ret) { - status = PROCESS_ATTR_TRACKER_STATUS_ERROR; - goto error_unlock; - } + new_value = process_attr_value_copy(value_node->value); + if (!new_value) { + status = PROCESS_ATTR_TRACKER_STATUS_ERROR; + goto error_unlock; + } - new_value = NULL; + ret = lttng_dynamic_pointer_array_add_pointer(&values->array, new_value); + if (ret) { + status = PROCESS_ATTR_TRACKER_STATUS_ERROR; + goto error_unlock; + } + + new_value = nullptr; + } } - rcu_read_unlock(); + *_values = values; return status; error_unlock: - rcu_read_unlock(); error: lttng_process_attr_values_destroy(values); process_attr_value_destroy(new_value);