projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
action-executor: consider action firing policy on action execution
[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 406bfb62ac32e0a64b6b98628a4948e8f4f83c87..677c17329070276f6530139f315c1e17409ff0f5 100644
(file)
--- a/
src/bin/lttng/commands/create.c
+++ b/
src/bin/lttng/commands/create.c
@@
-29,8
+29,7
@@
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/uri.h>
#include <common/utils.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/uri.h>
#include <common/utils.h>
-#include <lttng/snapshot.h>
-#include <lttng/session-descriptor.h>
+#include <lttng/lttng.h>
static char *opt_output_path;
static char *opt_session_name;
static char *opt_output_path;
static char *opt_session_name;
@@
-133,7
+132,6
@@
end:
static
struct lttng_session_descriptor *create_session_descriptor(void)
{
static
struct lttng_session_descriptor *create_session_descriptor(void)
{
- int ret;
ssize_t uri_count;
enum output_type output_type;
struct lttng_uri *uris = NULL;
ssize_t uri_count;
enum output_type output_type;
struct lttng_uri *uris = NULL;
@@
-145,6
+143,7
@@
struct lttng_session_descriptor *create_session_descriptor(void)
output_type = OUTPUT_NONE;
} else if (opt_output_path) {
char *expanded_output_path;
output_type = OUTPUT_NONE;
} else if (opt_output_path) {
char *expanded_output_path;
+ int ret;
output_type = OUTPUT_LOCAL;
expanded_output_path = utils_expand_path(opt_output_path);
output_type = OUTPUT_LOCAL;
expanded_output_path = utils_expand_path(opt_output_path);
@@
-161,6
+160,8
@@
struct lttng_session_descriptor *create_session_descriptor(void)
goto end;
}
} else if (opt_url || opt_ctrl_url) {
goto end;
}
} else if (opt_url || opt_ctrl_url) {
+ int ret;
+
uri_str1 = opt_ctrl_url ? opt_ctrl_url : opt_url;
uri_str2 = opt_data_url;
uri_str1 = opt_ctrl_url ? opt_ctrl_url : opt_url;
uri_str2 = opt_data_url;
@@
-501,7
+502,7
@@
error:
*
* Spawn a session daemon by forking and execv.
*/
*
* Spawn a session daemon by forking and execv.
*/
-static int spawn_sessiond(char *pathname)
+static int spawn_sessiond(c
onst c
har *pathname)
{
int ret = 0;
pid_t pid;
{
int ret = 0;
pid_t pid;
@@
-580,7
+581,7
@@
end:
static int launch_sessiond(void)
{
int ret;
static int launch_sessiond(void)
{
int ret;
- char *pathname = NULL;
+ c
onst c
har *pathname = NULL;
ret = lttng_session_daemon_alive();
if (ret) {
ret = lttng_session_daemon_alive();
if (ret) {
This page took
0.024975 seconds
and
4
git commands to generate.