X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fsession.c;h=c7ce843d71669f3b40609293341dbf8f665a73a1;hp=be820ee552dace6d6c5df188b8d8dee9e2c63681;hb=1316184615e422526ef4fae68f980443414969c1;hpb=b082db07f0c522527fc95fc97f3e99eb0579c0cc diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c index be820ee55..c7ce843d7 100644 --- a/ltt-sessiond/session.c +++ b/ltt-sessiond/session.c @@ -3,12 +3,12 @@ * * 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 - * 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 @@ -17,169 +17,160 @@ */ #define _GNU_SOURCE +#include #include #include #include -#include -#include +#include -#include "lttngerr.h" -#include "session.h" - -/* Variables */ -static unsigned int session_count; +#include +#include -/* Static internal function */ -static void add_session_list(struct ltt_session *ls); -static void del_session_list(struct ltt_session *ls); +#include "hashtable.h" +#include "session.h" -/* Init global session list */ -struct ltt_session_list ltt_session_list = { - .head = CDS_LIST_HEAD_INIT(ltt_session_list.head), -}; +#include "../hashtable/hash.h" /* - * get_session_list + * NOTES: * - * Return a pointer to the session list. + * 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 session_lock() and session_unlock(). */ -struct ltt_session_list *get_session_list(void) -{ - return <t_session_list; -} /* - * get_session_count + * Init tracing session list. * - * Return session_count + * Please see session.h for more explanation and correct usage of the list. */ -unsigned int get_session_count(void) -{ - return session_count; -} +static struct ltt_session_list ltt_session_list = { + .head = CDS_LIST_HEAD_INIT(ltt_session_list.head), + .lock = PTHREAD_MUTEX_INITIALIZER, + .count = 0, +}; /* - * 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. */ static void add_session_list(struct ltt_session *ls) { cds_list_add(&ls->list, <t_session_list.head); - session_count++; + ltt_session_list.count++; } /* - * 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. */ static void del_session_list(struct ltt_session *ls) { cds_list_del(&ls->list); /* Sanity check */ - if (session_count != 0) { - session_count--; + if (ltt_session_list.count > 0) { + ltt_session_list.count--; } } /* - * find_session_by_uuid - * - * Return a ltt_session structure ptr that matches the uuid. + * Return a pointer to the session list. */ -struct ltt_session *find_session_by_uuid(uuid_t session_id) +struct ltt_session_list *session_get_list(void) { - int found = 0; - struct ltt_session *iter; + return <t_session_list; +} - /* Sanity check for NULL session_id */ - if (uuid_is_null(session_id)) { - goto end; - } +/* + * Acquire session list lock + */ +void session_lock_list(void) +{ + pthread_mutex_lock(<t_session_list.lock); +} - cds_list_for_each_entry(iter, <t_session_list.head, list) { - if (uuid_compare(iter->uuid, session_id) == 0) { - found = 1; - break; - } - } +/* + * Release session list lock + */ +void session_unlock_list(void) +{ + pthread_mutex_unlock(<t_session_list.lock); +} -end: - if (!found) { - iter = NULL; - } - return iter; +/* + * Acquire session lock + */ +void session_lock(struct ltt_session *session) +{ + pthread_mutex_lock(&session->lock); } /* - * find_session_by_name - * - * Return a ltt_session structure ptr that matches name. - * If no session found, NULL is returned. + * Release session lock + */ +void session_unlock(struct ltt_session *session) +{ + pthread_mutex_unlock(&session->lock); +} + +/* + * 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; + 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; } } - 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 global 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; - - cds_list_for_each_entry(iter, <t_session_list.head, list) { - if (strcmp(iter->name, name) == 0) { - DBG("Destroying session %s", iter->name); - del_session_list(iter); - free(iter); - found = 1; - break; - } + /* Safety check */ + if (session == NULL) { + ERR("Session pointer was null on session destroy"); + return LTTCOMM_OK; } - 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 global 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; - char date_time[NAME_MAX]; struct ltt_session *new_session; - time_t rawtime; - struct tm *timeinfo; - 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; } @@ -187,67 +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 (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) { - 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; } - /* UUID generation */ - uuid_generate(new_session->uuid); - - /* - * Set consumer (identifier) to 0. This means that there is - * NO consumer attach to that session yet. - */ - new_session->ust_consumer = 0; - /* Init kernel session */ new_session->kernel_session = NULL; - new_session->kern_session_count = 0; - - /* Init list */ - CDS_INIT_LIST_HEAD(&new_session->ust_traces); + new_session->ust_session = NULL; - /* Set trace list counter */ - new_session->ust_trace_count = 0; + /* Init lock */ + pthread_mutex_init(&new_session->lock, NULL); - /* Add new session to the global session list */ + /* Add new session to the session list */ + session_lock_list(); add_session_list(new_session); + session_unlock_list(); - DBG("Tracing session %s created in %s", name, new_session->path); + DBG("Tracing session %s created in %s", name, path); - return 0; + return LTTCOMM_OK; error: error_asprintf: @@ -259,32 +232,3 @@ error_exist: error_malloc: return ret; } - -/* - * get_lttng_session - * - * Iterate over the global session list and fill the lttng_session array. - */ -void get_lttng_session(struct lttng_session *sessions) -{ - int i = 0; - struct ltt_session *iter; - struct lttng_session lsess; - - DBG("Getting all available session"); - - /* Iterate over session list and append data after - * the control struct in the buffer. - */ - cds_list_for_each_entry(iter, <t_session_list.head, list) { - strncpy(lsess.path, iter->path, sizeof(lsess.path)); - lsess.path[sizeof(lsess.path) - 1] = '\0'; - strncpy(lsess.name, iter->name, sizeof(lsess.name)); - lsess.name[sizeof(lsess.name) - 1] = '\0'; - memcpy(&sessions[i], &lsess, sizeof(lsess)); - i++; - /* Reset struct for next pass */ - memset(&lsess, 0, sizeof(lsess)); - } -} -