*/
#define _LGPL_SOURCE
-#include <urcu/uatomic.h>
-#include <urcu/rculist.h>
+#include "agent.hpp"
+#include "common/error.hpp"
+#include "ust-app.hpp"
+#include "utils.hpp"
+#include <common/common.hpp>
+#include <common/compat/endian.hpp>
+#include <common/sessiond-comm/agent.hpp>
+#include <common/urcu.hpp>
+
+#include <lttng/condition/condition.h>
+#include <lttng/condition/event-rule-matches.h>
+#include <lttng/domain-internal.hpp>
+#include <lttng/event-rule/event-rule-internal.hpp>
#include <lttng/event-rule/event-rule.h>
-#include <lttng/event-rule/event-rule-internal.h>
#include <lttng/event-rule/jul-logging.h>
#include <lttng/event-rule/log4j-logging.h>
#include <lttng/event-rule/python-logging.h>
-#include <lttng/condition/condition.h>
-#include <lttng/condition/event-rule-matches.h>
-#include <lttng/domain-internal.h>
-#include <lttng/log-level-rule-internal.h>
-
-#include <common/common.h>
-#include <common/sessiond-comm/agent.h>
+#include <lttng/log-level-rule-internal.hpp>
-#include <common/compat/endian.h>
-
-#include "agent.h"
-#include "ust-app.h"
-#include "utils.h"
-#include "common/error.h"
+#include <urcu/rculist.h>
+#include <urcu/uatomic.h>
-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.
*/
+namespace {
struct agent_app_ctx {
char *provider_name;
char *ctx_name;
/* For call_rcu teardown. */
struct rcu_head rcu_node;
};
+} /* namespace */
/*
* Human readable agent return code.
*/
-static
-const char *lttcomm_agent_ret_code_str(lttcomm_agent_ret_code code)
+static const char *lttcomm_agent_ret_code_str(lttcomm_agent_ret_code code)
{
switch (code) {
case AGENT_RET_CODE_SUCCESS:
}
};
-static
-void log_reply_code(uint32_t in_reply_ret_code)
+static void log_reply_code(uint32_t in_reply_ret_code)
{
int level = PRINT_DBG3;
/*
*/
uint32_t reply_ret_code = in_reply_ret_code;
- if (reply_ret_code < AGENT_RET_CODE_SUCCESS ||
- reply_ret_code >= AGENT_RET_CODE_NR) {
+ if (reply_ret_code < AGENT_RET_CODE_SUCCESS || reply_ret_code >= AGENT_RET_CODE_NR) {
reply_ret_code = AGENT_RET_CODE_NR;
level = PRINT_ERR;
}
- LOG(level, "Agent replied with retcode: %s (%" PRIu32 ")",
- lttcomm_agent_ret_code_str((lttcomm_agent_ret_code) reply_ret_code),
- in_reply_ret_code);
+ LOG(level,
+ "Agent replied with retcode: %s (%" PRIu32 ")",
+ lttcomm_agent_ret_code_str((lttcomm_agent_ret_code) reply_ret_code),
+ in_reply_ret_code);
}
/*
* Match function for the events hash table lookup by name.
*/
-static int ht_match_event_by_name(struct cds_lfht_node *node,
- const void *_key)
+static int ht_match_event_by_name(struct cds_lfht_node *node, const void *_key)
{
struct agent_event *event;
const struct agent_ht_key *key;
* Match function for the events hash table lookup by name, log level and
* filter expression.
*/
-static int ht_match_event(struct cds_lfht_node *node,
- const void *_key)
+static int ht_match_event(struct cds_lfht_node *node, const void *_key)
{
struct agent_event *event;
const struct agent_ht_key *key;
/* Event loglevel value and type. */
ll_match = loglevels_match(event->loglevel_type,
- event->loglevel_value, key->loglevel_type,
- key->loglevel_value, LTTNG_EVENT_LOGLEVEL_ALL);
+ event->loglevel_value,
+ key->loglevel_type,
+ key->loglevel_value,
+ LTTNG_EVENT_LOGLEVEL_ALL);
if (!ll_match) {
goto no_match;
}
if (event->filter_expression) {
- if (strncmp(event->filter_expression, key->filter_expression,
- strlen(event->filter_expression)) != 0) {
+ if (strncmp(event->filter_expression,
+ key->filter_expression,
+ strlen(event->filter_expression)) != 0) {
goto no_match;
}
}
/*
* Add unique agent event based on the event name and loglevel.
*/
-static void add_unique_agent_event(struct lttng_ht *ht,
- struct agent_event *event)
+static void add_unique_agent_event(struct lttng_ht *ht, struct agent_event *event)
{
struct cds_lfht_node *node_ptr;
struct agent_ht_key key;
key.filter_expression = event->filter_expression;
node_ptr = cds_lfht_add_unique(ht->ht,
- ht->hash_fct(event->node.key, lttng_ht_seed),
- ht_match_event, &key, &event->node.node);
+ ht->hash_fct(event->node.key, lttng_ht_seed),
+ ht_match_event,
+ &key,
+ &event->node.node);
LTTNG_ASSERT(node_ptr == &event->node.node);
}
*/
static void destroy_event_agent_rcu(struct rcu_head *head)
{
- struct lttng_ht_node_str *node =
- caa_container_of(head, struct lttng_ht_node_str, head);
- struct agent_event *event =
- caa_container_of(node, struct agent_event, node);
+ struct lttng_ht_node_str *node = lttng::utils::container_of(head, <tng_ht_node_str::head);
+ struct agent_event *event = lttng::utils::container_of(node, &agent_event::node);
agent_destroy_event(event);
}
static void destroy_app_agent_rcu(struct rcu_head *head)
{
struct lttng_ht_node_ulong *node =
- caa_container_of(head, struct lttng_ht_node_ulong, head);
- struct agent_app *app =
- caa_container_of(node, struct agent_app, node);
+ lttng::utils::container_of(head, <tng_ht_node_ulong::head);
+ struct agent_app *app = lttng::utils::container_of(node, &agent_app::node);
free(app);
}
*
* Return 0 on success or else a negative errno message of sendmsg() op.
*/
-static int send_header(struct lttcomm_sock *sock, uint64_t data_size,
- uint32_t cmd, uint32_t cmd_version)
+static int
+send_header(struct lttcomm_sock *sock, uint64_t data_size, uint32_t cmd, uint32_t cmd_version)
{
int ret;
ssize_t size;
*
* Return 0 on success or else a negative errno value of sendmsg() op.
*/
-static int send_payload(struct lttcomm_sock *sock, const void *data,
- size_t size)
+static int send_payload(struct lttcomm_sock *sock, const void *data, size_t size)
{
int ret;
ssize_t len;
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);
LTTNG_ASSERT(app->sock);
LTTNG_ASSERT(events);
- DBG2("Agent listing events for app pid: %d and socket %d", app->pid,
- app->sock->fd);
+ DBG2("Agent listing events for app pid: %d and socket %d", app->pid, app->sock->fd);
ret = send_header(app->sock, 0, AGENT_CMD_LIST, 0);
if (ret < 0) {
goto error;
}
- reply = (lttcomm_agent_list_reply *) zmalloc(data_size);
+ reply = zmalloc<lttcomm_agent_list_reply>(data_size);
if (!reply) {
ret = LTTNG_ERR_NOMEM;
goto error;
}
nb_event = be32toh(reply->nb_event);
- tmp_events = (lttng_event *) zmalloc(sizeof(*tmp_events) * nb_event);
+ tmp_events = calloc<lttng_event>(nb_event);
if (!tmp_events) {
ret = LTTNG_ERR_NOMEM;
goto error;
for (i = 0; i < nb_event; i++) {
offset += len;
- if (lttng_strncpy(tmp_events[i].name, reply->payload + offset,
- sizeof(tmp_events[i].name))) {
+ if (lttng_strncpy(tmp_events[i].name,
+ reply->payload + offset,
+ sizeof(tmp_events[i].name))) {
ret = LTTNG_ERR_INVALID;
goto error;
}
free(reply);
free(tmp_events);
return -ret;
-
}
/*
LTTNG_ASSERT(app->sock);
LTTNG_ASSERT(event);
- DBG2("Agent enabling event %s for app pid: %d and socket %d", event->name,
- app->pid, app->sock->fd);
+ DBG2("Agent enabling event %s for app pid: %d and socket %d",
+ event->name,
+ app->pid,
+ app->sock->fd);
/*
* Calculate the payload's size, which is the fixed-size struct followed
goto error_io;
}
- bytes_to_send = (char *) zmalloc(data_size);
+ bytes_to_send = calloc<char>(data_size);
if (!bytes_to_send) {
ret = LTTNG_ERR_NOMEM;
goto error;
memcpy(bytes_to_send, &msg, sizeof(msg));
if (filter_expression_length > 0) {
- memcpy(bytes_to_send + sizeof(msg), event->filter_expression,
- filter_expression_length);
+ memcpy(bytes_to_send + sizeof(msg),
+ event->filter_expression,
+ filter_expression_length);
}
ret = send_payload(app->sock, bytes_to_send, data_size);
/*
* Send Pascal-style string. Size is sent as a 32-bit big endian integer.
*/
-static
-int send_pstring(struct lttcomm_sock *sock, const char *str, uint32_t len)
+static int send_pstring(struct lttcomm_sock *sock, const char *str, uint32_t len)
{
int ret;
uint32_t len_be;
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
static int app_context_op(const struct agent_app *app,
- const struct agent_app_ctx *ctx, enum lttcomm_agent_command cmd)
+ const struct agent_app_ctx *ctx,
+ enum lttcomm_agent_command cmd)
{
int ret;
uint32_t reply_ret_code;
LTTNG_ASSERT(app);
LTTNG_ASSERT(app->sock);
LTTNG_ASSERT(ctx);
- LTTNG_ASSERT(cmd == AGENT_CMD_APP_CTX_ENABLE ||
- cmd == AGENT_CMD_APP_CTX_DISABLE);
+ LTTNG_ASSERT(cmd == AGENT_CMD_APP_CTX_ENABLE || cmd == AGENT_CMD_APP_CTX_DISABLE);
DBG2("Agent %s application %s:%s for app pid: %d and socket %d",
- cmd == AGENT_CMD_APP_CTX_ENABLE ? "enabling" : "disabling",
- ctx->provider_name, ctx->ctx_name,
- app->pid, app->sock->fd);
+ cmd == AGENT_CMD_APP_CTX_ENABLE ? "enabling" : "disabling",
+ ctx->provider_name,
+ ctx->ctx_name,
+ app->pid,
+ app->sock->fd);
/*
* Calculate the payload's size, which consists of the size (u32, BE)
*/
app_ctx_provider_name_len = strlen(ctx->provider_name) + 1;
app_ctx_name_len = strlen(ctx->ctx_name) + 1;
- data_size = sizeof(uint32_t) + app_ctx_provider_name_len +
- sizeof(uint32_t) + app_ctx_name_len;
+ data_size =
+ sizeof(uint32_t) + app_ctx_provider_name_len + sizeof(uint32_t) + app_ctx_name_len;
ret = send_header(app->sock, data_size, cmd, 0);
if (ret < 0) {
goto error_io;
}
- if (app_ctx_provider_name_len > UINT32_MAX ||
- app_ctx_name_len > UINT32_MAX) {
+ if (app_ctx_provider_name_len > UINT32_MAX || app_ctx_name_len > UINT32_MAX) {
ERR("Application context name > MAX_UINT32");
ret = LTTNG_ERR_INVALID;
goto error;
}
- ret = send_pstring(app->sock, ctx->provider_name,
- (uint32_t) app_ctx_provider_name_len);
+ ret = send_pstring(app->sock, ctx->provider_name, (uint32_t) app_ctx_provider_name_len);
if (ret < 0) {
goto error_io;
}
- ret = send_pstring(app->sock, ctx->ctx_name,
- (uint32_t) app_ctx_name_len);
+ ret = send_pstring(app->sock, ctx->ctx_name, (uint32_t) app_ctx_name_len);
if (ret < 0) {
goto error_io;
}
LTTNG_ASSERT(app->sock);
LTTNG_ASSERT(event);
- DBG2("Agent disabling event %s for app pid: %d and socket %d", event->name,
- app->pid, app->sock->fd);
+ DBG2("Agent disabling event %s for app pid: %d and socket %d",
+ event->name,
+ app->pid,
+ app->sock->fd);
data_size = sizeof(msg);
memset(&msg, 0, sizeof(msg));
*
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
-int agent_enable_event(struct agent_event *event,
- enum lttng_domain_type domain)
+int agent_enable_event(struct agent_event *event, enum lttng_domain_type domain)
{
int ret;
struct agent_app *app;
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;
+ }
}
}
ret = LTTNG_OK;
error:
- rcu_read_unlock();
return ret;
}
-static
-void destroy_app_ctx(struct agent_app_ctx *ctx)
+static void destroy_app_ctx(struct agent_app_ctx *ctx)
{
free(ctx->provider_name);
free(ctx->ctx_name);
free(ctx);
}
-static
-struct agent_app_ctx *create_app_ctx(const struct lttng_event_context *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;
}
LTTNG_ASSERT(ctx->ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT);
- agent_ctx = (agent_app_ctx *) zmalloc(sizeof(*ctx));
+ agent_ctx = zmalloc<agent_app_ctx>();
if (!agent_ctx) {
goto end;
}
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;
*
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
-int agent_enable_context(const struct lttng_event_context *ctx,
- enum lttng_domain_type domain)
+int agent_enable_context(const struct lttng_event_context *ctx, enum lttng_domain_type domain)
{
int ret;
struct agent_app *app;
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;
}
*
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
-int agent_disable_event(struct agent_event *event,
- enum lttng_domain_type domain)
+int agent_disable_event(struct agent_event *event, enum lttng_domain_type domain)
{
int ret = LTTNG_OK;
struct agent_app *app;
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;
+ }
}
}
LTTNG_ASSERT(!AGENT_EVENT_IS_ENABLED(event));
error:
- rcu_read_unlock();
end:
return ret;
}
*
* Return LTTNG_OK on success or else a LTTNG_ERR* code.
*/
-static int disable_context(struct agent_app_ctx *ctx,
- enum lttng_domain_type domain)
+static int disable_context(struct agent_app_ctx *ctx, enum lttng_domain_type domain)
{
int ret = LTTNG_OK;
struct agent_app *app;
struct lttng_ht_iter iter;
LTTNG_ASSERT(ctx);
+ DBG2("Disabling agent application context %s:%s", ctx->provider_name, ctx->ctx_name);
- 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;
- }
+ {
+ lttng::urcu::read_lock_guard read_lock;
- ret = app_context_op(app, ctx, AGENT_CMD_APP_CTX_DISABLE);
- if (ret != LTTNG_OK) {
- goto end;
+ 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;
}
*
* Return the number of events or else a negative value.
*/
-int agent_list_events(struct lttng_event **events,
- enum lttng_domain_type domain)
+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);
DBG2("Agent listing events for domain %d", domain);
nbmem = UST_APP_EVENT_LIST_SIZE;
- tmp_events = (lttng_event *) zmalloc(nbmem * sizeof(*tmp_events));
+ tmp_events = calloc<lttng_event>(nbmem);
if (!tmp_events) {
PERROR("zmalloc agent list events");
ret = -ENOMEM;
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;
}
- /* 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;
+
+ 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;
+ }
+ 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;
*
* Return newly allocated object or else NULL on error.
*/
-struct agent_app *agent_create_app(pid_t pid, enum lttng_domain_type domain,
- struct lttcomm_sock *sock)
+struct agent_app *
+agent_create_app(pid_t pid, enum lttng_domain_type domain, struct lttcomm_sock *sock)
{
struct agent_app *app;
LTTNG_ASSERT(sock);
- app = (agent_app *) zmalloc(sizeof(*app));
+ app = zmalloc<agent_app>();
if (!app) {
PERROR("Failed to allocate agent application instance");
goto error;
struct agent_app *app;
LTTNG_ASSERT(sock >= 0);
+ ASSERT_RCU_READ_LOCKED();
- lttng_ht_lookup(the_agent_apps_ht_by_sock,
- (void *) ((unsigned long) sock), &iter);
+ 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 = caa_container_of(node, struct agent_app, node);
+ app = lttng::utils::container_of(node, &agent_app::node);
DBG3("Agent app pid %d found by sock %d.", app->pid, sock);
return app;
error:
DBG3("Agent app NOT found by sock %d.", sock);
- return NULL;
+ return nullptr;
}
/*
struct lttng_ht_iter iter;
LTTNG_ASSERT(app);
+ ASSERT_RCU_READ_LOCKED();
DBG3("Agent deleting app pid: %d and sock: %d", app->pid, app->sock->fd);
int ret;
struct agent *agt;
- agt = (agent *) zmalloc(sizeof(struct agent));
+ agt = zmalloc<agent>();
if (!agt) {
goto error;
}
ret = agent_init(agt);
if (ret < 0) {
free(agt);
- agt = NULL;
+ agt = nullptr;
goto error;
}
* Return a new object else NULL on error.
*/
struct agent_event *agent_create_event(const char *name,
- enum lttng_loglevel_type loglevel_type, int loglevel_value,
- struct lttng_bytecode *filter, char *filter_expression)
+ enum lttng_loglevel_type loglevel_type,
+ int loglevel_value,
+ 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",
- name, loglevel_type, loglevel_value,
- filter_expression ? filter_expression : "NULL");
+ name,
+ loglevel_type,
+ loglevel_value,
+ filter_expression ? filter_expression : "NULL");
if (!name) {
ERR("Failed to create agent event; no name provided.");
goto error;
}
- event = (agent_event *) zmalloc(sizeof(*event));
+ event = zmalloc<agent_event>();
if (!event) {
goto error;
}
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);
goto end;
}
- DBG3("Agent adding context %s:%s", ctx->u.app_ctx.provider_name,
- ctx->u.app_ctx.ctx_name);
+ DBG3("Agent adding context %s:%s", ctx->u.app_ctx.provider_name, ctx->u.app_ctx.ctx_name);
cds_list_add_tail_rcu(&agent_ctx->list_node, &agt->app_ctx_list);
end:
return ret;
*
* Sets the given iterator.
*/
-void agent_find_events_by_name(const char *name, struct agent *agt,
- struct lttng_ht_iter* iter)
+void agent_find_events_by_name(const char *name, struct agent *agt, struct lttng_ht_iter *iter)
{
struct lttng_ht *ht;
struct agent_ht_key key;
LTTNG_ASSERT(agt);
LTTNG_ASSERT(agt->events);
LTTNG_ASSERT(iter);
+ ASSERT_RCU_READ_LOCKED();
ht = agt->events;
key.name = name;
- cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
- ht_match_event_by_name, &key, &iter->iter);
+ cds_lfht_lookup(ht->ht,
+ ht->hash_fct((void *) name, lttng_ht_seed),
+ ht_match_event_by_name,
+ &key,
+ &iter->iter);
}
/*
*
* Return object if found else NULL.
*/
-struct agent_event *agent_find_event_by_trigger(
- const struct lttng_trigger *trigger, struct agent *agt)
+struct agent_event *agent_find_event_by_trigger(const struct lttng_trigger *trigger,
+ struct agent *agt)
{
enum lttng_condition_status c_status;
enum lttng_event_rule_status er_status;
LTTNG_ASSERT(agt);
LTTNG_ASSERT(agt->events);
+ ASSERT_RCU_READ_LOCKED();
condition = lttng_trigger_get_const_condition(trigger);
LTTNG_ASSERT(lttng_condition_get_type(condition) ==
- LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
+ LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
- c_status = lttng_condition_event_rule_matches_get_rule(
- condition, &rule);
+ c_status = lttng_condition_event_rule_matches_get_rule(condition, &rule);
LTTNG_ASSERT(c_status == LTTNG_CONDITION_STATUS_OK);
switch (lttng_event_rule_get_type(rule)) {
case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
- logging_get_name_pattern =
- lttng_event_rule_jul_logging_get_name_pattern;
- logging_get_log_level_rule =
- lttng_event_rule_jul_logging_get_log_level_rule;
+ logging_get_name_pattern = lttng_event_rule_jul_logging_get_name_pattern;
+ logging_get_log_level_rule = lttng_event_rule_jul_logging_get_log_level_rule;
break;
case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
- logging_get_name_pattern =
- lttng_event_rule_log4j_logging_get_name_pattern;
- logging_get_log_level_rule =
- lttng_event_rule_log4j_logging_get_log_level_rule;
+ logging_get_name_pattern = lttng_event_rule_log4j_logging_get_name_pattern;
+ logging_get_log_level_rule = lttng_event_rule_log4j_logging_get_log_level_rule;
break;
case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
- logging_get_name_pattern =
- lttng_event_rule_python_logging_get_name_pattern;
- logging_get_log_level_rule =
- lttng_event_rule_python_logging_get_log_level_rule;
+ logging_get_name_pattern = lttng_event_rule_python_logging_get_name_pattern;
+ logging_get_log_level_rule = lttng_event_rule_python_logging_get_log_level_rule;
break;
default:
abort();
domain = lttng_event_rule_get_domain_type(rule);
LTTNG_ASSERT(domain == LTTNG_DOMAIN_JUL || domain == LTTNG_DOMAIN_LOG4J ||
- domain == LTTNG_DOMAIN_PYTHON);
+ domain == LTTNG_DOMAIN_PYTHON);
/* Get the event's pattern name ('name' in the legacy terminology). */
er_status = logging_get_name_pattern(rule, &name);
abort();
}
- return agent_find_event(name, loglevel_type, loglevel_value,
- filter_expression, agt);
+ return agent_find_event(name, loglevel_type, loglevel_value, filter_expression, agt);
}
/*
* The RCU read lock must be held during the iteration and for as long
* as the object the iterator points to remains in use.
*/
-void agent_event_next_duplicate(const char *name,
- struct agent *agt, struct lttng_ht_iter* iter)
+void agent_event_next_duplicate(const char *name, struct agent *agt, struct lttng_ht_iter *iter)
{
struct agent_ht_key key;
+ ASSERT_RCU_READ_LOCKED();
+
key.name = name;
- cds_lfht_next_duplicate(agt->events->ht, ht_match_event_by_name,
- &key, &iter->iter);
+ cds_lfht_next_duplicate(agt->events->ht, ht_match_event_by_name, &key, &iter->iter);
}
/*
* Return object if found else NULL.
*/
struct agent_event *agent_find_event(const char *name,
- enum lttng_loglevel_type loglevel_type,
- int loglevel_value,
- const char *filter_expression,
- struct agent *agt)
+ enum lttng_loglevel_type loglevel_type,
+ int loglevel_value,
+ const char *filter_expression,
+ struct agent *agt)
{
struct lttng_ht_node_str *node;
struct lttng_ht_iter iter;
LTTNG_ASSERT(name);
LTTNG_ASSERT(agt);
LTTNG_ASSERT(agt->events);
+ ASSERT_RCU_READ_LOCKED();
ht = agt->events;
key.name = name;
key.loglevel_type = loglevel_type;
key.filter_expression = filter_expression;
- cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
- ht_match_event, &key, &iter.iter);
+ cds_lfht_lookup(ht->ht,
+ ht->hash_fct((void *) name, lttng_ht_seed),
+ ht_match_event,
+ &key,
+ &iter.iter);
node = lttng_ht_iter_get_node_str(&iter);
- if (node == NULL) {
+ if (node == nullptr) {
goto error;
}
DBG3("Agent event found %s.", name);
- return caa_container_of(node, struct agent_event, node);
+ return lttng::utils::container_of(node, &agent_event::node);
error:
DBG3("Agent event NOT found %s.", name);
- return NULL;
+ return nullptr;
}
/*
free(event);
}
-static
-void destroy_app_ctx_rcu(struct rcu_head *head)
+static void destroy_app_ctx_rcu(struct rcu_head *head)
{
- struct agent_app_ctx *ctx =
- caa_container_of(head, struct agent_app_ctx, rcu_node);
+ struct agent_app_ctx *ctx = lttng::utils::container_of(head, &agent_app_ctx::rcu_node);
destroy_app_ctx(ctx);
}
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 = caa_container_of(node, struct 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);
}
/*
* 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;
* 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);
/* 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;
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 = caa_container_of(node, struct 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);
}
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;
/*
* 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;
return;
}
- rcu_read_lock();
- cds_lfht_for_each_entry(the_trigger_agents_ht_by_domain->ht,
- &iter.iter, node, node) {
- struct agent *agent =
- caa_container_of(node, struct 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 *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;
LTTNG_ASSERT(the_trigger_agents_ht_by_domain);
DBG3("Per-event notifier domain agent lookup for domain '%s'",
- lttng_domain_type_str(domain_type));
+ lttng_domain_type_str(domain_type));
lttng_ht_lookup(the_trigger_agents_ht_by_domain, &key, &iter);
node = lttng_ht_iter_get_node_u64(&iter);
goto end;
}
- agt = caa_container_of(node, struct agent, node);
+ agt = lttng::utils::container_of(node, &agent::node);
end:
return agt;
projects / lttng-tools.git / blobdiff