Add close unix socket function to libcomm API

[lttng-tools.git] / lttng / lttng.c

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 9ef92a7d418418bf005361084421920c409989e3..40cf52bc6a3b02059a1ea8635c412737f8a5f71f 100644 (file)
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -357,6 +357,9 @@ static void sighandler(int sig)
 void clean_exit(int code)
 {
        DBG("Clean exit");
 void clean_exit(int code)
 {
        DBG("Clean exit");

+       if (lttng_disconnect_sessiond() < 0) {
+               ERR("Session daemon disconnect failed.");
+       }

        exit(code);
 }
 
        exit(code);
 }
 


@@ -376,12 +379,12 @@ int main(int argc, char *argv[])
 
        ret = parse_args(argc, (const char **) argv);
        if (ret < 0) {
 
        ret = parse_args(argc, (const char **) argv);
        if (ret < 0) {

-               return EXIT_FAILURE;
+               clean_exit(EXIT_FAILURE);

        }
 
        ret = set_signal_handler();
        if (ret < 0) {
        }
 
        ret = set_signal_handler();
        if (ret < 0) {

-               return ret;
+               clean_exit(ret);

        }
 
        if (opt_tracing_group != NULL) {
        }
 
        if (opt_tracing_group != NULL) {


@@ -394,7 +397,7 @@ int main(int argc, char *argv[])
                DBG("Kernel tracing activated");
                if (getuid() != 0) {
                        ERR("%s must be setuid root", progname);
                DBG("Kernel tracing activated");
                if (getuid() != 0) {
                        ERR("%s must be setuid root", progname);

-                       return -EPERM;
+                       clean_exit(-EPERM);

                }
        }
 
                }
        }
 


@@ -402,13 +405,15 @@ int main(int argc, char *argv[])
         * If no, a daemon will be spawned.
         */
        if (opt_no_sessiond == 0 && (check_ltt_sessiond() < 0)) {
         * If no, a daemon will be spawned.
         */
        if (opt_no_sessiond == 0 && (check_ltt_sessiond() < 0)) {

-               return EXIT_FAILURE;
+               clean_exit(EXIT_FAILURE);

        }
 
        ret = process_client_opt();
        if (ret < 0) {
        }
 
        ret = process_client_opt();
        if (ret < 0) {

-               return ret;
+               clean_exit(ret);

        }
 
        }
 

+       clean_exit(0);
+

        return 0;
 }
        return 0;
 }