Fix: Don't output to stdout from lttng-ctl

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng/commands/stop.c b/src/bin/lttng/commands/stop.c
index 60a1dac8fe8ca4db4fd58c19d7d4a904012acd70..cb45f12ce56085a15bd2cdc5f52ca1fd41a69c72 100644 (file)
--- a/src/bin/lttng/commands/stop.c
+++ b/src/bin/lttng/commands/stop.c
@@ -79,11 +79,7 @@ static int stop_tracing(void)
                session_name = opt_session_name;
        }
 
                session_name = opt_session_name;
        }
 

-       if (opt_no_wait) {
-               ret = lttng_stop_tracing_no_wait(session_name);
-       } else {
-               ret = lttng_stop_tracing(session_name);
-       }
+       ret = lttng_stop_tracing_no_wait(session_name);

        if (ret < 0) {
                switch (-ret) {
                case LTTNG_ERR_TRACE_ALREADY_STOPPED:
        if (ret < 0) {
                switch (-ret) {
                case LTTNG_ERR_TRACE_ALREADY_STOPPED:


@@ -96,6 +92,29 @@ static int stop_tracing(void)
                goto free_name;
        }
 
                goto free_name;
        }
 

+       if (!opt_no_wait) {
+               _MSG("Waiting for data availability");
+               fflush(stdout);
+               do {
+                       ret = lttng_data_pending(session_name);
+                       if (ret < 0) {
+                               /* Return the data available call error. */
+                               goto error;
+                       }
+
+                       /*
+                        * Data sleep time before retrying (in usec). Don't sleep if the call
+                        * returned value indicates availability.
+                        */
+                       if (ret) {
+                               usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
+                               _MSG(".");
+                               fflush(stdout);
+                       }
+               } while (ret != 0);
+               MSG("");
+       }
+

        ret = CMD_SUCCESS;
 
        MSG("Tracing stopped for session %s", session_name);
        ret = CMD_SUCCESS;
 
        MSG("Tracing stopped for session %s", session_name);

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 756fd6b590ef80bd89c7f8fabbdf67f765d4e135..272c70299b089fe79fda1ab17369f10d69eb9b26 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -579,9 +579,6 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
                goto end;
        }
 
                goto end;
        }
 

-       _MSG("Waiting for data availability");
-       fflush(stdout);
-

        /* Check for data availability */
        do {
                data_ret = lttng_data_pending(session_name);
        /* Check for data availability */
        do {
                data_ret = lttng_data_pending(session_name);


@@ -597,13 +594,9 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
                 */
                if (data_ret) {
                        usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
                 */
                if (data_ret) {
                        usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);

-                       _MSG(".");
-                       fflush(stdout);

                }
        } while (data_ret != 0);
 
                }
        } while (data_ret != 0);
 

-       MSG("");
-

 end:
 error:
        return ret;
 end:
 error:
        return ret;