X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fsession.c;h=c7ce843d71669f3b40609293341dbf8f665a73a1;hp=7a7bf3e572eaf500f34df226789af94efd4bf240;hb=1316184615e422526ef4fae68f980443414969c1;hpb=d6175221183d58027dcac4a6814d2a3457550628 diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c index 7a7bf3e57..c7ce843d7 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,23 +18,26 @@ #define _GNU_SOURCE #include -#include #include #include #include -#include -#include +#include -#include "lttngerr.h" +#include +#include + +#include "hashtable.h" #include "session.h" +#include "../hashtable/hash.h" + /* * NOTES: * * No ltt_session.lock is taken here because those data structure are widely * spread across the lttng-tools code base so before caling functions below * that can read/write a session, the caller MUST acquire the session lock - * using lock_session() and unlock_session(). + * using session_lock() and session_unlock(). */ /* @@ -49,11 +52,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 +63,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,11 +77,9 @@ 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) +struct ltt_session_list *session_get_list(void) { return <t_session_list; } @@ -90,7 +87,7 @@ struct ltt_session_list *get_session_list(void) /* * Acquire session list lock */ -void lock_session_list(void) +void session_lock_list(void) { pthread_mutex_lock(<t_session_list.lock); } @@ -98,7 +95,7 @@ void lock_session_list(void) /* * Release session list lock */ -void unlock_session_list(void) +void session_unlock_list(void) { pthread_mutex_unlock(<t_session_list.lock); } @@ -106,7 +103,7 @@ void unlock_session_list(void) /* * Acquire session lock */ -void lock_session(struct ltt_session *session) +void session_lock(struct ltt_session *session) { pthread_mutex_lock(&session->lock); } @@ -114,81 +111,66 @@ void lock_session(struct ltt_session *session) /* * Release session lock */ -void unlock_session(struct ltt_session *session) +void session_unlock(struct ltt_session *session) { pthread_mutex_unlock(&session->lock); } /* - * 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. This must be called with the session lock held using + * session_lock_list and session_unlock_list. */ -struct ltt_session *find_session_by_name(char *name) +struct ltt_session *session_find_by_name(char *name) { - int found = 0; struct ltt_session *iter; - lock_session_list(); + DBG2("Trying to find session by name %s", name); + cds_list_for_each_entry(iter, <t_session_list.head, list) { - if (strncmp(iter->name, name, strlen(name)) == 0) { - found = 1; - break; + if (strncmp(iter->name, name, NAME_MAX) == 0) { + goto found; } } - unlock_session_list(); - if (!found) { - iter = NULL; - } + iter = NULL; +found: return iter; } /* - * 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) +int session_destroy(struct ltt_session *session) { - int found = -1; - struct ltt_session *iter, *tmp; - - lock_session_list(); - cds_list_for_each_entry_safe(iter, tmp, <t_session_list.head, list) { - if (strcmp(iter->name, name) == 0) { - DBG("Destroying session %s", iter->name); - del_session_list(iter); - free(iter->name); - free(iter->path); - pthread_mutex_destroy(&iter->lock); - free(iter); - found = 1; - break; - } + /* Safety check */ + if (session == NULL) { + ERR("Session pointer was null on session destroy"); + return LTTCOMM_OK; } - unlock_session_list(); - return found; + DBG("Destroying session %s", session->name); + del_session_list(session); + pthread_mutex_destroy(&session->lock); + free(session); + + return LTTCOMM_OK; } /* - * 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) +int session_create(char *name, char *path) { int ret; struct ltt_session *new_session; - new_session = find_session_by_name(name); + new_session = session_find_by_name(name); if (new_session != NULL) { - ret = -EEXIST; + ret = LTTCOMM_EXIST_SESS; goto error_exist; } @@ -196,54 +178,49 @@ int create_session(char *name, char *path) new_session = malloc(sizeof(struct ltt_session)); if (new_session == NULL) { perror("malloc"); - ret = -ENOMEM; + ret = LTTCOMM_FATAL; goto error_malloc; } /* Define session name */ if (name != NULL) { - if (asprintf(&new_session->name, "%s", name) < 0) { - ret = -ENOMEM; + if (snprintf(new_session->name, NAME_MAX, "%s", name) < 0) { + ret = LTTCOMM_FATAL; goto error_asprintf; } } else { ERR("No session name given"); - ret = -1; + ret = LTTCOMM_FATAL; goto error; } /* Define session system path */ if (path != NULL) { - if (asprintf(&new_session->path, "%s", path) < 0) { - ret = -ENOMEM; + if (snprintf(new_session->path, PATH_MAX, "%s", path) < 0) { + ret = LTTCOMM_FATAL; goto error_asprintf; } } else { ERR("No session path given"); - ret = -1; + ret = LTTCOMM_FATAL; goto error; } /* Init kernel session */ new_session->kernel_session = NULL; + new_session->ust_session = NULL; - /* Init list */ - CDS_INIT_LIST_HEAD(&new_session->ust_traces); - - /* 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(); + session_lock_list(); add_session_list(new_session); - unlock_session_list(); - - /* Init lock */ - pthread_mutex_init(&new_session->lock, NULL); + session_unlock_list(); - DBG("Tracing session %s created in %s", new_session->name, new_session->path); + DBG("Tracing session %s created in %s", name, path); - return 0; + return LTTCOMM_OK; error: error_asprintf: