projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Remove useless consumer subdir string concatenation
[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 85a20d795cb253123c0b2753a02a8fcad98e8436..2f0a39fede12d5e130d9fc8f88f011dd2f80dc96 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-61,6
+61,7
@@
#include "fd-limit.h"
#include "filter.h"
#include "health.h"
#include "fd-limit.h"
#include "filter.h"
#include "health.h"
+#include "testpoint.h"
#define CONSUMERD_FILE "lttng-consumerd"
#define CONSUMERD_FILE "lttng-consumerd"
@@
-688,8
+689,12
@@
static void *thread_manage_kernel(void *data)
DBG("Thread manage kernel started");
DBG("Thread manage kernel started");
+ testpoint(thread_manage_kernel);
+
health_code_update(&health_thread_kernel);
health_code_update(&health_thread_kernel);
+ testpoint(thread_manage_kernel_before_loop);
+
ret = create_thread_poll_set(&events, 2);
if (ret < 0) {
goto error_poll_create;
ret = create_thread_poll_set(&events, 2);
if (ret < 0) {
goto error_poll_create;
@@
-860,6
+865,9
@@
static void *thread_manage_consumer(void *data)
/* Inifinite blocking call, waiting for transmission */
restart:
health_poll_update(&consumer_data->health);
/* Inifinite blocking call, waiting for transmission */
restart:
health_poll_update(&consumer_data->health);
+
+ testpoint(thread_manage_consumer);
+
ret = lttng_poll_wait(&events, -1);
health_poll_update(&consumer_data->health);
if (ret < 0) {
ret = lttng_poll_wait(&events, -1);
health_poll_update(&consumer_data->health);
if (ret < 0) {
@@
-1057,6
+1065,8
@@
static void *thread_manage_apps(void *data)
DBG("[thread] Manage application started");
DBG("[thread] Manage application started");
+ testpoint(thread_manage_apps);
+
rcu_register_thread();
rcu_thread_online();
rcu_register_thread();
rcu_thread_online();
@@
-1072,6
+1082,8
@@
static void *thread_manage_apps(void *data)
goto error;
}
goto error;
}
+ testpoint(thread_manage_apps_before_loop);
+
health_code_update(&health_thread_app_manage);
while (1) {
health_code_update(&health_thread_app_manage);
while (1) {
@@
-1295,6
+1307,8
@@
static void *thread_registration_apps(void *data)
DBG("[thread] Manage application registration started");
DBG("[thread] Manage application registration started");
+ testpoint(thread_registration_apps);
+
ret = lttcomm_listen_unix_sock(apps_sock);
if (ret < 0) {
goto error_listen;
ret = lttcomm_listen_unix_sock(apps_sock);
if (ret < 0) {
goto error_listen;
@@
-2088,6
+2102,7
@@
static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
case LTTNG_LIST_DOMAINS:
case LTTNG_START_TRACE:
case LTTNG_STOP_TRACE:
case LTTNG_LIST_DOMAINS:
case LTTNG_START_TRACE:
case LTTNG_STOP_TRACE:
+ case LTTNG_DATA_AVAILABLE:
need_domain = 0;
break;
default:
need_domain = 0;
break;
default:
@@
-2774,6
+2789,11
@@
skip_domain:
bytecode);
break;
}
bytecode);
break;
}
+ case LTTNG_DATA_AVAILABLE:
+ {
+ ret = cmd_data_available(cmd_ctx->session);
+ break;
+ }
default:
ret = LTTNG_ERR_UND;
break;
default:
ret = LTTNG_ERR_UND;
break;
@@
-2994,6
+3014,8
@@
static void *thread_manage_clients(void *data)
DBG("[thread] Manage client started");
DBG("[thread] Manage client started");
+ testpoint(thread_manage_clients);
+
rcu_register_thread();
health_code_update(&health_thread_cmd);
rcu_register_thread();
health_code_update(&health_thread_cmd);
@@
-3025,6
+3047,8
@@
static void *thread_manage_clients(void *data)
kill(ppid, SIGUSR1);
}
kill(ppid, SIGUSR1);
}
+ testpoint(thread_manage_clients_before_loop);
+
health_code_update(&health_thread_cmd);
while (1) {
health_code_update(&health_thread_cmd);
while (1) {
This page took
0.025617 seconds
and
4
git commands to generate.