X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Fsession.c;h=1ace823c7143b8d0169feb1f551a9151e75e7fe4;hb=b3c750d2ffae77322752a5b4f43bd4ddae3dfea6;hp=7a7bf3e572eaf500f34df226789af94efd4bf240;hpb=d6175221183d58027dcac4a6814d2a3457550628;p=lttng-tools.git

diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index 7a7bf3e57..1ace823c7 100644
--- a/ltt-sessiond/session.c
+++ b/ltt-sessiond/session.c
@@ -8,7 +8,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -18,14 +18,12 @@
 
 #define _GNU_SOURCE
 #include <limits.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <urcu/list.h>
 
-#include "lttngerr.h"
+#include <lttngerr.h>
+
 #include "session.h"
 
 /*
@@ -49,11 +47,9 @@ static struct ltt_session_list ltt_session_list = {
 };
 
 /*
- *  add_session_list
- *
- *  Add a ltt_session structure to the global list.
+ * Add a ltt_session structure to the global list.
  *
- *  The caller MUST acquire the session list lock before.
+ * The caller MUST acquire the session list lock before.
  */
 static void add_session_list(struct ltt_session *ls)
 {
@@ -62,11 +58,9 @@ static void add_session_list(struct ltt_session *ls)
 }
 
 /*
- *  del_session_list
- *
- *  Delete a ltt_session structure to the global list.
+ * Delete a ltt_session structure to the global list.
  *
- *  The caller MUST acquire the session list lock before.
+ * The caller MUST acquire the session list lock before.
  */
 static void del_session_list(struct ltt_session *ls)
 {
@@ -78,9 +72,7 @@ static void del_session_list(struct ltt_session *ls)
 }
 
 /*
- *  get_session_list
- *
- *  Return a pointer to the session list.
+ * Return a pointer to the session list.
  */
 struct ltt_session_list *get_session_list(void)
 {
@@ -120,10 +112,8 @@ void unlock_session(struct ltt_session *session)
 }
 
 /*
- * 	find_session_by_name
- *
- * 	Return a ltt_session structure ptr that matches name.
- * 	If no session found, NULL is returned.
+ * Return a ltt_session structure ptr that matches name.
+ * If no session found, NULL is returned.
  */
 struct ltt_session *find_session_by_name(char *name)
 {
@@ -132,7 +122,7 @@ struct ltt_session *find_session_by_name(char *name)
 
 	lock_session_list();
 	cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
-		if (strncmp(iter->name, name, strlen(name)) == 0) {
+		if (strncmp(iter->name, name, NAME_MAX) == 0) {
 			found = 1;
 			break;
 		}
@@ -147,11 +137,9 @@ struct ltt_session *find_session_by_name(char *name)
 }
 
 /*
- * 	destroy_session
- *
- *  Delete session from the session list and free the memory.
+ * Delete session from the session list and free the memory.
  *
- *  Return -1 if no session is found.  On success, return 1;
+ * Return -1 if no session is found.  On success, return 1;
  */
 int destroy_session(char *name)
 {
@@ -177,9 +165,7 @@ int destroy_session(char *name)
 }
 
 /*
- * 	create_session
- *
- * 	Create a brand new session and add it to the session list.
+ * Create a brand new session and add it to the session list.
  */
 int create_session(char *name, char *path)
 {
@@ -227,21 +213,18 @@ int create_session(char *name, char *path)
 	/* Init kernel session */
 	new_session->kernel_session = NULL;
 
-	/* Init list */
-	CDS_INIT_LIST_HEAD(&new_session->ust_traces);
+	/* Init UST session list */
+	CDS_INIT_LIST_HEAD(&new_session->ust_session_list.head);
 
-	/* Set trace list counter */
-	new_session->ust_trace_count = 0;
+	/* Init lock */
+	pthread_mutex_init(&new_session->lock, NULL);
 
 	/* Add new session to the session list */
 	lock_session_list();
 	add_session_list(new_session);
 	unlock_session_list();
 
-	/* Init lock */
-	pthread_mutex_init(&new_session->lock, NULL);
-
-	DBG("Tracing session %s created in %s", new_session->name, new_session->path);
+	DBG("Tracing session %s created in %s", name, path);
 
 	return 0;