* 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.
- *
+ *
* 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
*/
#define _GNU_SOURCE
-#include <lttng/liblttngctl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <urcu/list.h>
-#include <uuid/uuid.h>
#include "lttngerr.h"
#include "session.h"
static void add_session_list(struct ltt_session *ls);
static void del_session_list(struct ltt_session *ls);
-/* Init session's list */
-static struct ltt_session_list ltt_session_list = {
+/* Init global session list */
+struct ltt_session_list ltt_session_list = {
.head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
};
+/*
+ * get_session_list
+ *
+ * Return a pointer to the session list.
+ */
+struct ltt_session_list *get_session_list(void)
+{
+ return <t_session_list;
+}
+
/*
* get_session_count
*
struct ltt_session *iter;
cds_list_for_each_entry(iter, <t_session_list.head, list) {
- if (strncmp(iter->name, name, strlen(iter->name)) == 0) {
+ if (strncmp(iter->name, name, strlen(name)) == 0) {
found = 1;
break;
}
* Return -1 if no session is found.
* On success, return 1;
*/
-int destroy_session(uuid_t *uuid)
+int destroy_session(char *name)
{
int found = -1;
struct ltt_session *iter;
cds_list_for_each_entry(iter, <t_session_list.head, list) {
- if (uuid_compare(iter->uuid, *uuid) == 0) {
+ if (strcmp(iter->name, name) == 0) {
+ DBG("Destroying session %s", iter->name);
del_session_list(iter);
free(iter);
found = 1;
/*
* 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 global session list.
*/
-int create_session(char *name, uuid_t *session_id)
+int create_session(char *name, char *path)
{
+ int ret;
struct ltt_session *new_session;
+ DBG("Creating session %s at %s", name, path);
+
new_session = find_session_by_name(name);
if (new_session != NULL) {
- goto error;
+ ret = -EEXIST;
+ goto error_exist;
}
/* Allocate session data structure */
new_session = malloc(sizeof(struct ltt_session));
if (new_session == NULL) {
perror("malloc");
- goto error_mem;
+ ret = -ENOMEM;
+ goto error_malloc;
}
+ /* Define session name */
if (name != NULL) {
if (asprintf(&new_session->name, "%s", name) < 0) {
- goto error_mem;
+ ret = -ENOMEM;
+ goto error_asprintf;
}
} else {
- /* Generate session name based on the session count */
- if (asprintf(&new_session->name, "%s%d", "lttng-", session_count) < 0) {
- goto error_mem;
+ ERR("No session name given");
+ ret = -1;
+ goto error;
+ }
+
+ /* Define session system path */
+ if (path != NULL) {
+ if (asprintf(&new_session->path, "%s", path) < 0) {
+ ret = -ENOMEM;
+ goto error_asprintf;
}
+ } else {
+ ERR("No session path given");
+ ret = -1;
+ goto error;
}
/* UUID generation */
uuid_generate(new_session->uuid);
- uuid_copy(*session_id, new_session->uuid);
- /* Set consumer (identifier) to 0. This means that there is
+ /*
+ * Set consumer (identifier) to 0. This means that there is
* NO consumer attach to that session yet.
*/
new_session->ust_consumer = 0;
- new_session->lttng_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);
- CDS_INIT_LIST_HEAD(&new_session->lttng_traces);
+
+ /* Set trace list counter */
+ new_session->ust_trace_count = 0;
/* Add new session to the global session list */
add_session_list(new_session);
return 0;
error:
- return -1;
+error_asprintf:
+ if (new_session != NULL) {
+ free(new_session);
+ }
-error_mem:
- return -ENOMEM;
+error_exist:
+error_malloc:
+ return ret;
}
/*
* get_lttng_session
*
- * Iterate over the global session list and
- * fill the lttng_session array.
+ * Iterate over the global session list and fill the lttng_session array.
*/
-void get_lttng_session(struct lttng_session *lt)
+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) {
- /* Copy name and uuid */
- uuid_unparse(iter->uuid, lsess.uuid);
+ 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(<[i], &lsess, sizeof(lsess));
+ memcpy(&sessions[i], &lsess, sizeof(lsess));
i++;
/* Reset struct for next pass */
memset(&lsess, 0, sizeof(lsess));