cancel global thread at exit

[lttng-ust.git] / libust / lttng-ust-comm.c

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index c1b520a7c129fc40ade32381537314a348c67d0d..13b3895e40127b7a57c9ff6b5081545dcb093d2b 100644 (file)
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -124,6 +124,7 @@ int register_app_to_sessiond(int socket)
                pid_t pid;
                pid_t ppid;
                uid_t uid;
+               gid_t gid;
                char name[16];  /* process name */
        } reg_msg;
 
@@ -132,6 +133,7 @@ int register_app_to_sessiond(int socket)
        reg_msg.pid = getpid();
        reg_msg.ppid = getppid();
        reg_msg.uid = getuid();
+       reg_msg.gid = getgid();
        prctl_ret = prctl(PR_GET_NAME, (unsigned long) reg_msg.name, 0, 0, 0);
        if (prctl_ret) {
                ERR("Error executing prctl");
@@ -499,12 +501,10 @@ void __attribute__((destructor)) lttng_ust_exit(void)
        lttng_ust_comm_should_quit = 1;
        pthread_mutex_unlock(&lttng_ust_comm_mutex);
 
-#if 0
        ret = pthread_cancel(global_apps.ust_listener);
        if (ret) {
                ERR("Error cancelling global ust listener thread");
        }
-#endif //0
 
        cleanup_sock_info(&global_apps);