X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.cpp;h=31f1634bd70b70a681b6479433e0eb743fe72492;hb=HEAD;hp=15b3b9db97e0c15117162e37814fe1db65da9ec3;hpb=28ab034a2c3582d07d3423d2d746731f87d3969f;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/agent.cpp b/src/bin/lttng-sessiond/agent.cpp index 15b3b9db9..210ec9b0c 100644 --- a/src/bin/lttng-sessiond/agent.cpp +++ b/src/bin/lttng-sessiond/agent.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -29,10 +30,10 @@ #include #include -typedef enum lttng_event_rule_status (*event_rule_logging_get_name_pattern)( - const struct lttng_event_rule *rule, const char **pattern); -typedef enum lttng_event_rule_status (*event_rule_logging_get_log_level_rule)( - const struct lttng_event_rule *rule, const struct lttng_log_level_rule **log_level_rule); +using event_rule_logging_get_name_pattern = + enum lttng_event_rule_status (*)(const struct lttng_event_rule *, const char **); +using event_rule_logging_get_log_level_rule = enum lttng_event_rule_status (*)( + const struct lttng_event_rule *, const struct lttng_log_level_rule **); /* * Agent application context representation. @@ -311,8 +312,8 @@ static ssize_t list_events(struct agent_app *app, struct lttng_event **events) uint32_t nb_event; size_t data_size; uint32_t reply_ret_code; - struct lttng_event *tmp_events = NULL; - struct lttcomm_agent_list_reply *reply = NULL; + struct lttng_event *tmp_events = nullptr; + struct lttcomm_agent_list_reply *reply = nullptr; struct lttcomm_agent_list_reply_hdr reply_hdr; LTTNG_ASSERT(app); @@ -682,17 +683,20 @@ int agent_enable_event(struct agent_event *event, enum lttng_domain_type domain) LTTNG_ASSERT(event); - rcu_read_lock(); + { + lttng::urcu::read_lock_guard read_lock; - cds_lfht_for_each_entry (the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { - if (app->domain != domain) { - continue; - } + cds_lfht_for_each_entry ( + the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { + if (app->domain != domain) { + continue; + } - /* Enable event on agent application through TCP socket. */ - ret = enable_event(app, event); - if (ret != LTTNG_OK) { - goto error; + /* Enable event on agent application through TCP socket. */ + ret = enable_event(app, event); + if (ret != LTTNG_OK) { + goto error; + } } } @@ -700,7 +704,6 @@ int agent_enable_event(struct agent_event *event, enum lttng_domain_type domain) ret = LTTNG_OK; error: - rcu_read_unlock(); return ret; } @@ -713,7 +716,7 @@ static void destroy_app_ctx(struct agent_app_ctx *ctx) static struct agent_app_ctx *create_app_ctx(const struct lttng_event_context *ctx) { - struct agent_app_ctx *agent_ctx = NULL; + struct agent_app_ctx *agent_ctx = nullptr; if (!ctx) { goto end; @@ -729,7 +732,7 @@ static struct agent_app_ctx *create_app_ctx(const struct lttng_event_context *ct agent_ctx->ctx_name = strdup(ctx->u.app_ctx.ctx_name); if (!agent_ctx->provider_name || !agent_ctx->ctx_name) { destroy_app_ctx(agent_ctx); - agent_ctx = NULL; + agent_ctx = nullptr; } end: return agent_ctx; @@ -753,33 +756,35 @@ int agent_enable_context(const struct lttng_event_context *ctx, enum lttng_domai goto error; } - rcu_read_lock(); + { + lttng::urcu::read_lock_guard read_lock; - cds_lfht_for_each_entry (the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { - struct agent_app_ctx *agent_ctx; + cds_lfht_for_each_entry ( + the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { + struct agent_app_ctx *agent_ctx; - if (app->domain != domain) { - continue; - } + if (app->domain != domain) { + continue; + } - agent_ctx = create_app_ctx(ctx); - if (!agent_ctx) { - ret = LTTNG_ERR_NOMEM; - goto error_unlock; - } + agent_ctx = create_app_ctx(ctx); + if (!agent_ctx) { + ret = LTTNG_ERR_NOMEM; + goto error_unlock; + } - /* Enable event on agent application through TCP socket. */ - ret = app_context_op(app, agent_ctx, AGENT_CMD_APP_CTX_ENABLE); - destroy_app_ctx(agent_ctx); - if (ret != LTTNG_OK) { - goto error_unlock; + /* Enable event on agent application through TCP socket. */ + ret = app_context_op(app, agent_ctx, AGENT_CMD_APP_CTX_ENABLE); + destroy_app_ctx(agent_ctx); + if (ret != LTTNG_OK) { + goto error_unlock; + } } } ret = LTTNG_OK; error_unlock: - rcu_read_unlock(); error: return ret; } @@ -811,17 +816,20 @@ int agent_disable_event(struct agent_event *event, enum lttng_domain_type domain goto end; } - rcu_read_lock(); + { + lttng::urcu::read_lock_guard read_lock; - cds_lfht_for_each_entry (the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { - if (app->domain != domain) { - continue; - } + cds_lfht_for_each_entry ( + the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { + if (app->domain != domain) { + continue; + } - /* Enable event on agent application through TCP socket. */ - ret = disable_event(app, event); - if (ret != LTTNG_OK) { - goto error; + /* Enable event on agent application through TCP socket. */ + ret = disable_event(app, event); + if (ret != LTTNG_OK) { + goto error; + } } } @@ -829,7 +837,6 @@ int agent_disable_event(struct agent_event *event, enum lttng_domain_type domain LTTNG_ASSERT(!AGENT_EVENT_IS_ENABLED(event)); error: - rcu_read_unlock(); end: return ret; } @@ -847,21 +854,24 @@ static int disable_context(struct agent_app_ctx *ctx, enum lttng_domain_type dom struct lttng_ht_iter iter; LTTNG_ASSERT(ctx); - - rcu_read_lock(); DBG2("Disabling agent application context %s:%s", ctx->provider_name, ctx->ctx_name); - cds_lfht_for_each_entry (the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { - if (app->domain != domain) { - continue; - } - ret = app_context_op(app, ctx, AGENT_CMD_APP_CTX_DISABLE); - if (ret != LTTNG_OK) { - goto end; + { + lttng::urcu::read_lock_guard read_lock; + + cds_lfht_for_each_entry ( + the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { + if (app->domain != domain) { + continue; + } + + ret = app_context_op(app, ctx, AGENT_CMD_APP_CTX_DISABLE); + if (ret != LTTNG_OK) { + goto end; + } } } end: - rcu_read_unlock(); return ret; } @@ -876,7 +886,7 @@ int agent_list_events(struct lttng_event **events, enum lttng_domain_type domain int ret; size_t nbmem, count = 0; struct agent_app *app; - struct lttng_event *tmp_events = NULL; + struct lttng_event *tmp_events = nullptr; struct lttng_ht_iter iter; LTTNG_ASSERT(events); @@ -891,58 +901,60 @@ int agent_list_events(struct lttng_event **events, enum lttng_domain_type domain goto error; } - rcu_read_lock(); - cds_lfht_for_each_entry (the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { - ssize_t nb_ev; - struct lttng_event *agent_events; + { + lttng::urcu::read_lock_guard read_lock; - /* Skip domain not asked by the list. */ - if (app->domain != domain) { - continue; - } + cds_lfht_for_each_entry ( + the_agent_apps_ht_by_sock->ht, &iter.iter, app, node.node) { + ssize_t nb_ev; + struct lttng_event *agent_events; - nb_ev = list_events(app, &agent_events); - if (nb_ev < 0) { - ret = nb_ev; - goto error_unlock; - } + /* Skip domain not asked by the list. */ + if (app->domain != domain) { + continue; + } - if (count + nb_ev > nbmem) { - /* In case the realloc fails, we free the memory */ - struct lttng_event *new_tmp_events; - size_t new_nbmem; - - new_nbmem = std::max(count + nb_ev, nbmem << 1); - DBG2("Reallocating agent event list from %zu to %zu entries", - nbmem, - new_nbmem); - new_tmp_events = (lttng_event *) realloc( - tmp_events, new_nbmem * sizeof(*new_tmp_events)); - if (!new_tmp_events) { - PERROR("realloc agent events"); - ret = -ENOMEM; - free(agent_events); - goto error_unlock; + nb_ev = list_events(app, &agent_events); + if (nb_ev < 0) { + ret = nb_ev; + goto error; + } + + if (count + nb_ev > nbmem) { + /* In case the realloc fails, we free the memory */ + struct lttng_event *new_tmp_events; + size_t new_nbmem; + + new_nbmem = std::max(count + nb_ev, nbmem << 1); + DBG2("Reallocating agent event list from %zu to %zu entries", + nbmem, + new_nbmem); + new_tmp_events = (lttng_event *) realloc( + tmp_events, new_nbmem * sizeof(*new_tmp_events)); + if (!new_tmp_events) { + PERROR("realloc agent events"); + ret = -ENOMEM; + free(agent_events); + goto error; + } + + /* Zero the new memory */ + memset(new_tmp_events + nbmem, + 0, + (new_nbmem - nbmem) * sizeof(*new_tmp_events)); + nbmem = new_nbmem; + tmp_events = new_tmp_events; } - /* Zero the new memory */ - memset(new_tmp_events + nbmem, - 0, - (new_nbmem - nbmem) * sizeof(*new_tmp_events)); - nbmem = new_nbmem; - tmp_events = new_tmp_events; + memcpy(tmp_events + count, agent_events, nb_ev * sizeof(*tmp_events)); + free(agent_events); + count += nb_ev; } - memcpy(tmp_events + count, agent_events, nb_ev * sizeof(*tmp_events)); - free(agent_events); - count += nb_ev; } - rcu_read_unlock(); ret = count; *events = tmp_events; return ret; -error_unlock: - rcu_read_unlock(); error: free(tmp_events); return ret; @@ -993,7 +1005,7 @@ struct agent_app *agent_find_app_by_sock(int sock) lttng_ht_lookup(the_agent_apps_ht_by_sock, (void *) ((unsigned long) sock), &iter); node = lttng_ht_iter_get_node_ulong(&iter); - if (node == NULL) { + if (node == nullptr) { goto error; } app = lttng::utils::container_of(node, &agent_app::node); @@ -1003,7 +1015,7 @@ struct agent_app *agent_find_app_by_sock(int sock) error: DBG3("Agent app NOT found by sock %d.", sock); - return NULL; + return nullptr; } /* @@ -1111,7 +1123,7 @@ struct agent *agent_create(enum lttng_domain_type domain) ret = agent_init(agt); if (ret < 0) { free(agt); - agt = NULL; + agt = nullptr; goto error; } @@ -1131,7 +1143,7 @@ struct agent_event *agent_create_event(const char *name, struct lttng_bytecode *filter, char *filter_expression) { - struct agent_event *event = NULL; + struct agent_event *event = nullptr; DBG3("Agent create new event with name %s, loglevel type %d, \ loglevel value %d and filter %s", @@ -1182,7 +1194,7 @@ void agent_add_event(struct agent_event *event, struct agent *agt) int agent_add_context(const struct lttng_event_context *ctx, struct agent *agt) { int ret = LTTNG_OK; - struct agent_app_ctx *agent_ctx = NULL; + struct agent_app_ctx *agent_ctx = nullptr; LTTNG_ASSERT(ctx); LTTNG_ASSERT(agt); @@ -1364,7 +1376,7 @@ struct agent_event *agent_find_event(const char *name, &key, &iter.iter); node = lttng_ht_iter_get_node_str(&iter); - if (node == NULL) { + if (node == nullptr) { goto error; } @@ -1373,7 +1385,7 @@ struct agent_event *agent_find_event(const char *name, error: DBG3("Agent event NOT found %s.", name); - return NULL; + return nullptr; } /* @@ -1411,32 +1423,35 @@ void agent_destroy(struct agent *agt) DBG3("Agent destroy"); - rcu_read_lock(); - cds_lfht_for_each_entry (agt->events->ht, &iter.iter, node, node) { - int ret; - struct agent_event *event; - - /* - * When destroying an event, we have to try to disable it on the - * agent side so the event stops generating data. The return - * value is not important since we have to continue anyway - * destroying the object. - */ - event = lttng::utils::container_of(node, &agent_event::node); - (void) agent_disable_event(event, agt->domain); + { + lttng::urcu::read_lock_guard read_lock; + + cds_lfht_for_each_entry (agt->events->ht, &iter.iter, node, node) { + int ret; + struct agent_event *event; + + /* + * When destroying an event, we have to try to disable it on the + * agent side so the event stops generating data. The return + * value is not important since we have to continue anyway + * destroying the object. + */ + event = lttng::utils::container_of(node, &agent_event::node); + (void) agent_disable_event(event, agt->domain); + + ret = lttng_ht_del(agt->events, &iter); + LTTNG_ASSERT(!ret); + call_rcu(&node->head, destroy_event_agent_rcu); + } - ret = lttng_ht_del(agt->events, &iter); - LTTNG_ASSERT(!ret); - call_rcu(&node->head, destroy_event_agent_rcu); + cds_list_for_each_entry_rcu(ctx, &agt->app_ctx_list, list_node) + { + (void) disable_context(ctx, agt->domain); + cds_list_del(&ctx->list_node); + call_rcu(&ctx->rcu_node, destroy_app_ctx_rcu); + } } - cds_list_for_each_entry_rcu(ctx, &agt->app_ctx_list, list_node) - { - (void) disable_context(ctx, agt->domain); - cds_list_del(&ctx->list_node); - call_rcu(&ctx->rcu_node, destroy_app_ctx_rcu); - } - rcu_read_unlock(); lttng_ht_destroy(agt->events); free(agt); } @@ -1444,7 +1459,7 @@ void agent_destroy(struct agent *agt) /* * Allocate agent_apps_ht_by_sock. */ -int agent_app_ht_alloc(void) +int agent_app_ht_alloc() { the_agent_apps_ht_by_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); return the_agent_apps_ht_by_sock ? 0 : -1; @@ -1464,7 +1479,7 @@ void agent_destroy_app_by_sock(int sock) * happen. The hash table deletion is ONLY done through this call when the * main sessiond thread is torn down. */ - rcu_read_lock(); + lttng::urcu::read_lock_guard read_lock; app = agent_find_app_by_sock(sock); LTTNG_ASSERT(app); @@ -1473,13 +1488,12 @@ void agent_destroy_app_by_sock(int sock) /* The application is freed in a RCU call but the socket is closed here. */ agent_destroy_app(app); - rcu_read_unlock(); } /* * Clean-up the agent app hash table and destroy it. */ -void agent_app_ht_clean(void) +void agent_app_ht_clean() { struct lttng_ht_node_ulong *node; struct lttng_ht_iter iter; @@ -1487,14 +1501,17 @@ void agent_app_ht_clean(void) if (!the_agent_apps_ht_by_sock) { return; } - rcu_read_lock(); - cds_lfht_for_each_entry (the_agent_apps_ht_by_sock->ht, &iter.iter, node, node) { - struct agent_app *app; - app = lttng::utils::container_of(node, &agent_app::node); - agent_destroy_app_by_sock(app->sock->fd); + { + lttng::urcu::read_lock_guard read_lock; + + cds_lfht_for_each_entry (the_agent_apps_ht_by_sock->ht, &iter.iter, node, node) { + struct agent_app *app; + + app = lttng::utils::container_of(node, &agent_app::node); + agent_destroy_app_by_sock(app->sock->fd); + } } - rcu_read_unlock(); lttng_ht_destroy(the_agent_apps_ht_by_sock); } @@ -1517,50 +1534,50 @@ void agent_update(const struct agent *agt, const struct agent_app *app) DBG("Agent updating app: pid = %ld", (long) app->pid); - rcu_read_lock(); /* * We are in the registration path thus if the application is gone, * there is a serious code flow error. */ + { + lttng::urcu::read_lock_guard read_lock; - cds_lfht_for_each_entry (agt->events->ht, &iter.iter, event, node.node) { - /* Skip event if disabled. */ - if (!AGENT_EVENT_IS_ENABLED(event)) { - continue; - } + cds_lfht_for_each_entry (agt->events->ht, &iter.iter, event, node.node) { + /* Skip event if disabled. */ + if (!AGENT_EVENT_IS_ENABLED(event)) { + continue; + } - ret = enable_event(app, event); - if (ret != LTTNG_OK) { - DBG2("Agent update unable to enable event %s on app pid: %d sock %d", - event->name, - app->pid, - app->sock->fd); - /* Let's try the others here and don't assume the app is dead. */ - continue; + ret = enable_event(app, event); + if (ret != LTTNG_OK) { + DBG2("Agent update unable to enable event %s on app pid: %d sock %d", + event->name, + app->pid, + app->sock->fd); + /* Let's try the others here and don't assume the app is dead. */ + continue; + } } - } - cds_list_for_each_entry_rcu(ctx, &agt->app_ctx_list, list_node) - { - ret = app_context_op(app, ctx, AGENT_CMD_APP_CTX_ENABLE); - if (ret != LTTNG_OK) { - DBG2("Agent update unable to add application context %s:%s on app pid: %d sock %d", - ctx->provider_name, - ctx->ctx_name, - app->pid, - app->sock->fd); - continue; + cds_list_for_each_entry_rcu(ctx, &agt->app_ctx_list, list_node) + { + ret = app_context_op(app, ctx, AGENT_CMD_APP_CTX_ENABLE); + if (ret != LTTNG_OK) { + DBG2("Agent update unable to add application context %s:%s on app pid: %d sock %d", + ctx->provider_name, + ctx->ctx_name, + app->pid, + app->sock->fd); + continue; + } } } - - rcu_read_unlock(); } /* * Allocate the per-event notifier domain agent hash table. It is lazily * populated as domains are used. */ -int agent_by_event_notifier_domain_ht_create(void) +int agent_by_event_notifier_domain_ht_create() { the_trigger_agents_ht_by_domain = lttng_ht_new(0, LTTNG_HT_TYPE_U64); return the_trigger_agents_ht_by_domain ? 0 : -1; @@ -1569,7 +1586,7 @@ int agent_by_event_notifier_domain_ht_create(void) /* * Clean-up the per-event notifier domain agent hash table and destroy it. */ -void agent_by_event_notifier_domain_ht_destroy(void) +void agent_by_event_notifier_domain_ht_destroy() { struct lttng_ht_node_u64 *node; struct lttng_ht_iter iter; @@ -1578,22 +1595,25 @@ void agent_by_event_notifier_domain_ht_destroy(void) return; } - rcu_read_lock(); - cds_lfht_for_each_entry (the_trigger_agents_ht_by_domain->ht, &iter.iter, node, node) { - struct agent *agent = lttng::utils::container_of(node, &agent::node); - const int ret = lttng_ht_del(the_trigger_agents_ht_by_domain, &iter); + { + lttng::urcu::read_lock_guard read_lock; + + cds_lfht_for_each_entry ( + the_trigger_agents_ht_by_domain->ht, &iter.iter, node, node) { + struct agent *agent = lttng::utils::container_of(node, &agent::node); + const int ret = lttng_ht_del(the_trigger_agents_ht_by_domain, &iter); - LTTNG_ASSERT(ret == 0); - agent_destroy(agent); + LTTNG_ASSERT(ret == 0); + agent_destroy(agent); + } } - rcu_read_unlock(); lttng_ht_destroy(the_trigger_agents_ht_by_domain); } struct agent *agent_find_by_event_notifier_domain(enum lttng_domain_type domain_type) { - struct agent *agt = NULL; + struct agent *agt = nullptr; struct lttng_ht_node_u64 *node; struct lttng_ht_iter iter; const uint64_t key = (uint64_t) domain_type;