projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error.h non-static variables for liblttng-ctl
[lttng-tools.git]
/
src
/
bin
/
lttng-consumerd
/
lttng-consumerd.c
diff --git
a/src/bin/lttng-consumerd/lttng-consumerd.c
b/src/bin/lttng-consumerd/lttng-consumerd.c
index a637a904244979b5f8b0a310e458684a03162d19..52b910ac1385ee8bf92864eb158541b12e6c1f70 100644
(file)
--- a/
src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/
src/bin/lttng-consumerd/lttng-consumerd.c
@@
-49,17
+49,17
@@
#include "lttng-consumerd.h"
#include "lttng-consumerd.h"
-/* TODO : support UST (all direct kernctl accesses). */
+/* TODO : support UST (all direct kern
el-
ctl accesses). */
/* the two threads (receive fd and poll) */
static pthread_t threads[2];
/* 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 time
s
the user pressed ctrl+c */
static int sigintcount = 0;
/* Argument variables */
static int sigintcount = 0;
/* Argument variables */
-int
opt_quiet;
-int
opt_verbose;
+int
lttng_opt_quiet; /* not static in error.h */
+int
lttng_opt_verbose; /* not static in error.h */
static int opt_daemon;
static const char *progname;
static char command_sock_path[PATH_MAX]; /* Global command socket path */
static int opt_daemon;
static const char *progname;
static char command_sock_path[PATH_MAX]; /* Global command socket path */
@@
-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");
"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");
"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");
"Specify path for the error socket\n");
- fprintf(
stderr
, " -d, --daemonize "
+ fprintf(
fp
, " -d, --daemonize "
"Start as a daemon.\n");
"Start as a daemon.\n");
- fprintf(
stderr
, " -q, --quiet "
+ fprintf(
fp
, " -q, --quiet "
"No output at all.\n");
"No output at all.\n");
- fprintf(
stderr
, " -v, --verbose "
+ fprintf(
fp
, " -v, --verbose "
"Verbose mode. Activate DBG() macro.\n");
"Verbose mode. Activate DBG() macro.\n");
- fprintf(
stderr
, " -V, --version "
+ fprintf(
fp
, " -V, --version "
"Show version number.\n");
"Show version number.\n");
- fprintf(
stderr
, " -k, --kernel "
+ fprintf(
fp
, " -k, --kernel "
"Consumer kernel buffers (default).\n");
"Consumer kernel buffers (default).\n");
- fprintf(
stderr
, " -u, --ust "
+ fprintf(
fp
, " -u, --ust "
"Consumer UST buffers.%s\n",
#ifdef HAVE_LIBLTTNG_UST_CTL
""
"Consumer UST buffers.%s\n",
#ifdef HAVE_LIBLTTNG_UST_CTL
""
@@
-196,13
+196,13
@@
static void parse_args(int argc, char **argv)
opt_daemon = 1;
break;
case 'h':
opt_daemon = 1;
break;
case 'h':
- usage();
- exit(EXIT_
FAILURE
);
+ usage(
stdout
);
+ exit(EXIT_
SUCCESS
);
case 'q':
case 'q':
- opt_quiet = 1;
+
lttng_
opt_quiet = 1;
break;
case 'v':
break;
case 'v':
- opt_verbose = 1;
+
lttng_
opt_verbose = 1;
break;
case 'V':
fprintf(stdout, "%s\n", VERSION);
break;
case 'V':
fprintf(stdout, "%s\n", VERSION);
@@
-222,7
+222,7
@@
static void parse_args(int argc, char **argv)
break;
#endif
default:
break;
#endif
default:
- usage();
+ usage(
stderr
);
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
}
@@
-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) {
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);
}
lttng_consumer_set_error_sock(ctx, ret);
This page took
0.028752 seconds
and
5
git commands to generate.