Rename cmd.h for command.h

Also move utils.h and conf.h inside the command.h because every lttng
cli commands are using those headers.

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng/cmd.h b/src/bin/lttng/cmd.h
deleted file mode 100644 (file)
index f66d6d9..0000000
--- a/src/bin/lttng/cmd.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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 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.
- */
-
-#ifndef _LTTNG_CMD_H
-#define _LTTNG_CMD_H
-
-#include <lttng/lttng.h>
-#include <common/lttngerr.h>
-#include <common/lttng-share.h>
-
-enum cmd_error_code {
-       CMD_SUCCESS,
-       CMD_ERROR,
-       CMD_UNDEFINED,
-       CMD_NOT_IMPLEMENTED,
-       CMD_FATAL,
-};
-
-struct cmd_struct {
-       const char *name;
-       int (*func)(int argc, const char **argv);
-};
-
-extern int cmd_list(int argc, const char **argv);
-extern int cmd_create(int argc, const char **argv);
-extern int cmd_destroy(int argc, const char **argv);
-extern int cmd_start(int argc, const char **argv);
-extern int cmd_stop(int argc, const char **argv);
-extern int cmd_enable_events(int argc, const char **argv);
-extern int cmd_disable_events(int argc, const char **argv);
-extern int cmd_enable_channels(int argc, const char **argv);
-extern int cmd_disable_channels(int argc, const char **argv);
-extern int cmd_add_context(int argc, const char **argv);
-extern int cmd_set_session(int argc, const char **argv);
-extern int cmd_version(int argc, const char **argv);
-extern int cmd_calibrate(int argc, const char **argv);
-
-#endif /* _LTTNG_CMD_H */

diff --git a/src/bin/lttng/command.h b/src/bin/lttng/command.h
new file mode 100644 (file)
index 0000000..d7670f2
--- /dev/null
+++ b/src/bin/lttng/command.h
@@ -0,0 +1,56 @@
+/*
+ * 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 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.
+ */
+
+#ifndef _LTTNG_CMD_H
+#define _LTTNG_CMD_H
+
+#include <lttng/lttng.h>
+#include <common/lttngerr.h>
+#include <common/lttng-share.h>
+
+#include "conf.h"
+#include "utils.h"
+
+enum cmd_error_code {
+       CMD_SUCCESS,
+       CMD_ERROR,
+       CMD_UNDEFINED,
+       CMD_NOT_IMPLEMENTED,
+       CMD_FATAL,
+};
+
+struct cmd_struct {
+       const char *name;
+       int (*func)(int argc, const char **argv);
+};
+
+extern int cmd_list(int argc, const char **argv);
+extern int cmd_create(int argc, const char **argv);
+extern int cmd_destroy(int argc, const char **argv);
+extern int cmd_start(int argc, const char **argv);
+extern int cmd_stop(int argc, const char **argv);
+extern int cmd_enable_events(int argc, const char **argv);
+extern int cmd_disable_events(int argc, const char **argv);
+extern int cmd_enable_channels(int argc, const char **argv);
+extern int cmd_disable_channels(int argc, const char **argv);
+extern int cmd_add_context(int argc, const char **argv);
+extern int cmd_set_session(int argc, const char **argv);
+extern int cmd_version(int argc, const char **argv);
+extern int cmd_calibrate(int argc, const char **argv);
+
+#endif /* _LTTNG_CMD_H */

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index 2d9699ce2c2b4bed3159d5d8b3af8426fecae96e..23ae8f2a87ec6f414cf29c6b2b97498ae4176874 100644 (file)
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -28,9 +28,7 @@
 
 #include <urcu/list.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 #define PRINT_LINE_LEN 80
 

diff --git a/src/bin/lttng/commands/calibrate.c b/src/bin/lttng/commands/calibrate.c
index 3fa87e3ecf47f52fbab0d938525aa37bd68d129e..ee2c76af1bb9ab879163c2e2450b1db4ab8425b9 100644 (file)
--- a/src/bin/lttng/commands/calibrate.c
+++ b/src/bin/lttng/commands/calibrate.c
@@ -28,9 +28,7 @@
 #include <inttypes.h>
 #include <ctype.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static int opt_event_type;
 static char *opt_kernel;

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 4083e4195633a609ceba1ee2c28eb55d3bedff2d..835d82a4f9d7c7b9523a574fb0ef6cda53f8de5f 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -26,9 +26,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_output_path;
 static char *opt_session_name;

diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c
index 151686ff9061b157fa9b33aadd8c6924550e534b..b7931595879b607dca82186f36905f7f6335abd2 100644 (file)
--- a/src/bin/lttng/commands/destroy.c
+++ b/src/bin/lttng/commands/destroy.c
@@ -25,9 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_session_name;
 

diff --git a/src/bin/lttng/commands/disable_channels.c b/src/bin/lttng/commands/disable_channels.c
index 59ad9fc28f97929526951df06f7b8bcd7d69cb09..f2e181971b50993ecd423a343e9d4615ad26d940 100644 (file)
--- a/src/bin/lttng/commands/disable_channels.c
+++ b/src/bin/lttng/commands/disable_channels.c
@@ -25,9 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_channels;
 static int opt_kernel;

diff --git a/src/bin/lttng/commands/disable_events.c b/src/bin/lttng/commands/disable_events.c
index 5247110ef3ca67a0c514a6110b0762564f8f8eb3..0e53b4228fb1439b67685b16a0be17199c2e16a3 100644 (file)
--- a/src/bin/lttng/commands/disable_events.c
+++ b/src/bin/lttng/commands/disable_events.c
@@ -25,9 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_event_list;
 static int opt_kernel;

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index 52745f69a651d61ec91f18ca1b8cff81bf0c9d6a..3ec02ef4127d8cbff3052af6b0f7f8ce9e447f9c 100644 (file)
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -26,9 +26,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_channels;
 static int opt_kernel;

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 3c1c3916e0344a48098fe92e4c771201c356f7a0..ca18ccd4847edfea7407f02a425456c3149ce1ba 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -27,9 +27,7 @@
 #include <inttypes.h>
 #include <ctype.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_event_list;
 static int opt_event_type;

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 6f37254e41c35ce6de41c1215483ecee9058a212..7698bb6ed12515555ffc3bf72e7541e3d3cf3f85 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../cmd.h"
+#include "../command.h"
 
 static int opt_pid;
 static int opt_userspace;

diff --git a/src/bin/lttng/commands/set_session.c b/src/bin/lttng/commands/set_session.c
index 8a76403ad43d922eeb31c679a8632c88e5d7d876..bc25b8d1e3ad5124192e6a436e76f9b5d9a4cd24 100644 (file)
--- a/src/bin/lttng/commands/set_session.c
+++ b/src/bin/lttng/commands/set_session.c
@@ -25,9 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_session_name;
 

diff --git a/src/bin/lttng/commands/start.c b/src/bin/lttng/commands/start.c
index 2eacc462ff464a2a464f9b9c79fc1260479ffad6..8292787731e4bc36360588d5df3ba4b3ab0a52d4 100644 (file)
--- a/src/bin/lttng/commands/start.c
+++ b/src/bin/lttng/commands/start.c
@@ -25,9 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_session_name;
 

diff --git a/src/bin/lttng/commands/stop.c b/src/bin/lttng/commands/stop.c
index f1299b5bc19d9276bf477dcca4009c87cb27af19..0a942645db70b5b278e8af8c8b3f5e780d706ce2 100644 (file)
--- a/src/bin/lttng/commands/stop.c
+++ b/src/bin/lttng/commands/stop.c
@@ -25,9 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_session_name;
 

diff --git a/src/bin/lttng/commands/version.c b/src/bin/lttng/commands/version.c
index 4d8d75b124a98a01f7a0d759c882b305f02c622d..c9b547bce2a2a844e6cd22e58e0a962a9ae8f7b0 100644 (file)
--- a/src/bin/lttng/commands/version.c
+++ b/src/bin/lttng/commands/version.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <config.h>
 
-#include "../cmd.h"
+#include "../command.h"
 
 enum {
        OPT_HELP = 1,

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 65cea55a25e73a8698fd01c2846b4a405488916a..a76a869a2b293c88b07149d53608d7baf8ffda47 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -28,8 +28,7 @@
 #include <lttng/lttng.h>
 #include <common/lttngerr.h>
 
-#include "cmd.h"
-#include "conf.h"
+#include "command.h"
 
 /* Variables */
 static char *progname;