X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.cpp;h=6f423c9c6485d459afb5e452d5c0be476dd862a2;hb=b0f2e8db59fcadc8f4b06a94175792be3c431004;hp=0f303bf035a5db4e80c3bf8953aedc08174d31e8;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/trace-ust.cpp b/src/bin/lttng-sessiond/trace-ust.cpp index 0f303bf03..6f423c9c6 100644 --- a/src/bin/lttng-sessiond/trace-ust.cpp +++ b/src/bin/lttng-sessiond/trace-ust.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 David Goulet + * Copyright (C) 2011 EfficiOS Inc. * Copyright (C) 2016 Jérémie Galarneau * * SPDX-License-Identifier: GPL-2.0-only @@ -13,16 +13,18 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "buffer-registry.h" -#include "trace-ust.h" -#include "utils.h" -#include "ust-app.h" -#include "agent.h" +#include "buffer-registry.hpp" +#include "trace-ust.hpp" +#include "utils.hpp" +#include "ust-app.hpp" +#include "agent.hpp" + +namespace lsu = lttng::sessiond::ust; /* * Match function for the events hash table lookup. @@ -167,6 +169,7 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht, struct lttng_ht_node_str *node; struct lttng_ht_iter iter; + ASSERT_RCU_READ_LOCKED(); /* * If we receive an empty string for channel name, it means the * default channel name is requested. @@ -204,6 +207,7 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, LTTNG_ASSERT(name); LTTNG_ASSERT(ht); + ASSERT_RCU_READ_LOCKED(); key.name = name; key.filter = filter; @@ -269,7 +273,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id) struct ltt_ust_session *lus; /* Allocate a new ltt ust session */ - lus = (ltt_ust_session *) zmalloc(sizeof(struct ltt_ust_session)); + lus = zmalloc(); if (lus == NULL) { PERROR("create ust session zmalloc"); goto error_alloc; @@ -329,8 +333,8 @@ error: process_attr_tracker_destroy(lus->tracker_vpid); process_attr_tracker_destroy(lus->tracker_vuid); process_attr_tracker_destroy(lus->tracker_vgid); - ht_cleanup_push(lus->domain_global.channels); - ht_cleanup_push(lus->agents); + lttng_ht_destroy(lus->domain_global.channels); + lttng_ht_destroy(lus->agents); free(lus); error_alloc: return NULL; @@ -348,7 +352,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan, LTTNG_ASSERT(chan); - luc = (ltt_ust_channel *) zmalloc(sizeof(struct ltt_ust_channel)); + luc = zmalloc(); if (luc == NULL) { PERROR("ltt_ust_channel zmalloc"); goto error; @@ -461,7 +465,7 @@ enum lttng_error_code trace_ust_create_event(struct lttng_event *ev, goto error; } - local_ust_event = (ltt_ust_event *) zmalloc(sizeof(struct ltt_ust_event)); + local_ust_event = zmalloc(); if (local_ust_event == NULL) { PERROR("ust event zmalloc"); ret = LTTNG_ERR_NOMEM; @@ -685,7 +689,7 @@ struct ltt_ust_context *trace_ust_create_context( goto end; } - uctx = (ltt_ust_context *) zmalloc(sizeof(struct ltt_ust_context)); + uctx = zmalloc(); if (!uctx) { PERROR("zmalloc ltt_ust_context"); goto end; @@ -774,7 +778,7 @@ static void fini_id_tracker(struct ust_id_tracker *id_tracker) destroy_id_tracker_node(tracker_node); } rcu_read_unlock(); - ht_cleanup_push(id_tracker->ht); + lttng_ht_destroy(id_tracker->ht); id_tracker->ht = NULL; } @@ -811,7 +815,7 @@ static int id_tracker_add_id(struct ust_id_tracker *id_tracker, int id) retval = LTTNG_ERR_PROCESS_ATTR_EXISTS; goto end; } - tracker_node = (ust_id_tracker_node *) zmalloc(sizeof(*tracker_node)); + tracker_node = zmalloc(); if (!tracker_node) { retval = LTTNG_ERR_NOMEM; goto end; @@ -1231,7 +1235,7 @@ static void destroy_contexts(struct lttng_ht *ht) } rcu_read_unlock(); - ht_cleanup_push(ht); + lttng_ht_destroy(ht); } /* @@ -1294,7 +1298,7 @@ static void destroy_events(struct lttng_ht *events) } rcu_read_unlock(); - ht_cleanup_push(events); + lttng_ht_destroy(events); } /* @@ -1351,6 +1355,33 @@ void trace_ust_delete_channel(struct lttng_ht *ht, LTTNG_ASSERT(!ret); } +int trace_ust_regenerate_metadata(struct ltt_ust_session *usess) +{ + int ret = 0; + struct buffer_reg_uid *uid_reg = NULL; + struct buffer_reg_session *session_reg = NULL; + + rcu_read_lock(); + cds_list_for_each_entry(uid_reg, &usess->buffer_reg_uid_list, lnode) { + lsu::registry_session *registry; + + session_reg = uid_reg->registry; + registry = session_reg->reg.ust; + + try { + registry->regenerate_metadata(); + } catch (const std::exception& ex) { + ERR("Failed to regenerate user space session metadata: %s", ex.what()); + ret = -1; + goto end; + } + } + +end: + rcu_read_unlock(); + return ret; +} + /* * Iterate over a hash table containing channels and cleanup safely. */ @@ -1371,7 +1402,7 @@ static void destroy_channels(struct lttng_ht *channels) } rcu_read_unlock(); - ht_cleanup_push(channels); + lttng_ht_destroy(channels); } /* @@ -1387,8 +1418,6 @@ static void destroy_domain_global(struct ltt_ust_domain_global *dom) /* * Cleanup ust session structure, keeping data required by * destroy notifier. - * - * Should *NOT* be called with RCU read-side lock held. */ void trace_ust_destroy_session(struct ltt_ust_session *session) { @@ -1412,7 +1441,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session) } rcu_read_unlock(); - ht_cleanup_push(session->agents); + lttng_ht_destroy(session->agents); /* Cleanup UID buffer registry object(s). */ cds_list_for_each_entry_safe(reg, sreg, &session->buffer_reg_uid_list,