X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=0f62ab49fc4acccd824e78e8bbaad3a205583660;hp=a6281662cf63c23e67b1172b6930e47af3094d10;hb=d88744a44aa5f2ca90ab87946692b9eed3120641;hpb=23324029347bb09d3c7fdc4c9675ba6a33cb2fa9

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index a6281662c..0f62ab49f 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -143,6 +143,8 @@ void session_unlock_list(void)
 
 /*
  * Allocate the ltt_sessions_ht_by_id HT.
+ *
+ * The session list lock must be held.
  */
 int ltt_sessions_ht_alloc(void)
 {
@@ -161,8 +163,10 @@ end:
 
 /*
  * Destroy the ltt_sessions_ht_by_id HT.
+ *
+ * The session list lock must be held.
  */
-void ltt_sessions_ht_destroy(void)
+static void ltt_sessions_ht_destroy(void)
 {
 	if (!ltt_sessions_ht_by_id) {
 		return;
@@ -201,7 +205,7 @@ end:
  * Return 1 if empty, 0 if not empty.
  * The session list lock must be held.
  */
-static int ltt_sessions_ht_empty()
+static int ltt_sessions_ht_empty(void)
 {
 	int ret;
 
@@ -294,17 +298,21 @@ struct ltt_session *session_find_by_id(uint64_t id)
 	struct lttng_ht_iter iter;
 	struct ltt_session *ls;
 
+	if (!ltt_sessions_ht_by_id) {
+		goto end;
+	}
+
 	lttng_ht_lookup(ltt_sessions_ht_by_id, &id, &iter);
 	node = lttng_ht_iter_get_node_u64(&iter);
 	if (node == NULL) {
-		goto error;
+		goto end;
 	}
 	ls = caa_container_of(node, struct ltt_session, node);
 
 	DBG3("Session %" PRIu64 " found by id.", id);
 	return ls;
 
-error:
+end:
 	DBG3("Session %" PRIu64 " NOT found by id", id);
 	return NULL;
 }
@@ -320,7 +328,7 @@ int session_destroy(struct ltt_session *session)
 	/* Safety check */
 	assert(session);
 
-	DBG("Destroying session %s", session->name);
+	DBG("Destroying session %s (id %" PRIu64 ")", session->name, session->id);
 	del_session_list(session);
 	pthread_mutex_destroy(&session->lock);
 	del_session_ht(session);
@@ -392,6 +400,10 @@ int session_create(char *name, uid_t uid, gid_t gid)
 		goto error;
 	}
 
+	new_session->rotate_pending = false;
+	new_session->rotate_pending_relay = false;
+	new_session->rotate_relay_pending_timer_enabled = false;
+
 	/* Add new session to the session list */
 	session_lock_list();
 	new_session->id = add_session_list(new_session);