X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=6830d86d100ac4ad4e49b5458f2518b463d609cc;hb=cbef69018acdeb52d27529e80126b43f3733e233;hp=71bf716a3ab263e6ee34b5443f64e7ece712be41;hpb=b115631f8ae20c4261491c20a88af496f6341e60;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 71bf716a..6830d86d 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -37,14 +37,14 @@
 #include <signal.h>
 #include <urcu/uatomic.h>
 #include <urcu/futex.h>
+#include <urcu/compiler.h>
 
-#include <lttng/ust-comm.h>
 #include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
 #include <lttng/ust-abi.h>
-#include <lttng/tracepoint.h>
-#include <lttng/tracepoint-internal.h>
 #include <lttng/ust.h>
+#include <ust-comm.h>
+#include <usterr-signal-safe.h>
+#include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 
 /*
@@ -167,6 +167,7 @@ int register_app_to_sessiond(int socket)
 		pid_t ppid;
 		uid_t uid;
 		gid_t gid;
+		uint32_t bits_per_long;
 		char name[16];	/* process name */
 	} reg_msg;
 
@@ -176,6 +177,7 @@ int register_app_to_sessiond(int socket)
 	reg_msg.ppid = getppid();
 	reg_msg.uid = getuid();
 	reg_msg.gid = getgid();
+	reg_msg.bits_per_long = CAA_BITS_PER_LONG;
 	prctl_ret = prctl(PR_GET_NAME, (unsigned long) reg_msg.name, 0, 0, 0);
 	if (prctl_ret) {
 		ERR("Error executing prctl");
@@ -301,13 +303,11 @@ end:
 		shm_fd = lum->u.channel.shm_fd;
 		wait_fd = lum->u.channel.wait_fd;
 		break;
-	case LTTNG_UST_VERSION:
+	case LTTNG_UST_TRACER_VERSION:
 		lur.u.version = lum->u.version;
 		break;
 	case LTTNG_UST_TRACEPOINT_LIST_GET:
-		memcpy(lur.u.tracepoint_list_entry,
-			lum->u.tracepoint_list_entry,
-			LTTNG_UST_SYM_NAME_LEN);
+		memcpy(&lur.u.tracepoint, &lum->u.tracepoint, sizeof(lur.u.tracepoint));
 		break;
 	}
 	ret = send_reply(sock, &lur);
@@ -681,6 +681,20 @@ restart:
 		switch (len) {
 		case 0:	/* orderly shutdown */
 			DBG("%s ltt-sessiond has performed an orderly shutdown\n", sock_info->name);
+			ust_lock();
+			/*
+			 * Either sessiond has shutdown or refused us by closing the socket.
+			 * In either case, we don't want to delay construction execution,
+			 * and we need to wait before retry.
+			 */
+			prev_connect_failed = 1;
+			/*
+			 * If we cannot register to the sessiond daemon, don't
+			 * delay constructor execution.
+			 */
+			ret = handle_register_done(sock_info);
+			assert(!ret);
+			ust_unlock();
 			goto end;
 		case sizeof(lum):
 			DBG("message received\n");
@@ -690,6 +704,7 @@ restart:
 			}
 			continue;
 		case -1:
+			DBG("Receive failed from lttng-sessiond with errno %d", errno);
 			if (errno == ECONNRESET) {
 				ERR("%s remote end closed connection\n", sock_info->name);
 				goto end;
@@ -876,7 +891,7 @@ void __attribute__((destructor)) lttng_ust_exit(void)
  * in the middle of an tracepoint or ust tracing state modification.
  * Holding this mutex protects these structures across fork and clone.
  */
-void ust_before_fork(ust_fork_info_t *fork_info)
+void ust_before_fork(sigset_t *save_sigset)
 {
 	/*
 	 * Disable signals. This is to avoid that the child intervenes
@@ -889,7 +904,7 @@ void ust_before_fork(ust_fork_info_t *fork_info)
 
 	/* Disable signals */
 	sigfillset(&all_sigs);
-	ret = sigprocmask(SIG_BLOCK, &all_sigs, &fork_info->orig_sigs);
+	ret = sigprocmask(SIG_BLOCK, &all_sigs, save_sigset);
 	if (ret == -1) {
 		PERROR("sigprocmask");
 	}
@@ -897,25 +912,25 @@ void ust_before_fork(ust_fork_info_t *fork_info)
 	rcu_bp_before_fork();
 }
 
-static void ust_after_fork_common(ust_fork_info_t *fork_info)
+static void ust_after_fork_common(sigset_t *restore_sigset)
 {
 	int ret;
 
 	DBG("process %d", getpid());
 	ust_unlock();
 	/* Restore signals */
-	ret = sigprocmask(SIG_SETMASK, &fork_info->orig_sigs, NULL);
+	ret = sigprocmask(SIG_SETMASK, restore_sigset, NULL);
 	if (ret == -1) {
 		PERROR("sigprocmask");
 	}
 }
 
-void ust_after_fork_parent(ust_fork_info_t *fork_info)
+void ust_after_fork_parent(sigset_t *restore_sigset)
 {
 	DBG("process %d", getpid());
 	rcu_bp_after_fork_parent();
 	/* Release mutexes and reenable signals */
-	ust_after_fork_common(fork_info);
+	ust_after_fork_common(restore_sigset);
 }
 
 /*
@@ -927,7 +942,7 @@ void ust_after_fork_parent(ust_fork_info_t *fork_info)
  * This is meant for forks() that have tracing in the child between the
  * fork and following exec call (if there is any).
  */
-void ust_after_fork_child(ust_fork_info_t *fork_info)
+void ust_after_fork_child(sigset_t *restore_sigset)
 {
 	DBG("process %d", getpid());
 	/* Release urcu mutexes */
@@ -935,6 +950,6 @@ void ust_after_fork_child(ust_fork_info_t *fork_info)
 	lttng_ust_cleanup(0);
 	lttng_context_vtid_reset();
 	/* Release mutexes and reenable signals */
-	ust_after_fork_common(fork_info);
+	ust_after_fork_common(restore_sigset);
 	lttng_ust_init();
 }