projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: stop lttng-relayd threads on health thread error
[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 d1c2098f8591a3a8c9c5e87b022f43e8fff627ee..9702bd220b0d134bc4502ecd6e4435e682e22ba1 100644
(file)
--- a/
src/bin/lttng-relayd/session.c
+++ b/
src/bin/lttng-relayd/session.c
@@
-46,11
+46,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;
}
@@
-67,17
+72,15
@@
struct relay_session *session_create(const char *session_name,
pthread_mutex_init(&session->reflock, NULL);
pthread_mutex_init(&session->recv_list_lock, NULL);
pthread_mutex_init(&session->reflock, 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;
lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
session->live_timer = live_timer;
session->snapshot = snapshot;
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. */
}
/* Should be called with RCU read-side lock held. */
This page took
0.023546 seconds
and
4
git commands to generate.