[lttng-dev] [PATCH] lttng-tools Catching up on miscellaneous string and comment fixes (from 5c73c59)
Thibault, Daniel
Daniel.Thibault at drdc-rddc.gc.ca
Mon Jan 30 15:27:16 EST 2012
As promised, here is the first of a new set of patches, starting from the 2012-01-30 18:27 commit (2.0-pre18+-5c73c59).
This first patch fixes miscellaneous little things wrong with strings and comments.
------------------------------
>From cb6916eb52786f8caf1612c576500ca6bb6f4e76 Mon, 30 Jan 2012 15:20:12 -0500
From: Daniel U. Thibault <daniel.thibault at drdc-rddc.gc.ca>
Date: Mon, 30 Jan 2012 15:19:50 -0500
Subject: [PATCH] lttng-tools Catching up on miscellaneous string and comment fixes (from 5c73c59)
Signed-off-by: Daniel U. Thibault <daniel.thibault at drdc-rddc.gc.ca>
diff --git a/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng-consumerd/lttng-consumerd.c b/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng-consumerd/lttng-consumerd.c
index 5d1ad06..7e3bf3c 100644
--- a/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -49,7 +49,7 @@
#include "lttng-consumerd.h"
-/* TODO : support UST (all direct kern-ctl accesses). */
+/* TODO : support UST (all direct kernel-ctl accesses). */
/* the two threads (receive fd and poll) */
static pthread_t threads[2];
@@ -310,7 +310,7 @@
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);
diff --git a/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng-sessiond/main.c b/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng-sessiond/main.c
index 9b2d1fe..8304de8 100644
--- a/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng-sessiond/main.c
+++ b/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng-sessiond/main.c
@@ -314,7 +314,7 @@
static void teardown_kernel_session(struct ltt_session *session)
{
if (!session->kernel_session) {
- DBG3("No kernel session when tearingdown session");
+ DBG3("No kernel session when tearing down session");
return;
}
@@ -340,7 +340,7 @@
int ret;
if (!session->ust_session) {
- DBG3("No UST session when tearingdown session");
+ DBG3("No UST session when tearing down session");
return;
}
@@ -397,7 +397,7 @@
}
free(cmd);
- DBG("Cleaning up all session");
+ DBG("Cleaning up all sessions");
/* Destroy session list mutex */
if (session_list_ptr != NULL) {
diff --git a/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng/lttng.c b/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng/lttng.c
index 31b4714..9c34143 100644
--- a/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng/lttng.c
+++ b/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng/lttng.c
@@ -85,14 +85,14 @@
fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND>\n");
fprintf(ofp, "\n");
fprintf(ofp, "Options:\n");
- fprintf(ofp, " -h, --help Show this help\n");
- fprintf(ofp, " --list-options Simple listing of lttng options\n");
- fprintf(ofp, " --list-commands Simple listing of lttng commands\n");
- fprintf(ofp, " -v, --verbose Increase verbosity\n");
- fprintf(ofp, " -q, --quiet Quiet mode\n");
- fprintf(ofp, " -g, --group NAME Unix tracing group name. (default: tracing)\n");
- fprintf(ofp, " -n, --no-sessiond Don't spawn a session daemon\n");
- fprintf(ofp, " --sessiond-path Session daemon full path\n");
+ fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " --list-options Simple listing of lttng options\n");
+ fprintf(ofp, " --list-commands Simple listing of lttng commands\n");
+ fprintf(ofp, " -v, --verbose Increase verbosity\n");
+ fprintf(ofp, " -q, --quiet Quiet mode\n");
+ fprintf(ofp, " -g, --group NAME Unix tracing group name. (default: tracing)\n");
+ fprintf(ofp, " -n, --no-sessiond Don't spawn a session daemon\n");
+ fprintf(ofp, " --sessiond-path PATH Session daemon full path\n");
fprintf(ofp, "\n");
fprintf(ofp, "Commands:\n");
fprintf(ofp, " add-context Add context to event and/or channel\n");
@@ -108,6 +108,8 @@
fprintf(ofp, " start Start tracing\n");
fprintf(ofp, " stop Stop tracing\n");
fprintf(ofp, " version Show version information\n");
+ fprintf(ofp, "\n");
+ fprintf(ofp, "Each command also has its own -h, --help option.\n");
fprintf(ofp, "\n");
fprintf(ofp, "Please see the lttng(1) man page for full documentation.\n");
fprintf(ofp, "See http://lttng.org for updates, bug reports and news.\n");
@@ -176,11 +178,11 @@
switch (sig) {
case SIGTERM:
- DBG("SIGTERM caugth");
+ DBG("SIGTERM caught");
clean_exit(EXIT_FAILURE);
break;
case SIGCHLD:
- DBG("SIGCHLD caugth");
+ DBG("SIGCHLD caught");
waitpid(sessiond_pid, &status, 0);
recv_child_signal = 1;
/* Indicate that the session daemon died */
@@ -190,10 +192,10 @@
case SIGUSR1:
/* Notify is done */
recv_child_signal = 1;
- DBG("SIGUSR1 caugth");
+ DBG("SIGUSR1 caught");
break;
default:
- DBG("Unknown signal %d caugth", sig);
+ DBG("Unknown signal %d caught", sig);
break;
}
@@ -514,7 +516,7 @@
progname = argv[0] ? argv[0] : "lttng";
- /* For Mathieu Desnoyers aka Dr Tracing */
+ /* For Mathieu Desnoyers a.k.a. Dr. Tracing */
if (strncmp(progname, "drtrace", 7) == 0 ||
strncmp("compudj", getenv("USER"), 7) == 0) {
MSG("%c[%d;%dmWelcome back Dr Tracing!%c[%dm\n", 27,1,33,27,0);
------------------------------
Daniel U. Thibault
R & D pour la défense Canada - Valcartier (RDDC Valcartier) / Defence R&D Canada - Valcartier (DRDC Valcartier)
Système de systèmes (SdS) / System of Systems (SoS)
Solutions informatiques et expérimentations (SIE) / Computing Solutions and Experimentations (CSE)
2459 Boul. Pie XI Nord
Québec, QC G3J 1X5
CANADA
Vox : (418) 844-4000 x4245
Fax : (418) 844-4538
NAC: 918V QSDJ
Gouvernement du Canada / Government of Canada
<http://www.valcartier.drdc-rddc.gc.ca/>
More information about the lttng-dev
mailing list