X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=11b588f77f675aef1a60d9a3c265cec76f2fb4bf;hb=10646003ec8dd54b76990cf335ef2bc56ab17a3e;hp=7a34230689c3153b7a9cee0c912eb105d3dd92be;hpb=3757b38542c2ce30ee7319a85662153de08e7f9a;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 7a3423068..11b588f77 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -34,7 +34,7 @@ #include "buffer-registry.h" #include "fd-limit.h" -#include "health.h" +#include "health-sessiond.h" #include "ust-app.h" #include "ust-consumer.h" #include "ust-ctl.h" @@ -957,8 +957,7 @@ error: * Find an ust_app using the sock and return it. RCU read side lock must be * held before calling this helper function. */ -static -struct ust_app *find_app_by_sock(int sock) +struct ust_app *ust_app_find_by_sock(int sock) { struct lttng_ht_node_ulong *node; struct lttng_ht_iter iter; @@ -1504,6 +1503,7 @@ static void shadow_copy_session(struct ust_app_session *ua_sess, /* There is only one consumer object per session possible. */ ua_sess->consumer = usess->consumer; ua_sess->output_traces = usess->output_traces; + ua_sess->live_timer_interval = usess->live_timer_interval; switch (ua_sess->buffer_type) { case LTTNG_BUFFER_PER_PID: @@ -4151,7 +4151,7 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) rcu_read_lock(); - app = find_app_by_sock(sock); + app = ust_app_find_by_sock(sock); if (app == NULL) { /* * Application can be unregistered before so this is possible hence