*/
#define _LGPL_SOURCE
-#include <limits.h>
+#include <dirent.h>
#include <inttypes.h>
+#include <limits.h>
+#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include <urcu.h>
-#include <dirent.h>
#include <sys/types.h>
-#include <pthread.h>
+#include <urcu.h>
#include <common/common.hpp>
-#include <common/utils.hpp>
-#include <common/trace-chunk.hpp>
#include <common/sessiond-comm/sessiond-comm.hpp>
-#include <lttng/location-internal.hpp>
+#include <common/trace-chunk.hpp>
+#include <common/urcu.hpp>
+#include <common/utils.hpp>
+
#include "lttng-sessiond.hpp"
-#include "kernel.hpp"
+#include <lttng/location-internal.hpp>
+#include "cmd.hpp"
+#include "kernel.hpp"
#include "session.hpp"
-#include "utils.hpp"
-#include "trace-ust.hpp"
#include "timer.hpp"
-#include "cmd.hpp"
+#include "trace-ust.hpp"
+#include "utils.hpp"
namespace {
struct ltt_session_destroy_notifier_element {
void *user_data;
};
+namespace ls = lttng::sessiond;
+
/*
* NOTES:
*
cds_lfht_first(session->kernel_session->consumer->socks->ht, &iter.iter);
node = cds_lfht_iter_get_node(&iter.iter);
- socket = container_of(node, typeof(*socket), node.node);
+ socket = caa_container_of(node, typeof(*socket), node.node);
cds_list_for_each_entry(chan,
&session->kernel_session->channel_list.head, list) {
int ret;
struct ltt_ust_session *usess;
struct ltt_kernel_session *ksess;
- struct ltt_session *session = container_of(ref, typeof(*session), ref);
+ struct ltt_session *session = lttng::utils::container_of(ref, <t_session::ref);
const bool session_published = session->published;
LTTNG_ASSERT(!session->chunk_being_archived);
lttng_dynamic_array_reset(&session->clear_notifiers);
free(session->last_archived_chunk_name);
free(session->base_path);
+ lttng_trigger_put(session->rotate_trigger);
free(session);
if (session_published) {
/*
if (node == NULL) {
goto end;
}
- ls = caa_container_of(node, struct ltt_session, node);
+ ls = lttng::utils::container_of(node, <t_session::node);
DBG3("Session %" PRIu64 " found by id.", id);
return session_get(ls) ? ls : NULL;
goto end;
}
- ls = caa_container_of(node, struct ltt_session, node_by_name);
+ ls = lttng::utils::container_of(node, <t_session::node_by_name);
*id = ls->id;
found = true;
rcu_read_unlock();
return found;
}
+
+void ls::details::locked_session_release(ltt_session *session)
+{
+ session_unlock(session);
+ session_put(session);
+}
+
+ltt_session::locked_ptr ls::find_locked_session_by_id(ltt_session::id_t id)
+{
+ lttng::urcu::read_lock_guard rcu_lock;
+ auto session = session_find_by_id(id);
+
+ if (!session) {
+ return nullptr;
+ }
+
+ /*
+ * The pointer falling out of scope will unlock and release the reference to the
+ * session.
+ */
+ session_lock(session);
+ return ltt_session::locked_ptr(session);
+}
+
+ltt_session::sptr ls::find_session_by_id(ltt_session::id_t id)
+{
+ lttng::urcu::read_lock_guard rcu_lock;
+ auto session = session_find_by_id(id);
+
+ if (!session) {
+ return nullptr;
+ }
+
+ return {session, session_put};
+}