X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=4470afc5e8dd1cf51428f9b5ce22d5ce2e5c217f;hb=94cc2fd1d4c93bf52c9142999ad0355ad7bc7323;hp=f6a051aa1cb52f8080cc9b2209a71044f052e860;hpb=dec56f6cc894de41b312354d360b6a4c09fc199d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index f6a051aa1..4470afc5e 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -232,6 +232,9 @@ static enum consumerd_state kernel_consumerd_state;
  */
 static int app_socket_timeout;
 
+/* Set in main() with the current page size. */
+long page_size;
+
 static
 void setup_consumerd_path(void)
 {
@@ -702,9 +705,9 @@ static void *thread_manage_kernel(void *data)
 
 	/*
 	 * This first step of the while is to clean this structure which could free
-	 * non NULL pointers so zero it before the loop.
+	 * non NULL pointers so initialize it before the loop.
 	 */
-	memset(&events, 0, sizeof(events));
+	lttng_poll_init(&events);
 
 	if (testpoint(thread_manage_kernel)) {
 		goto error_testpoint;
@@ -1377,6 +1380,11 @@ static void *thread_dispatch_ust_registration(void *data)
 				wait_node = zmalloc(sizeof(*wait_node));
 				if (!wait_node) {
 					PERROR("zmalloc wait_node dispatch");
+					ret = close(ust_cmd->sock);
+					if (ret < 0) {
+						PERROR("close ust sock dispatch %d", ust_cmd->sock);
+					}
+					lttng_fd_put(1, LTTNG_FD_APPS);
 					free(ust_cmd);
 					goto error;
 				}
@@ -1424,6 +1432,19 @@ static void *thread_dispatch_ust_registration(void *data)
 						break;
 					}
 				}
+
+				/*
+				 * With no application at this stage the received socket is
+				 * basically useless so close it before we free the cmd data
+				 * structure for good.
+				 */
+				if (!app) {
+					ret = close(ust_cmd->sock);
+					if (ret < 0) {
+						PERROR("close ust sock dispatch %d", ust_cmd->sock);
+					}
+					lttng_fd_put(1, LTTNG_FD_APPS);
+				}
 				free(ust_cmd);
 			}
 
@@ -1485,13 +1506,6 @@ static void *thread_dispatch_ust_registration(void *data)
 
 				rcu_read_unlock();
 				session_unlock_list();
-			} else {
-				/* Application manager threads are not available. */
-				ret = close(ust_cmd->sock);
-				if (ret < 0) {
-					PERROR("close ust_cmd sock");
-				}
-				lttng_fd_put(1, LTTNG_FD_APPS);
 			}
 		} while (node != NULL);
 
@@ -2159,6 +2173,8 @@ error:
  * Copy consumer output from the tracing session to the domain session. The
  * function also applies the right modification on a per domain basis for the
  * trace files destination directory.
+ *
+ * Should *NOT* be called with RCU read-side lock held.
  */
 static int copy_session_consumer(int domain, struct ltt_session *session)
 {
@@ -2216,6 +2232,8 @@ error:
 
 /*
  * Create an UST session and add it to the session ust list.
+ *
+ * Should *NOT* be called with RCU read-side lock held.
  */
 static int create_ust_session(struct ltt_session *session,
 		struct lttng_domain *domain)
@@ -2341,6 +2359,8 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
  * Return any error encountered or 0 for success.
  *
  * "sock" is only used for special-case var. len data.
+ *
+ * Should *NOT* be called with RCU read-side lock held.
  */
 static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 		int *sock_error)
@@ -2886,6 +2906,7 @@ skip_domain:
 
 		ret = setup_lttng_msg(cmd_ctx, nb_dom * sizeof(struct lttng_domain));
 		if (ret < 0) {
+			free(domains);
 			goto setup_error;
 		}
 
@@ -2913,6 +2934,7 @@ skip_domain:
 
 		ret = setup_lttng_msg(cmd_ctx, nb_chan * sizeof(struct lttng_channel));
 		if (ret < 0) {
+			free(channels);
 			goto setup_error;
 		}
 
@@ -2940,6 +2962,7 @@ skip_domain:
 
 		ret = setup_lttng_msg(cmd_ctx, nb_event * sizeof(struct lttng_event));
 		if (ret < 0) {
+			free(events);
 			goto setup_error;
 		}
 
@@ -3085,6 +3108,9 @@ static void *thread_manage_health(void *data)
 
 	rcu_register_thread();
 
+	/* We might hit an error path before this is created. */
+	lttng_poll_init(&events);
+
 	/* Create unix socket */
 	sock = lttcomm_create_unix_sock(health_unix_sock_path);
 	if (sock < 0) {
@@ -3250,12 +3276,6 @@ error:
 			PERROR("close");
 		}
 	}
-	if (new_sock >= 0) {
-		ret = close(new_sock);
-		if (ret) {
-			PERROR("close");
-		}
-	}
 
 	lttng_poll_clean(&events);
 
@@ -3437,13 +3457,11 @@ static void *thread_manage_clients(void *data)
 		ret = process_client_msg(cmd_ctx, sock, &sock_error);
 		rcu_thread_offline();
 		if (ret < 0) {
-			if (sock_error) {
-				ret = close(sock);
-				if (ret) {
-					PERROR("close");
-				}
-				sock = -1;
+			ret = close(sock);
+			if (ret) {
+				PERROR("close");
 			}
+			sock = -1;
 			/*
 			 * TODO: Inform client somehow of the fatal error. At
 			 * this point, ret < 0 means that a zmalloc failed
@@ -4032,6 +4050,13 @@ int main(int argc, char **argv)
 
 	setup_consumerd_path();
 
+	page_size = sysconf(_SC_PAGESIZE);
+	if (page_size < 0) {
+		PERROR("sysconf _SC_PAGESIZE");
+		page_size = LONG_MAX;
+		WARN("Fallback page size to %ld", page_size);
+	}
+
 	/* Parse arguments */
 	progname = argv[0];
 	if ((ret = parse_args(argc, argv)) < 0) {