projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: create sessiond trace chunk registry on session creation
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
session.c
diff --git
a/src/bin/lttng-relayd/session.c
b/src/bin/lttng-relayd/session.c
index 7fffea8af4d29145e97cb320786cc0265531106b..4730d0512e5bdb88e6a29275f18e5faeb5d5d4ce 100644
(file)
--- a/
src/bin/lttng-relayd/session.c
+++ b/
src/bin/lttng-relayd/session.c
@@
-25,6
+25,7
@@
#include "ctf-trace.h"
#include "session.h"
#include "stream.h"
#include "ctf-trace.h"
#include "session.h"
#include "stream.h"
+#include "sessiond-trace-chunks.h"
/* Global session id used in the session creation. */
static uint64_t last_relay_session_id;
/* Global session id used in the session creation. */
static uint64_t last_relay_session_id;
@@
-37,8
+38,10
@@
static pthread_mutex_t last_relay_session_id_lock = PTHREAD_MUTEX_INITIALIZER;
*/
struct relay_session *session_create(const char *session_name,
const char *hostname, uint32_t live_timer,
*/
struct relay_session *session_create(const char *session_name,
const char *hostname, uint32_t live_timer,
- bool snapshot, uint32_t major, uint32_t minor)
+ bool snapshot, const lttng_uuid sessiond_uuid,
+ uint32_t major, uint32_t minor)
{
{
+ int ret;
struct relay_session *session;
session = zmalloc(sizeof(*session));
struct relay_session *session;
session = zmalloc(sizeof(*session));
@@
-46,11
+49,16
@@
struct relay_session *session_create(const char *session_name,
PERROR("relay session zmalloc");
goto error;
}
PERROR("relay session zmalloc");
goto error;
}
-
+ if (lttng_strncpy(session->session_name, session_name,
+ sizeof(session->session_name))) {
+ goto error;
+ }
+ if (lttng_strncpy(session->hostname, hostname,
+ sizeof(session->hostname))) {
+ goto error;
+ }
session->ctf_traces_ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
if (!session->ctf_traces_ht) {
session->ctf_traces_ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
if (!session->ctf_traces_ht) {
- free(session);
- session = NULL;
goto error;
}
goto error;
}
@@
-64,35
+72,30
@@
struct relay_session *session_create(const char *session_name,
urcu_ref_init(&session->ref);
CDS_INIT_LIST_HEAD(&session->recv_list);
pthread_mutex_init(&session->lock, NULL);
urcu_ref_init(&session->ref);
CDS_INIT_LIST_HEAD(&session->recv_list);
pthread_mutex_init(&session->lock, NULL);
- pthread_mutex_init(&session->reflock, NULL);
pthread_mutex_init(&session->recv_list_lock, NULL);
pthread_mutex_init(&session->recv_list_lock, NULL);
- strncpy(session->session_name, session_name,
- sizeof(session->session_name));
- strncpy(session->hostname, hostname,
- sizeof(session->hostname));
session->live_timer = live_timer;
session->snapshot = snapshot;
session->live_timer = live_timer;
session->snapshot = snapshot;
+ lttng_uuid_copy(session->sessiond_uuid, sessiond_uuid);
+
+ ret = sessiond_trace_chunk_registry_session_created(
+ sessiond_trace_chunk_registry, sessiond_uuid);
+ if (ret) {
+ goto error;
+ }
lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
+ return session;
error:
error:
- return session;
+ free(session);
+ return NULL;
}
/* Should be called with RCU read-side lock held. */
bool session_get(struct relay_session *session)
{
}
/* Should be called with RCU read-side lock held. */
bool session_get(struct relay_session *session)
{
- bool has_ref = false;
-
- pthread_mutex_lock(&session->reflock);
- if (session->ref.refcount != 0) {
- has_ref = true;
- urcu_ref_get(&session->ref);
- }
- pthread_mutex_unlock(&session->reflock);
-
- return has_ref;
+ return urcu_ref_get_unless_zero(&session->ref);
}
/*
}
/*
@@
-161,6
+164,9
@@
static void destroy_session(struct relay_session *session)
ret = session_delete(session);
assert(!ret);
ret = session_delete(session);
assert(!ret);
+ ret = sessiond_trace_chunk_registry_session_destroyed(
+ sessiond_trace_chunk_registry, session->sessiond_uuid);
+ assert(!ret);
call_rcu(&session->rcu_node, rcu_destroy_session);
}
call_rcu(&session->rcu_node, rcu_destroy_session);
}
@@
-175,9
+181,7
@@
void session_release(struct urcu_ref *ref)
void session_put(struct relay_session *session)
{
rcu_read_lock();
void session_put(struct relay_session *session)
{
rcu_read_lock();
- pthread_mutex_lock(&session->reflock);
urcu_ref_put(&session->ref, session_release);
urcu_ref_put(&session->ref, session_release);
- pthread_mutex_unlock(&session->reflock);
rcu_read_unlock();
}
rcu_read_unlock();
}
@@
-191,16
+195,8
@@
int session_close(struct relay_session *session)
pthread_mutex_lock(&session->lock);
DBG("closing session %" PRIu64 ": is conn already closed %d",
session->id, session->connection_closed);
pthread_mutex_lock(&session->lock);
DBG("closing session %" PRIu64 ": is conn already closed %d",
session->id, session->connection_closed);
- if (session->connection_closed) {
- ret = -1;
- goto unlock;
- }
session->connection_closed = true;
session->connection_closed = true;
-unlock:
pthread_mutex_unlock(&session->lock);
pthread_mutex_unlock(&session->lock);
- if (ret) {
- return ret;
- }
rcu_read_lock();
cds_lfht_for_each_entry(session->ctf_traces_ht->ht,
rcu_read_lock();
cds_lfht_for_each_entry(session->ctf_traces_ht->ht,
@@
-225,11
+221,30
@@
rcu_unlock:
return ret;
}
return ret;
}
+int session_abort(struct relay_session *session)
+{
+ int ret = 0;
+
+ if (!session) {
+ return 0;
+ }
+
+ pthread_mutex_lock(&session->lock);
+ DBG("aborting session %" PRIu64, session->id);
+ session->aborted = true;
+ pthread_mutex_unlock(&session->lock);
+ return ret;
+}
+
void print_sessions(void)
{
struct lttng_ht_iter iter;
struct relay_session *session;
void print_sessions(void)
{
struct lttng_ht_iter iter;
struct relay_session *session;
+ if (!sessions_ht) {
+ return;
+ }
+
rcu_read_lock();
cds_lfht_for_each_entry(sessions_ht->ht, &iter.iter, session,
session_n.node) {
rcu_read_lock();
cds_lfht_for_each_entry(sessions_ht->ht, &iter.iter, session,
session_n.node) {
This page took
0.026587 seconds
and
4
git commands to generate.