X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=f76fb4a42e7606b8ebfea427033b00e3de192020;hb=98ba050ed140ff29ac98f66dba0e47db70e4a0c5;hp=7fffea8af4d29145e97cb320786cc0265531106b;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 7fffea8af..f76fb4a42 100644
--- 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;
 	}
-
+	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) {
-		free(session);
-		session = NULL;
 		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);
 
-	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);
+	return session;
 
 error:
-	return session;
+	free(session);
+	return NULL;
 }
 
 /* Should be called with RCU read-side lock held. */
@@ -225,11 +228,36 @@ rcu_unlock:
 	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);
+	if (session->aborted) {
+		ERR("session %" PRIu64 " is already aborted", session->id);
+		ret = -1;
+		goto unlock;
+	}
+	session->aborted = true;
+unlock:
+	pthread_mutex_unlock(&session->lock);
+	return ret;
+}
+
 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) {