X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftracker.cpp;h=a74e46c2975b9e79fe81566d6f8720c7d7174442;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=204ade426316b288afd6e59d1ceade61f82a706f;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/tracker.cpp b/src/bin/lttng-sessiond/tracker.cpp index 204ade426..a74e46c29 100644 --- a/src/bin/lttng-sessiond/tracker.cpp +++ b/src/bin/lttng-sessiond/tracker.cpp @@ -6,10 +6,20 @@ * */ -#include "lttng/tracker.h" #include "common/dynamic-array.hpp" #include "common/macros.hpp" +#include "lttng/tracker.h" #define _LGPL_SOURCE +#include "tracker.hpp" + +#include +#include +#include +#include +#include + +#include + #include #include #include @@ -18,29 +28,23 @@ #include #include -#include "tracker.hpp" -#include -#include -#include -#include -#include -#include +struct process_attr_tracker { + enum lttng_tracking_policy policy; + struct cds_lfht *inclusion_set_ht; +}; +namespace { struct process_attr_tracker_value_node { struct process_attr_value *value; struct cds_lfht_node inclusion_set_ht_node; struct rcu_head rcu_head; }; - -struct process_attr_tracker { - enum lttng_tracking_policy policy; - struct cds_lfht *inclusion_set_ht; -}; +} /* namespace */ static void process_attr_tracker_value_node_rcu_free(struct rcu_head *rcu_head) { struct process_attr_tracker_value_node *node = - container_of(rcu_head, typeof(*node), rcu_head); + lttng::utils::container_of(rcu_head, &process_attr_tracker_value_node::rcu_head); free(node); } @@ -49,16 +53,15 @@ struct process_attr_tracker *process_attr_tracker_create(void) { struct process_attr_tracker *tracker; - tracker = (process_attr_tracker *) zmalloc(sizeof(*tracker)); + tracker = zmalloc(); if (!tracker) { return NULL; } - (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, NULL); if (!tracker->inclusion_set_ht) { goto error; } @@ -69,19 +72,16 @@ error: return NULL; } -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; @@ -92,8 +92,8 @@ static void process_attr_tracker_clear_inclusion_set( } rcu_read_lock(); - cds_lfht_for_each_entry (tracker->inclusion_set_ht, &iter.iter, - value_node, inclusion_set_ht_node) { + 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(); @@ -102,12 +102,11 @@ static void process_attr_tracker_clear_inclusion_set( tracker->inclusion_set_ht = NULL; } -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, NULL); return tracker->inclusion_set_ht ? 0 : -1; } @@ -121,15 +120,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; @@ -147,21 +145,18 @@ 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; @@ -171,22 +166,23 @@ static struct process_attr_tracker_value_node *process_attr_tracker_lookup( rcu_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 ? container_of(node, struct process_attr_tracker_value_node, - inclusion_set_ht_node) : + return node ? lttng::utils::container_of( + node, &process_attr_tracker_value_node::inclusion_set_ht_node) : NULL; } /* 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; + 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; @@ -201,7 +197,7 @@ enum process_attr_tracker_status process_attr_tracker_inclusion_set_add_value( goto end; } - value_node = (process_attr_tracker_value_node *) zmalloc(sizeof(*value_node)); + value_node = zmalloc(); if (!value_node) { status = PROCESS_ATTR_TRACKER_STATUS_ERROR; goto end; @@ -215,8 +211,8 @@ 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); + process_attr_value_hash(value_copy), + &value_node->inclusion_set_ht_node); value_copy = NULL; value_node = NULL; end: @@ -232,13 +228,11 @@ end: /* 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(); if (tracker->policy != LTTNG_TRACKING_POLICY_INCLUDE_SET) { @@ -258,14 +252,13 @@ end: 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; @@ -281,8 +274,8 @@ enum process_attr_tracker_status process_attr_tracker_get_inclusion_set( } rcu_read_lock(); - cds_lfht_for_each_entry (tracker->inclusion_set_ht, &iter.iter, - value_node, inclusion_set_ht_node) { + cds_lfht_for_each_entry ( + tracker->inclusion_set_ht, &iter.iter, value_node, inclusion_set_ht_node) { int ret; new_value = process_attr_value_copy(value_node->value); @@ -291,8 +284,7 @@ enum process_attr_tracker_status process_attr_tracker_get_inclusion_set( goto error_unlock; } - ret = lttng_dynamic_pointer_array_add_pointer( - &values->array, new_value); + ret = lttng_dynamic_pointer_array_add_pointer(&values->array, new_value); if (ret) { status = PROCESS_ATTR_TRACKER_STATUS_ERROR; goto error_unlock;