Rename "global" sock_info field to "multi_user"

[lttng-ust.git] / src / lib / lttng-ust / lttng-ust-comm.c

diff --git a/src/lib/lttng-ust/lttng-ust-comm.c b/src/lib/lttng-ust/lttng-ust-comm.c
index 0fe2da466ad1cce241b0b82efd864e651223341e..ccf2a9b816e00920f92850a927bbdf6205c944b6 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-comm.c
+++ b/src/lib/lttng-ust/lttng-ust-comm.c
@@ -257,7 +257,7 @@ struct sock_info {
        int root_handle;
        int registration_done;
        int allowed;
-       int global;
+       bool multi_user;
        int thread_active;
 
        char sock_path[PATH_MAX];
@@ -276,7 +276,7 @@ struct sock_info {
 /* Socket from app (connect) to session daemon (listen) for communication */
 static struct sock_info global_apps = {
        .name = "global",
-       .global = 1,
+       .multi_user = true,
 
        .root_handle = -1,
        .registration_done = 0,
@@ -298,7 +298,7 @@ static struct sock_info global_apps = {
 
 static struct sock_info local_apps = {
        .name = "local",
-       .global = 0,
+       .multi_user = false,
        .root_handle = -1,
        .registration_done = 0,
        .allowed = 0,   /* Check setuid bit first */
@@ -389,13 +389,13 @@ const char *get_lttng_home_dir(void)
 static
 void lttng_ust_nest_count_alloc_tls(void)
 {
-       asm volatile ("" : : "m" (URCU_TLS(lttng_ust_nest_count)));
+       __asm__ __volatile__ ("" : : "m" (URCU_TLS(lttng_ust_nest_count)));
 }
 
 static
 void lttng_ust_mutex_nest_alloc_tls(void)
 {
-       asm volatile ("" : : "m" (URCU_TLS(ust_mutex_nest)));
+       __asm__ __volatile__ ("" : : "m" (URCU_TLS(ust_mutex_nest)));
 }
 
 /*
@@ -1584,14 +1584,14 @@ open_write:
        pid = fork();
        URCU_TLS(lttng_ust_nest_count)--;
        if (pid > 0) {
-               int status;
+               int status, wait_ret;
 
                /*
                 * Parent: wait for child to return, in which case the
                 * shared memory map will have been created.
                 */
-               pid = wait(&status);
-               if (pid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+               wait_ret = waitpid(pid, &status, 0);
+               if (wait_ret < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
                        wait_shm_fd = -1;
                        goto end;
                }
@@ -1613,7 +1613,7 @@ open_write:
 
                /* Child */
                create_mode = S_IRUSR | S_IWUSR | S_IRGRP;
-               if (sock_info->global)
+               if (sock_info->multi_user)
                        create_mode |= S_IROTH | S_IWGRP | S_IWOTH;
                /*
                 * We're alone in a child process, so we can modify the
@@ -1643,7 +1643,7 @@ open_write:
                 * sessiond will be able to override all rights and wake
                 * us up.
                 */
-               if (!sock_info->global && errno != EACCES) {
+               if (!sock_info->multi_user && errno != EACCES) {
                        ERR("Error opening shm %s", sock_info->wait_shm_path);
                        _exit(EXIT_FAILURE);
                }
@@ -1656,7 +1656,7 @@ open_write:
                return -1;
        }
 end:
-       if (wait_shm_fd >= 0 && !sock_info->global) {
+       if (wait_shm_fd >= 0 && !sock_info->multi_user) {
                struct stat statbuf;
 
                /*