X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fsession.c;h=3131006f19254072119d41ecccfc3d37f9c1c95c;hp=58518346b434fcdc4ba96b005b7ed888cdbd14d0;hb=ca3c5ac0cf100d80352a1a81936b5adc47942f35;hpb=6c9cc2aba449a320460b9a9665c66f3b32eaeca7

diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index 58518346b..3131006f1 100644
--- a/ltt-sessiond/session.c
+++ b/ltt-sessiond/session.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -132,7 +132,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;
 		}
@@ -156,10 +156,10 @@ struct ltt_session *find_session_by_name(char *name)
 int destroy_session(char *name)
 {
 	int found = -1;
-	struct ltt_session *iter;
+	struct ltt_session *iter, *tmp;
 
 	lock_session_list();
-	cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
+	cds_list_for_each_entry_safe(iter, tmp, &ltt_session_list.head, list) {
 		if (strcmp(iter->name, name) == 0) {
 			DBG("Destroying session %s", iter->name);
 			del_session_list(iter);
@@ -184,10 +184,7 @@ int destroy_session(char *name)
 int create_session(char *name, char *path)
 {
 	int ret;
-	char date_time[NAME_MAX];
 	struct ltt_session *new_session;
-	time_t rawtime;
-	struct tm *timeinfo;
 
 	new_session = find_session_by_name(name);
 	if (new_session != NULL) {
@@ -217,15 +214,7 @@ int create_session(char *name, char *path)
 
 	/* Define session system path */
 	if (path != NULL) {
-		if (strstr(name, "auto-") == NULL) {
-			time(&rawtime);
-			timeinfo = localtime(&rawtime);
-			strftime(date_time, sizeof(date_time), "-%Y%m%d-%H%M%S", timeinfo);
-		} else {
-			date_time[0] = '\0';
-		}
-
-		if (asprintf(&new_session->path, "%s/%s%s", path, name, date_time) < 0) {
+		if (asprintf(&new_session->path, "%s", path) < 0) {
 			ret = -ENOMEM;
 			goto error_asprintf;
 		}