projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond fails to launch on --without-ust configuration
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index cec8e835e04881c20c65787c19a560bc19756c58..37c0a9325960f84940ae268039b3c4e8bea212ce 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-860,7
+860,7
@@
static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
cds_lfht_for_each_entry(ksess->consumer->socks->ht,
&iter.iter, socket, node.node) {
pthread_mutex_lock(socket->lock);
cds_lfht_for_each_entry(ksess->consumer->socks->ht,
&iter.iter, socket, node.node) {
pthread_mutex_lock(socket->lock);
- ret = kernel_consumer_send_channel_stream(socket,
+ ret = kernel_consumer_send_channel_stream
s
(socket,
channel, ksess,
session->output_traces ? 1 : 0);
pthread_mutex_unlock(socket->lock);
channel, ksess,
session->output_traces ? 1 : 0);
pthread_mutex_unlock(socket->lock);
@@
-5062,8
+5062,8
@@
static int set_option(int opt, const char *arg, const char *optname)
ERR("Port overflow in --agent-tcp-port parameter: %s", arg);
return -1;
}
ERR("Port overflow in --agent-tcp-port parameter: %s", arg);
return -1;
}
- config.agent_tcp_port
= (uint32_
t) v;
- DBG3("Agent TCP port set to non default: %
u", config.agent_tcp_port
);
+ config.agent_tcp_port
.begin = config.agent_tcp_port.end = (in
t) v;
+ DBG3("Agent TCP port set to non default: %
i", (int) v
);
}
} else if (string_match(optname, "load") || opt == 'l') {
if (!arg || *arg == '\0') {
}
} else if (string_match(optname, "load") || opt == 'l') {
if (!arg || *arg == '\0') {
@@
-5655,15
+5655,6
@@
static int write_pidfile(void)
return utils_create_pid_file(getpid(), config.pid_file_path.value);
}
return utils_create_pid_file(getpid(), config.pid_file_path.value);
}
-/*
- * Write agent TCP port using the rundir.
- */
-static int write_agent_port(void)
-{
- return utils_create_pid_file(config.agent_tcp_port,
- config.agent_port_file_path.value);
-}
-
static int set_clock_plugin_env(void)
{
int ret = 0;
static int set_clock_plugin_env(void)
{
int ret = 0;
@@
-6125,12
+6116,6
@@
int main(int argc, char **argv)
retval = -1;
goto exit_init_data;
}
retval = -1;
goto exit_init_data;
}
- ret = write_agent_port();
- if (ret) {
- ERR("Error in write_agent_port");
- retval = -1;
- goto exit_init_data;
- }
/* Initialize communication library */
lttcomm_init();
/* Initialize communication library */
lttcomm_init();
This page took
0.025805 seconds
and
4
git commands to generate.