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

[lttng-tools.git] / src / bin / lttng / commands / stop.c

diff --git a/src/bin/lttng/commands/stop.c b/src/bin/lttng/commands/stop.c
index 6ed67fdabcaaf0194cbbe911c3853609aa3720de..cb45f12ce56085a15bd2cdc5f52ca1fd41a69c72 100644 (file)
--- a/src/bin/lttng/commands/stop.c
+++ b/src/bin/lttng/commands/stop.c
@@ -29,6 +29,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 
 static char *opt_session_name;
+static int opt_no_wait;
 
 enum {
        OPT_HELP = 1,
@@ -39,6 +40,7 @@ static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
        {"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
        {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
+       {"no-wait",   'n', POPT_ARG_VAL, &opt_no_wait, 1, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -47,13 +49,15 @@ static struct poptOption long_options[] = {
  */
 static void usage(FILE *ofp)
 {
-       fprintf(ofp, "usage: lttng stop [options] [NAME]\n");
+       fprintf(ofp, "usage: lttng stop [NAME] [OPTIONS]\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Where NAME is an optional session name. If not specified, lttng will\n");
        fprintf(ofp, "get it from the configuration directory (.lttng).\n");
        fprintf(ofp, "\n");
+       fprintf(ofp, "Options:\n");
        fprintf(ofp, "  -h, --help               Show this help\n");
        fprintf(ofp, "      --list-options       Simple listing of options\n");
+       fprintf(ofp, "  -n, --no-wait            Don't wait for data availability\n");
        fprintf(ofp, "\n");
 }
 
@@ -75,10 +79,10 @@ static int stop_tracing(void)
                session_name = opt_session_name;
        }
 
-       ret = lttng_stop_tracing(session_name);
+       ret = lttng_stop_tracing_no_wait(session_name);
        if (ret < 0) {
                switch (-ret) {
-               case LTTCOMM_TRACE_ALREADY_STOPPED:
+               case LTTNG_ERR_TRACE_ALREADY_STOPPED:
                        WARN("Tracing already stopped for session %s", session_name);
                        break;
                default:
@@ -88,6 +92,29 @@ static int stop_tracing(void)
                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);