projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: ua_sess is never used create_ust_app_channel_context()
[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 3d2cad9361464534128a44f5917d01f1e58899fe..2b2a59adeb589e12a5449ef546df11a129721248 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-858,7
+858,7
@@
error:
*
* Useful for CPU hotplug feature.
*/
*
* Useful for CPU hotplug feature.
*/
-static int update_kernel_stream(
struct consumer_data *consumer_data,
int fd)
+static int update_kernel_stream(int fd)
{
int ret = 0;
struct ltt_session *session;
{
int ret = 0;
struct ltt_session *session;
@@
-1092,7
+1092,7
@@
static void *thread_manage_kernel(void *data)
* New CPU detected by the kernel. Adding kernel stream to
* kernel session and updating the kernel consumer
*/
* New CPU detected by the kernel. Adding kernel stream to
* kernel session and updating the kernel consumer
*/
- ret = update_kernel_stream(
&kconsumer_data,
pollfd);
+ ret = update_kernel_stream(pollfd);
if (ret < 0) {
continue;
}
if (ret < 0) {
continue;
}
@@
-5830,6
+5830,12
@@
int main(int argc, char **argv)
goto exit_set_signal_handler;
}
goto exit_set_signal_handler;
}
+ /*
+ * Init config from environment variables.
+ * Command line option override env configuration per-doc. Do env first.
+ */
+ sessiond_config_apply_env_config(&config);
+
/*
* Parse arguments and load the daemon configuration file.
*
/*
* Parse arguments and load the daemon configuration file.
*
@@
-5844,9
+5850,6
@@
int main(int argc, char **argv)
goto exit_options;
}
goto exit_options;
}
- /* Init config from environment variables. */
- sessiond_config_apply_env_config(&config);
-
/*
* Resolve all paths received as arguments, configuration option, or
* through environment variable as absolute paths. This is necessary
/*
* Resolve all paths received as arguments, configuration option, or
* through environment variable as absolute paths. This is necessary
This page took
0.025789 seconds
and
4
git commands to generate.