projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialize all stack variables to zero, fix uninitialized loglevel variables
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
create.c
diff --git
a/src/bin/lttng/commands/create.c
b/src/bin/lttng/commands/create.c
index a791fbd4df43710c0ae024ee09a4a477d6de5eae..8052826a245296b0d2d9c310165385a11c5f6ad9 100644
(file)
--- a/
src/bin/lttng/commands/create.c
+++ b/
src/bin/lttng/commands/create.c
@@
-52,17
+52,18
@@
static void usage(FILE *ofp)
{
fprintf(ofp, "usage: lttng create [options] [NAME]\n");
fprintf(ofp, "\n");
{
fprintf(ofp, "usage: lttng create [options] [NAME]\n");
fprintf(ofp, "\n");
+ fprintf(ofp, " The default NAME is 'auto-yyyymmdd-hhmmss'\n");
fprintf(ofp, " -h, --help Show this help\n");
fprintf(ofp, " -h, --help Show this help\n");
- fprintf(ofp, " --list-options
Simple listing of options\n");
+ fprintf(ofp, " --list-options Simple listing of options\n");
fprintf(ofp, " -o, --output PATH Specify output path for traces\n");
fprintf(ofp, "\n");
}
/*
fprintf(ofp, " -o, --output PATH Specify output path for traces\n");
fprintf(ofp, "\n");
}
/*
- * create_session
+ * Create a tracing session.
+ * If no name is specified, a default name is generated.
*
*
- * Create a tracing session. If no name specified, a default name will be
- * generated.
+ * Returns one of the CMD_* result constants.
*/
static int create_session()
{
*/
static int create_session()
{
@@
-101,10
+102,10
@@
static int create_session()
}
if (have_name) {
}
if (have_name) {
- ret = asprintf(&traces_path, "%s/"
LTTNG_
DEFAULT_TRACE_DIR_NAME
+ ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
"/%s-%s", alloc_path, session_name, datetime);
} else {
"/%s-%s", alloc_path, session_name, datetime);
} else {
- ret = asprintf(&traces_path, "%s/"
LTTNG_
DEFAULT_TRACE_DIR_NAME
+ ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
"/%s", alloc_path, session_name);
}
"/%s", alloc_path, session_name);
}
@@
-118,15
+119,14
@@
static int create_session()
ret = lttng_create_session(session_name, traces_path);
if (ret < 0) {
ret = lttng_create_session(session_name, traces_path);
if (ret < 0) {
+ /* Don't set ret so lttng can interpret the sessiond error. */
goto error;
}
/* Init lttng session config */
ret = config_init(session_name);
if (ret < 0) {
goto error;
}
/* Init lttng session config */
ret = config_init(session_name);
if (ret < 0) {
- if (ret == -1) {
- ret = CMD_ERROR;
- }
+ ret = CMD_ERROR;
goto error;
}
goto error;
}
@@
-136,6
+136,10
@@
static int create_session()
ret = CMD_SUCCESS;
error:
ret = CMD_SUCCESS;
error:
+ if (opt_session_name == NULL) {
+ free(session_name);
+ }
+
if (alloc_path) {
free(alloc_path);
}
if (alloc_path) {
free(alloc_path);
}
@@
-147,9
+151,9
@@
error:
}
/*
}
/*
- *
cmd_list
+ *
The 'create <options>' first level command
*
*
- *
The 'list <options>' first level command
+ *
Returns one of the CMD_* result constants.
*/
int cmd_create(int argc, const char **argv)
{
*/
int cmd_create(int argc, const char **argv)
{
@@
-162,11
+166,10
@@
int cmd_create(int argc, const char **argv)
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case OPT_HELP:
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case OPT_HELP:
- usage(std
err
);
+ usage(std
out
);
goto end;
case OPT_LIST_OPTIONS:
list_cmd_options(stdout, long_options);
goto end;
case OPT_LIST_OPTIONS:
list_cmd_options(stdout, long_options);
- ret = CMD_SUCCESS;
goto end;
default:
usage(stderr);
goto end;
default:
usage(stderr);
@@
-180,5
+183,6
@@
int cmd_create(int argc, const char **argv)
ret = create_session();
end:
ret = create_session();
end:
+ poptFreeContext(pc);
return ret;
}
return ret;
}
This page took
0.024588 seconds
and
4
git commands to generate.