/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * 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; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
*
* 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
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _GNU_SOURCE
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <urcu.h>
#include <common/common.h>
static struct ltt_session_list ltt_session_list = {
.head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
.lock = PTHREAD_MUTEX_INITIALIZER,
- .count = 0,
+ .next_uuid = 0,
};
/*
* The caller MUST acquire the session list lock before.
* Returns the unique identifier for the session.
*/
-static int add_session_list(struct ltt_session *ls)
+static unsigned int add_session_list(struct ltt_session *ls)
{
cds_list_add(&ls->list, <t_session_list.head);
- return ++ltt_session_list.count;
+ return ltt_session_list.next_uuid++;
}
/*
static void del_session_list(struct ltt_session *ls)
{
cds_list_del(&ls->list);
- /* Sanity check */
- if (ltt_session_list.count > 0) {
- ltt_session_list.count--;
- }
}
/*
/* Safety check */
if (session == NULL) {
ERR("Session pointer was null on session destroy");
- return LTTCOMM_OK;
+ return LTTNG_OK;
}
DBG("Destroying session %s", session->name);
del_session_list(session);
pthread_mutex_destroy(&session->lock);
+
+ rcu_read_lock();
+ consumer_destroy_output(session->consumer);
+ rcu_read_unlock();
free(session);
- return LTTCOMM_OK;
+ return LTTNG_OK;
}
/*
int ret;
struct ltt_session *new_session;
- new_session = session_find_by_name(name);
- if (new_session != NULL) {
- ret = LTTCOMM_EXIST_SESS;
- goto error_exist;
- }
-
/* Allocate session data structure */
new_session = zmalloc(sizeof(struct ltt_session));
if (new_session == NULL) {
PERROR("zmalloc");
- ret = LTTCOMM_FATAL;
+ ret = LTTNG_ERR_FATAL;
goto error_malloc;
}
/* Define session name */
if (name != NULL) {
if (snprintf(new_session->name, NAME_MAX, "%s", name) < 0) {
- ret = LTTCOMM_FATAL;
+ ret = LTTNG_ERR_FATAL;
goto error_asprintf;
}
} else {
ERR("No session name given");
- ret = LTTCOMM_FATAL;
+ ret = LTTNG_ERR_FATAL;
goto error;
}
/* Define session system path */
if (path != NULL) {
if (snprintf(new_session->path, PATH_MAX, "%s", path) < 0) {
- ret = LTTCOMM_FATAL;
+ ret = LTTNG_ERR_FATAL;
goto error_asprintf;
}
+ new_session->start_consumer = 1;
} else {
- ERR("No session path given");
- ret = LTTCOMM_FATAL;
- goto error;
+ /* No path indicates that there is no use for a consumer. */
+ new_session->start_consumer = 0;
+ new_session->path[0] = '\0';
}
/* Init kernel session */
new_session->uid = uid;
new_session->gid = gid;
- ret = run_as_mkdir_recursive(new_session->path, S_IRWXU | S_IRWXG,
- new_session->uid, new_session->gid);
- if (ret < 0) {
- if (ret != -EEXIST) {
- ERR("Trace directory creation error");
- ret = LTTCOMM_CREATE_DIR_FAIL;
- goto error;
+ /* Mkdir if we have a valid path and length */
+ if (strlen(new_session->path) > 0) {
+ ret = run_as_mkdir_recursive(new_session->path, S_IRWXU | S_IRWXG,
+ new_session->uid, new_session->gid);
+ if (ret < 0) {
+ if (ret != -EEXIST) {
+ ERR("Trace directory creation error");
+ ret = LTTNG_ERR_CREATE_DIR_FAIL;
+ goto error;
+ }
}
}
new_session->id = add_session_list(new_session);
session_unlock_list();
- DBG("Tracing session %s created in %s with ID %d by UID %d GID %d",
- name, path, new_session->id,
- new_session->uid, new_session->gid);
+ /*
+ * Consumer is let to NULL since the create_session_uri command will set it
+ * up and, if valid, assign it to the session.
+ */
- return LTTCOMM_OK;
+ DBG("Tracing session %s created in %s with ID %u by UID %d GID %d", name,
+ path, new_session->id, new_session->uid, new_session->gid);
+
+ return LTTNG_OK;
error:
error_asprintf:
free(new_session);
}
-error_exist:
error_malloc:
return ret;
}
+
+/*
+ * Check if the UID or GID match the session. Root user has access to all
+ * sessions.
+ */
+int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid)
+{
+ assert(session);
+
+ if (uid != session->uid && gid != session->gid && uid != 0) {
+ return 0;
+ } else {
+ return 1;
+ }
+}
projects / lttng-tools.git / blobdiff