projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: increase consumer open files limit
[lttng-tools.git]
/
src
/
bin
/
lttng
/
lttng.c
diff --git
a/src/bin/lttng/lttng.c
b/src/bin/lttng/lttng.c
index 16582b0363b86fa1405d4afd6d1751f3c36b9499..75a46760644b848d7a81fd1188b05b126a79a9e0 100644
(file)
--- a/
src/bin/lttng/lttng.c
+++ b/
src/bin/lttng/lttng.c
@@
-2,9
+2,8
@@
* Copyright (c) 2011 David Goulet <david.goulet@polymtl.ca>
*
* This program is free software; you can redistribute it and/or modify
* 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
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-35,9
+34,6
@@
/* Variables */
static char *progname;
/* Variables */
static char *progname;
-
-int opt_quiet;
-int opt_verbose;
static int opt_no_sessiond;
static char *opt_sessiond_path;
static pid_t sessiond_pid;
static int opt_no_sessiond;
static char *opt_sessiond_path;
static pid_t sessiond_pid;
@@
-83,7
+79,7
@@
static struct cmd_struct commands[] = {
static void usage(FILE *ofp)
{
static void usage(FILE *ofp)
{
- fprintf(ofp, "LTTng Trace Control " VERSION"\n\n");
+ fprintf(ofp, "LTTng Trace Control " VERSION"
- " VERSION_NAME"
\n\n");
fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND>\n");
fprintf(ofp, "\n");
fprintf(ofp, "Options:\n");
fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND>\n");
fprintf(ofp, "\n");
fprintf(ofp, "Options:\n");
@@
-432,10
+428,10
@@
static int parse_args(int argc, char **argv)
ret = 0;
goto end;
case 'v':
ret = 0;
goto end;
case 'v':
- opt_verbose += 1;
+
lttng_
opt_verbose += 1;
break;
case 'q':
break;
case 'q':
- opt_quiet = 1;
+
lttng_
opt_quiet = 1;
break;
case 'g':
lttng_set_tracing_group(optarg);
break;
case 'g':
lttng_set_tracing_group(optarg);
@@
-462,8
+458,8
@@
static int parse_args(int argc, char **argv)
}
/* If both options are specified, quiet wins */
}
/* If both options are specified, quiet wins */
- if (
opt_verbose &&
opt_quiet) {
- opt_verbose = 0;
+ if (
lttng_opt_verbose && lttng_
opt_quiet) {
+
lttng_
opt_verbose = 0;
}
/* Spawn session daemon if needed */
}
/* Spawn session daemon if needed */
@@
-505,7
+501,9
@@
static int parse_args(int argc, char **argv)
case 0:
break;
default:
case 0:
break;
default:
- ERR("%s", lttng_strerror(ret));
+ if (ret < 0) {
+ ret = -ret;
+ }
break;
}
break;
}
@@
-521,14
+519,17
@@
error:
int main(int argc, char *argv[])
{
int ret;
int main(int argc, char *argv[])
{
int ret;
+ char *user;
progname = argv[0] ? argv[0] : "lttng";
/* For Mathieu Desnoyers a.k.a. Dr. Tracing */
progname = argv[0] ? argv[0] : "lttng";
/* For Mathieu Desnoyers a.k.a. Dr. Tracing */
- if (strncmp(progname, "drtrace", 7) == 0 ||
- strncmp("compudj", getenv("USER"), 7) == 0) {
+ user = getenv("USER");
+ if (user != NULL && ((strncmp(progname, "drtrace", 7) == 0 ||
+ strncmp("compudj", user, 7) == 0))) {
MSG("%c[%d;%dmWelcome back Dr Tracing!%c[%dm\n", 27,1,33,27,0);
}
MSG("%c[%d;%dmWelcome back Dr Tracing!%c[%dm\n", 27,1,33,27,0);
}
+ /* Thanks Mathieu */
ret = set_signal_handler();
if (ret < 0) {
ret = set_signal_handler();
if (ret < 0) {
This page took
0.027512 seconds
and
4
git commands to generate.