X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=5d1ad06829f3539cd9619d27467c89580dbe569a;hb=3183dbb0b0a687ececcadb3be0cde938dc19f57a;hp=b501be8730ca8b4d22a997fbb10001d394aaf906;hpb=990570edd474b304d4c935d82be6201d872025e4;p=lttng-tools.git

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index b501be873..5d1ad0682 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -40,21 +40,21 @@
 #include <config.h>
 #include <urcu/compiler.h>
 
-#include <common/lttngerr.h>
+#include <common/defaults.h>
+#include <common/common.h>
+#include <common/kernel-consumer/kernel-consumer.h>
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <common/sessiond-comm/sessiond-comm.h>
-#include <common/kernel-consumer/kernel-consumer.h>
 #include <common/ust-consumer/ust-consumer.h>
-#include <common/defaults.h>
 
 #include "lttng-consumerd.h"
 
-/* TODO : support UST (all direct kernctl accesses). */
+/* TODO : support UST (all direct kern-ctl accesses). */
 
 /* the two threads (receive fd and poll) */
 static pthread_t threads[2];
 
-/* to count the number of time the user pressed ctrl+c */
+/* to count the number of times the user pressed ctrl+c */
 static int sigintcount = 0;
 
 /* Argument variables */
@@ -119,28 +119,28 @@ static int set_signal_handler(void)
 }
 
 /*
- * usage function on stderr
+ * Usage function on stream file.
  */
-static void usage(void)
+static void usage(FILE *fp)
 {
-	fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname);
-	fprintf(stderr, "  -h, --help                         "
+	fprintf(fp, "Usage: %s OPTIONS\n\nOptions:\n", progname);
+	fprintf(fp, "  -h, --help                         "
 			"Display this usage.\n");
-	fprintf(stderr, "  -c, --consumerd-cmd-sock PATH     "
+	fprintf(fp, "  -c, --consumerd-cmd-sock PATH     "
 			"Specify path for the command socket\n");
-	fprintf(stderr, "  -e, --consumerd-err-sock PATH     "
+	fprintf(fp, "  -e, --consumerd-err-sock PATH     "
 			"Specify path for the error socket\n");
-	fprintf(stderr, "  -d, --daemonize                    "
+	fprintf(fp, "  -d, --daemonize                    "
 			"Start as a daemon.\n");
-	fprintf(stderr, "  -q, --quiet                        "
+	fprintf(fp, "  -q, --quiet                        "
 			"No output at all.\n");
-	fprintf(stderr, "  -v, --verbose                      "
+	fprintf(fp, "  -v, --verbose                      "
 			"Verbose mode. Activate DBG() macro.\n");
-	fprintf(stderr, "  -V, --version                      "
+	fprintf(fp, "  -V, --version                      "
 			"Show version number.\n");
-	fprintf(stderr, "  -k, --kernel                       "
+	fprintf(fp, "  -k, --kernel                       "
 			"Consumer kernel buffers (default).\n");
-	fprintf(stderr, "  -u, --ust                          "
+	fprintf(fp, "  -u, --ust                          "
 			"Consumer UST buffers.%s\n",
 #ifdef HAVE_LIBLTTNG_UST_CTL
 			""
@@ -196,8 +196,8 @@ static void parse_args(int argc, char **argv)
 			opt_daemon = 1;
 			break;
 		case 'h':
-			usage();
-			exit(EXIT_FAILURE);
+			usage(stdout);
+			exit(EXIT_SUCCESS);
 		case 'q':
 			opt_quiet = 1;
 			break;
@@ -222,7 +222,7 @@ static void parse_args(int argc, char **argv)
 			break;
 #endif
 		default:
-			usage();
+			usage(stderr);
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -253,16 +253,16 @@ int main(int argc, char **argv)
 	if (strlen(command_sock_path) == 0) {
 		switch (opt_type) {
 		case LTTNG_CONSUMER_KERNEL:
-			snprintf(command_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH,
+			snprintf(command_sock_path, PATH_MAX, DEFAULT_KCONSUMERD_CMD_SOCK_PATH,
 					DEFAULT_LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER64_UST:
 			snprintf(command_sock_path, PATH_MAX,
-					USTCONSUMERD64_CMD_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
+					DEFAULT_USTCONSUMERD64_CMD_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER32_UST:
 			snprintf(command_sock_path, PATH_MAX,
-					USTCONSUMERD32_CMD_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
+					DEFAULT_USTCONSUMERD32_CMD_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
 			break;
 		default:
 			WARN("Unknown consumerd type");
@@ -284,16 +284,16 @@ int main(int argc, char **argv)
 	if (strlen(error_sock_path) == 0) {
 		switch (opt_type) {
 		case LTTNG_CONSUMER_KERNEL:
-			snprintf(error_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH,
+			snprintf(error_sock_path, PATH_MAX, DEFAULT_KCONSUMERD_ERR_SOCK_PATH,
 					DEFAULT_LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER64_UST:
 			snprintf(error_sock_path, PATH_MAX,
-					USTCONSUMERD64_ERR_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
+					DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER32_UST:
 			snprintf(error_sock_path, PATH_MAX,
-					USTCONSUMERD32_ERR_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
+					DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
 			break;
 		default:
 			WARN("Unknown consumerd type");
@@ -310,7 +310,7 @@ int main(int argc, char **argv)
 	ret = lttcomm_connect_unix_sock(error_sock_path);
 	/* not a fatal error, but all communication with lttng-sessiond will fail */
 	if (ret < 0) {
-		WARN("Cannot connect to error socket, is lttng-sessiond started ?");
+		WARN("Cannot connect to error socket (is lttng-sessiond started ?)");
 	}
 	lttng_consumer_set_error_sock(ctx, ret);