*/
#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 {
ltt_session_destroy_notifier notifier;
void *user_data;
void *user_data;
};
+namespace ls = lttng::sessiond;
+
/*
* NOTES:
*
* using session_lock() and session_unlock().
*/
+/* These characters are forbidden in a session name. Used by validate_name. */
+const char *forbidden_name_chars = "/";
+
+/* Global hash table to keep the sessions, indexed by id. */
+struct lttng_ht *ltt_sessions_ht_by_id = NULL;
+/* Global hash table to keep the sessions, indexed by name. */
+struct lttng_ht *ltt_sessions_ht_by_name = NULL;
+
/*
* Init tracing session list.
*
* Please see session.h for more explanation and correct usage of the list.
*/
-static struct ltt_session_list ltt_session_list = {
+struct ltt_session_list the_session_list = {
.lock = PTHREAD_MUTEX_INITIALIZER,
.removal_cond = PTHREAD_COND_INITIALIZER,
.next_uuid = 0,
- .head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
+ .head = CDS_LIST_HEAD_INIT(the_session_list.head),
};
-
-/* These characters are forbidden in a session name. Used by validate_name. */
-static const char *forbidden_name_chars = "/";
-
-/* Global hash table to keep the sessions, indexed by id. */
-static struct lttng_ht *ltt_sessions_ht_by_id = NULL;
-/* Global hash table to keep the sessions, indexed by name. */
-static struct lttng_ht *ltt_sessions_ht_by_name = NULL;
+} /* namespace */
/*
* Validate the session name for forbidden characters.
{
LTTNG_ASSERT(ls);
- cds_list_add(&ls->list, <t_session_list.head);
- return ltt_session_list.next_uuid++;
+ cds_list_add(&ls->list, &the_session_list.head);
+ return the_session_list.next_uuid++;
}
/*
*/
struct ltt_session_list *session_get_list(void)
{
- return <t_session_list;
+ return &the_session_list;
}
/*
*/
void session_list_wait_empty(void)
{
- pthread_mutex_lock(<t_session_list.lock);
- while (!cds_list_empty(<t_session_list.head)) {
- pthread_cond_wait(<t_session_list.removal_cond,
- <t_session_list.lock);
+ pthread_mutex_lock(&the_session_list.lock);
+ while (!cds_list_empty(&the_session_list.head)) {
+ pthread_cond_wait(&the_session_list.removal_cond,
+ &the_session_list.lock);
}
- pthread_mutex_unlock(<t_session_list.lock);
+ pthread_mutex_unlock(&the_session_list.lock);
}
/*
*/
void session_lock_list(void)
{
- pthread_mutex_lock(<t_session_list.lock);
+ pthread_mutex_lock(&the_session_list.lock);
}
/*
*/
int session_trylock_list(void)
{
- return pthread_mutex_trylock(<t_session_list.lock);
+ return pthread_mutex_trylock(&the_session_list.lock);
}
/*
*/
void session_unlock_list(void)
{
- pthread_mutex_unlock(<t_session_list.lock);
+ pthread_mutex_unlock(&the_session_list.lock);
}
/*
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);
pthread_mutex_destroy(&session->lock);
if (session_published) {
- ASSERT_LOCKED(ltt_session_list.lock);
+ ASSERT_LOCKED(the_session_list.lock);
del_session_list(session);
del_session_ht(session);
}
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) {
/*
* Broadcast after free-ing to ensure the memory is
* reclaimed before the main thread exits.
*/
- ASSERT_LOCKED(ltt_session_list.lock);
- pthread_cond_broadcast(<t_session_list.removal_cond);
+ ASSERT_LOCKED(the_session_list.lock);
+ pthread_cond_broadcast(&the_session_list.removal_cond);
}
}
* The session list lock must be held as any session_put()
* may cause the removal of the session from the session_list.
*/
- ASSERT_LOCKED(ltt_session_list.lock);
+ ASSERT_LOCKED(the_session_list.lock);
LTTNG_ASSERT(session->ref.refcount);
urcu_ref_put(&session->ref, session_release);
}
struct ltt_session *iter;
LTTNG_ASSERT(name);
- ASSERT_LOCKED(ltt_session_list.lock);
+ ASSERT_LOCKED(the_session_list.lock);
DBG2("Trying to find session by name %s", name);
- cds_list_for_each_entry(iter, <t_session_list.head, list) {
+ cds_list_for_each_entry(iter, &the_session_list.head, list) {
if (!strncmp(iter->name, name, NAME_MAX) &&
!iter->destroyed) {
goto found;
struct ltt_session *ls;
ASSERT_RCU_READ_LOCKED();
- ASSERT_LOCKED(ltt_session_list.lock);
+ ASSERT_LOCKED(the_session_list.lock);
if (!ltt_sessions_ht_by_id) {
goto end;
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;
enum lttng_error_code ret_code;
struct ltt_session *new_session = NULL;
- ASSERT_LOCKED(ltt_session_list.lock);
+ ASSERT_LOCKED(the_session_list.lock);
if (name) {
struct ltt_session *clashing_session;
{
int ret = 0;
- ASSERT_LOCKED(ltt_session_list.lock);
+ ASSERT_LOCKED(the_session_list.lock);
ASSERT_LOCKED(session->lock);
session->rotation_state = result;
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};
+}
projects / lttng-tools.git / blobdiff