X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=inline;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=cb4dd25e94f73159d7e9bb1e6f1660060450b30f;hb=f5e5283c278f5e742f8844e7acee778fb0d8991b;hp=170dcc587aacef935a1dc7222d54a8a2129292a7;hpb=7bb1478af7d1567a6842d0fc73c46315b65bbaf7;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 170dcc587..cb4dd25e9 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -316,7 +316,7 @@ error:
 static void teardown_kernel_session(struct ltt_session *session)
 {
 	if (!session->kernel_session) {
-		DBG3("No kernel session when tearingdown session");
+		DBG3("No kernel session when tearing down session");
 		return;
 	}
 
@@ -342,7 +342,7 @@ static void teardown_ust_session(struct ltt_session *session)
 	int ret;
 
 	if (!session->ust_session) {
-		DBG3("No UST session when tearingdown session");
+		DBG3("No UST session when tearing down session");
 		return;
 	}
 
@@ -399,7 +399,7 @@ static void cleanup(void)
 	}
 	free(cmd);
 
-	DBG("Cleaning up all session");
+	DBG("Cleaning up all sessions");
 
 	/* Destroy session list mutex */
 	if (session_list_ptr != NULL) {
@@ -794,12 +794,18 @@ static void update_ust_app(int app_sock)
 {
 	struct ltt_session *sess, *stmp;
 
+	session_lock_list();
+
 	/* For all tracing session(s) */
 	cds_list_for_each_entry_safe(sess, stmp, &session_list_ptr->head, list) {
+		session_lock(sess);
 		if (sess->ust_session) {
 			ust_app_global_update(sess->ust_session, app_sock);
 		}
+		session_unlock(sess);
 	}
+
+	session_unlock_list();
 }
 
 /*
@@ -2094,8 +2100,17 @@ static int list_lttng_ust_global_events(char *channel_name,
 		case LTTNG_UST_FUNCTION:
 			tmp[i].type = LTTNG_EVENT_FUNCTION;
 			break;
-		case LTTNG_UST_TRACEPOINT_LOGLEVEL:
-			tmp[i].type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL;
+		}
+		tmp[i].loglevel = uevent->attr.loglevel;
+		switch (uevent->attr.loglevel_type) {
+		case LTTNG_UST_LOGLEVEL_ALL:
+			tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+			break;
+		case LTTNG_UST_LOGLEVEL_RANGE:
+			tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE;
+			break;
+		case LTTNG_UST_LOGLEVEL_SINGLE:
+			tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
 			break;
 		}
 		i++;
@@ -2482,12 +2497,6 @@ error:
 
 /*
  * Command LTTNG_ENABLE_EVENT processed by the client thread.
- *
- * TODO: currently, both events and loglevels are kept within the same
- * namespace for UST global registry/app registery, so if an event
- * happen to have the same name as the loglevel (very unlikely though),
- * and an attempt is made to enable/disable both in the same session,
- * the first to be created will be the only one allowed to exist.
  */
 static int cmd_enable_event(struct ltt_session *session, int domain,
 		char *channel_name, struct lttng_event *event)
@@ -3364,7 +3373,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.disable.channel_name,
 				cmd_ctx->lsm->u.disable.name);
-		ret = LTTCOMM_OK;
 		break;
 	}
 	case LTTNG_DISABLE_ALL_EVENT:
@@ -3536,11 +3544,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 		session_lock_list();
 		nr_sessions = lttng_sessions_count(cmd_ctx->creds.uid, cmd_ctx->creds.gid);
-		if (nr_sessions == 0) {
-			ret = LTTCOMM_NO_SESSION;
-			session_unlock_list();
-			goto error;
-		}
+
 		ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * nr_sessions);
 		if (ret < 0) {
 			session_unlock_list();
@@ -3968,24 +3972,19 @@ end:
  */
 static int check_existing_daemon(void)
 {
-	if (access(client_unix_sock_path, F_OK) < 0 &&
-			access(apps_unix_sock_path, F_OK) < 0) {
-		return 0;
-	}
-
 	/* Is there anybody out there ? */
 	if (lttng_session_daemon_alive()) {
 		return -EEXIST;
-	} else {
-		return 0;
 	}
+
+	return 0;
 }
 
 /*
  * Set the tracing group gid onto the client socket.
  *
  * Race window between mkdir and chown is OK because we are going from more
- * permissive (root.root) to les permissive (root.tracing).
+ * permissive (root.root) to less permissive (root.tracing).
  */
 static int set_permissions(char *rundir)
 {
@@ -4006,6 +4005,13 @@ static int set_permissions(char *rundir)
 		perror("chown");
 	}
 
+	/* Ensure tracing group can search the run dir */
+	ret = chmod(rundir, S_IRWXU | S_IXGRP);
+	if (ret < 0) {
+		ERR("Unable to set permissions on %s", rundir);
+		perror("chmod");
+	}
+
 	/* lttng client socket path */
 	ret = chown(client_unix_sock_path, 0, gid);
 	if (ret < 0) {
@@ -4065,7 +4071,7 @@ static int create_lttng_rundir(const char *rundir)
 
 	DBG3("Creating LTTng run directory: %s", rundir);
 
-	ret = mkdir(rundir, S_IRWXU | S_IRWXG );
+	ret = mkdir(rundir, S_IRWXU);
 	if (ret < 0) {
 		if (errno != EEXIST) {
 			ERR("Unable to create %s", rundir);
@@ -4107,7 +4113,7 @@ static int set_consumer_sockets(struct consumer_data *consumer_data,
 
 	DBG2("Creating consumer directory: %s", path);
 
-	ret = mkdir(path, S_IRWXU | S_IRWXG);
+	ret = mkdir(path, S_IRWXU);
 	if (ret < 0) {
 		if (errno != EEXIST) {
 			ERR("Failed to create %s", path);