Fix: clarify tracefile size/count in lttng.1 man

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 528665a141680d70d94bb979f5c76583bf454790..9b7306b794668b0b75831306a0a3eeacc9f20625 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -754,7 +754,7 @@ static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
 
        /* Setup kernel consumer socket and send fds to it */
        ret = init_kernel_tracing(ksess);
-       if (ret < 0) {
+       if (ret != 0) {
                ret = LTTNG_ERR_KERN_START_FAIL;
                goto error;
        }
@@ -1553,7 +1553,7 @@ int cmd_stop_trace(struct ltt_session *session)
        session->enabled = 0;
 
        /* Kernel tracer */
-       if (ksession) {
+       if (ksession && ksession->started) {
                DBG("Stop kernel tracing");
 
                /* Flush metadata if exist */
@@ -1583,7 +1583,7 @@ int cmd_stop_trace(struct ltt_session *session)
                ksession->started = 0;
        }
 
-       if (usess) {
+       if (usess && usess->start_trace) {
                usess->start_trace = 0;
 
                ret = ust_app_stop_trace_all(usess);
@@ -1831,7 +1831,7 @@ int cmd_register_consumer(struct ltt_session *session, int domain,
                const char *sock_path, struct consumer_data *cdata)
 {
        int ret, sock;
-       struct consumer_socket *socket;
+       struct consumer_socket *socket = NULL;
 
        assert(session);
        assert(cdata);
@@ -1891,9 +1891,12 @@ int cmd_register_consumer(struct ltt_session *session, int domain,
                goto error;
        }
 
-       ret = LTTNG_OK;
+       return LTTNG_OK;
 
 error:
+       if (socket) {
+               consumer_destroy_socket(socket);
+       }
        return ret;
 }