Change lttng API to use a lttng_handle

[lttng-tools.git] / lttng / commands / start.c

diff --git a/lttng/commands/start.c b/lttng/commands/start.c
index 3a4febe4f86bf7099b9df6d98ae2f8cf1ba8729d..312e94ed2f6b4b49dcac98dc77af414fb05555dc 100644 (file)
--- a/lttng/commands/start.c
+++ b/lttng/commands/start.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 "config.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},
@@ -75,9 +77,15 @@ static int start_tracing(void)
                session_name = opt_session_name;
        }
 
+       handle = lttng_create_handle(session_name, NULL);
+       if (handle == NULL) {
+               ret = -1;
+               goto error;
+       }
+
        DBG("Starting tracing for session %s", session_name);
 
-       ret = lttng_start_tracing(session_name);
+       ret = lttng_start_tracing(handle);
        if (ret < 0) {
                goto free_name;
        }
@@ -85,8 +93,12 @@ static int start_tracing(void)
        MSG("Tracing started 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;
 }