X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=af1d3f4882cfd7fc6894257099a85f785cd5f6b0;hb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5;hp=aaee5a25d243d4c828d4f82434cd508a8a0e80d0;hpb=77927271f4b396ec3cb9e8e380c26d19e3589558;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index aaee5a25d..af1d3f488 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
+ * 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, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -43,7 +33,7 @@ NULL
 ;
 
 /* Variables */
-static char *progname;
+static const char *progname;
 int opt_no_sessiond;
 char *opt_sessiond_path;
 
@@ -75,7 +65,9 @@ static struct option long_options[] = {
 /* First level command */
 static struct cmd_struct commands[] =  {
 	{ "add-context", cmd_add_context},
+	{ "add-trigger", cmd_add_trigger},
 	{ "create", cmd_create},
+	{ "clear", cmd_clear},
 	{ "destroy", cmd_destroy},
 	{ "disable-channel", cmd_disable_channels},
 	{ "disable-event", cmd_disable_events},
@@ -83,9 +75,11 @@ static struct cmd_struct commands[] =  {
 	{ "enable-event", cmd_enable_events},
 	{ "help", NULL},
 	{ "list", cmd_list},
+	{ "list-triggers", cmd_list_triggers},
 	{ "load", cmd_load},
 	{ "metadata", cmd_metadata},
 	{ "regenerate", cmd_regenerate},
+	{ "remove-trigger", cmd_remove_trigger},
 	{ "rotate", cmd_rotate},
 	{ "enable-rotation", cmd_enable_rotation},
 	{ "disable-rotation", cmd_disable_rotation},
@@ -104,9 +98,10 @@ static struct cmd_struct commands[] =  {
 
 static void version(FILE *ofp)
 {
-	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s\n",
+	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s%s\n",
 			progname,
-			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+			EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
 }
 
 /*
@@ -277,8 +272,9 @@ static void show_basic_help(void)
 	puts("");
 	puts("Available commands:");
 	puts("");
-	puts("Tracing sessions:");
+	puts("Recording sessions:");
 	puts("  create            " CONFIG_CMD_DESCR_CREATE);
+	puts("  clear             " CONFIG_CMD_DESCR_CLEAR);
 	puts("  destroy           " CONFIG_CMD_DESCR_DESTROY);
 	puts("  load              " CONFIG_CMD_DESCR_LOAD);
 	puts("  regenerate        " CONFIG_CMD_DESCR_REGENERATE);
@@ -290,7 +286,7 @@ static void show_basic_help(void)
 	puts("  disable-channel   " CONFIG_CMD_DESCR_DISABLE_CHANNEL);
 	puts("  enable-channel    " CONFIG_CMD_DESCR_ENABLE_CHANNEL);
 	puts("");
-	puts("Event rules:");
+	puts("Recording event rules:");
 	puts("  disable-event     " CONFIG_CMD_DESCR_DISABLE_EVENT);
 	puts("  enable-event      " CONFIG_CMD_DESCR_ENABLE_EVENT);
 	puts("");
@@ -303,7 +299,7 @@ static void show_basic_help(void)
 	puts("  start             " CONFIG_CMD_DESCR_START);
 	puts("  stop              " CONFIG_CMD_DESCR_STOP);
 	puts("");
-	puts("Tracing session rotation:");
+	puts("Recording session rotation:");
 	puts("  disable-rotation  " CONFIG_CMD_DESCR_DISABLE_ROTATION);
 	puts("  enable-rotation   " CONFIG_CMD_DESCR_ENABLE_ROTATION);
 	puts("  rotate            " CONFIG_CMD_DESCR_ROTATE);
@@ -312,6 +308,11 @@ static void show_basic_help(void)
 	puts("  track             " CONFIG_CMD_DESCR_TRACK);
 	puts("  untrack           " CONFIG_CMD_DESCR_UNTRACK);
 	puts("");
+	puts("Triggers:");
+	puts("  add-trigger       " CONFIG_CMD_DESCR_ADD_TRIGGER);
+	puts("  remove-trigger    " CONFIG_CMD_DESCR_REMOVE_TRIGGER);
+	puts("  list-triggers     " CONFIG_CMD_DESCR_LIST_TRIGGERS);
+	puts("");
 	puts("Miscellaneous:");
 	puts("  help              " CONFIG_CMD_DESCR_HELP);
 	puts("  version           " CONFIG_CMD_DESCR_VERSION);