X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommand.h;h=b4444b34fdf7931c9ca55be1dc47ae6454a57678;hp=05c51663b90e011d3174100e04915593a365f8d2;hb=511ed4e25eeb6821dc4f4b6c573fbbdc07c17053;hpb=4ba92f185fb1d0b112cbc804a261939f5f81dc34

diff --git a/src/bin/lttng/command.h b/src/bin/lttng/command.h
index 05c51663b..b4444b34f 100644
--- a/src/bin/lttng/command.h
+++ b/src/bin/lttng/command.h
@@ -28,13 +28,21 @@
 #define DECL_COMMAND(_name) \
 	extern int cmd_##_name(int, const char **)
 
+#ifdef LTTNG_EMBED_HELP
+# define HELP_MSG_NAME		help_msg
+# define SHOW_HELP_ERROR_LINE	ERR("Cannot show --help for `lttng-%s`", argv[0]);
+#else
+# define HELP_MSG_NAME		NULL
+# define SHOW_HELP_ERROR_LINE	;
+#endif
+
 #define SHOW_HELP() 							\
 	do {								\
-		ret = show_cmd_man_page(argv[0]);			\
+		ret = show_cmd_help(argv[0], HELP_MSG_NAME);		\
 									\
 		if (ret) {						\
-			ERR("Cannot view man page lttng-%s(1)", argv[0]); \
-			perror("exec");					\
+			SHOW_HELP_ERROR_LINE 				\
+			ret = CMD_ERROR;				\
 		}							\
 	} while (0)
 
@@ -65,7 +73,6 @@ DECL_COMMAND(disable_channels);
 DECL_COMMAND(add_context);
 DECL_COMMAND(set_session);
 DECL_COMMAND(version);
-DECL_COMMAND(calibrate);
 DECL_COMMAND(view);
 DECL_COMMAND(enable_consumer);
 DECL_COMMAND(disable_consumer);
@@ -75,5 +82,13 @@ DECL_COMMAND(load);
 DECL_COMMAND(track);
 DECL_COMMAND(untrack);
 DECL_COMMAND(metadata);
+DECL_COMMAND(regenerate);
+DECL_COMMAND(rotate);
+DECL_COMMAND(enable_rotation);
+DECL_COMMAND(disable_rotation);
+DECL_COMMAND(clear);
+
+extern int cmd_help(int argc, const char **argv,
+		const struct cmd_struct commands[]);
 
 #endif /* _LTTNG_CMD_H */