/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * 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.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <popt.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
+#include <assert.h>
+
+#include <common/sessiond-comm/sessiond-comm.h>
+#include <common/mi-lttng.h>
#include "../command.h"
static char *opt_session_name;
+static int opt_no_wait;
+static struct mi_writer *writer;
enum {
OPT_HELP = 1,
/* 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}
};
*/
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");
}
+/*
+ * Mi print of partial session
+ */
+static int mi_print_session(char *session_name, int enabled)
+{
+ int ret;
+ assert(writer);
+ assert(session_name);
+
+ /* Open session element */
+ ret = mi_lttng_writer_open_element(writer, config_element_session);
+ if (ret) {
+ goto end;
+ }
+
+ /* Print session name element */
+ ret = mi_lttng_writer_write_element_string(writer, config_element_name,
+ session_name);
+ if (ret) {
+ goto end;
+ }
+
+ /* Is enabled ? */
+ ret = mi_lttng_writer_write_element_bool(writer, config_element_enabled,
+ enabled);
+ if (ret) {
+ goto end;
+ }
+
+ /* Close session element */
+ ret = mi_lttng_writer_close_element(writer);
+
+end:
+ return ret;
+}
/*
* Start tracing for all trace of the session.
*/
static int stop_tracing(void)
{
- int ret = CMD_SUCCESS;
+ int ret;
char *session_name;
if (opt_session_name == NULL) {
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 LTTNG_ERR_TRACE_ALREADY_STOPPED:
+ WARN("Tracing already stopped for session %s", session_name);
+ break;
+ default:
+ ERR("%s", lttng_strerror(ret));
+ break;
+ }
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 free_name;
+ }
+
+ /*
+ * 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);
+ if (lttng_opt_mi) {
+ ret = mi_print_session(session_name, 0);
+ if (ret) {
+ goto free_name;
+ }
+ }
free_name:
if (opt_session_name == NULL) {
*/
int cmd_stop(int argc, const char **argv)
{
- int opt, ret = CMD_SUCCESS;
+ int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1;
static poptContext pc;
pc = poptGetContext(NULL, argc, argv, long_options, 0);
}
}
+ /* Mi check */
+ if (lttng_opt_mi) {
+ writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
+ if (!writer) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+
+ /* Open command element */
+ ret = mi_lttng_writer_command_open(writer,
+ mi_lttng_element_command_stop);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto end;
+ }
+
+ /* Open output element */
+ ret = mi_lttng_writer_open_element(writer,
+ mi_lttng_element_command_output);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto end;
+ }
+
+ /*
+ * Open sessions element
+ * For validation
+ */
+ ret = mi_lttng_writer_open_element(writer,
+ config_element_sessions);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto end;
+ }
+ }
+
opt_session_name = (char*) poptGetArg(pc);
- ret = stop_tracing();
+ command_ret = stop_tracing();
+ if (command_ret) {
+ success = 0;
+ }
+
+ /* Mi closing */
+ if (lttng_opt_mi) {
+ /* Close sessions and output element */
+ ret = mi_lttng_close_multi_element(writer, 2);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto end;
+ }
+
+ /* Success ? */
+ ret = mi_lttng_writer_write_element_bool(writer,
+ mi_lttng_element_command_success, success);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto end;
+ }
+
+ /* Command element close */
+ ret = mi_lttng_writer_command_close(writer);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto end;
+ }
+ }
end:
+ /* Mi clean-up */
+ if (writer && mi_lttng_writer_destroy(writer)) {
+ /* Preserve original error code */
+ ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL;
+ }
+
+ /* Overwrite ret if an error occurred in stop_tracing() */
+ ret = command_ret ? command_ret : ret;
+
poptFreeContext(pc);
return ret;
}