X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fstop.c;h=b40a63881b297188efc2a074bdefcd4a3c4cdcfa;hp=56edc2d6de64010d6c701645d375d075bed645be;hb=cd80958d00fddabced5fbd60641978516a01e29e;hpb=beb8c75afd91bc32f2e7a9c124c9a21ecffd1486

diff --git a/lttng/commands/stop.c b/lttng/commands/stop.c
index 56edc2d6d..b40a63881 100644
--- a/lttng/commands/stop.c
+++ b/lttng/commands/stop.c
@@ -3,8 +3,8 @@
  *
  * 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; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,9 +25,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_session_name;
 
@@ -35,6 +35,8 @@ enum {
 	OPT_HELP = 1,
 };
 
+static struct lttng_handle *handle;
+
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
@@ -56,9 +58,7 @@ static void usage(FILE *ofp)
 }
 
 /*
- *  stop_tracing
- *
- *  Start tracing for all trace of the session.
+ * Start tracing for all trace of the session.
  */
 static int stop_tracing(void)
 {
@@ -75,7 +75,13 @@ static int stop_tracing(void)
 		session_name = opt_session_name;
 	}
 
-	ret = lttng_stop_tracing(session_name);
+	handle = lttng_create_handle(session_name, NULL);
+	if (handle == NULL) {
+		ret = -1;
+		goto error;
+	}
+
+	ret = lttng_stop_tracing(handle);
 	if (ret < 0) {
 		goto free_name;
 	}
@@ -83,8 +89,13 @@ static int stop_tracing(void)
 	MSG("Tracing stopped for session %s", session_name);
 
 free_name:
-	free(session_name);
+	if (opt_session_name == NULL) {
+		free(session_name);
+	}
+
 error:
+	lttng_destroy_handle(handle);
+
 	return ret;
 }