X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fltt-sessiond.c;h=6877acccbef7b8f106685c268679381c714c095f;hp=08d1555a8a45f39148c638236d864ff6a863e6b8;hb=686204ab689fc20afc4aaf014f1f4a877b1e581d;hpb=fac6795d6e2c60e79bdc7dab42da94d2025a57d3 diff --git a/ltt-sessiond/ltt-sessiond.c b/ltt-sessiond/ltt-sessiond.c index 08d1555a8..6877acccb 100644 --- a/ltt-sessiond/ltt-sessiond.c +++ b/ltt-sessiond/ltt-sessiond.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011 - David Goulet +/* + * Copyright (C) 2011 - David Goulet * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -13,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * */ #define _GNU_SOURCE @@ -39,6 +39,11 @@ #include "liblttsessiondcomm.h" #include "ltt-sessiond.h" +const char default_home_dir[] = DEFAULT_HOME_DIR; +const char default_tracing_group[] = DEFAULT_TRACING_GROUP; +const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR; +const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; + /* Static functions */ static int set_signal_handler(void); static int set_socket_perms(void); @@ -94,11 +99,11 @@ static void *thread_manage_apps(void *data) struct ltt_traceable_app *lta; /* TODO: Something more elegant is needed but fine for now */ - struct { + struct { int reg; /* 1:register, 0:unregister */ - pid_t pid; - uid_t uid; - } reg_msg; + pid_t pid; + uid_t uid; + } reg_msg; /* Notify all applications to register */ notify_apps(default_global_apps_pipe); @@ -595,7 +600,7 @@ static const char *get_home_dir(void) { const char *home_path; - if ((home_path = (const char*) getenv("HOME")) == NULL) { + if ((home_path = (const char *) getenv("HOME")) == NULL) { home_path = default_home_dir; } @@ -724,6 +729,7 @@ static void sighandler(int sig) case SIGINT: case SIGTERM: cleanup(); + break; default: break; }