projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: add -b, --background option
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index e44cfbd102b63c31a2a386eb291a9e883299058c..b1b48185bdb5f3ae6132fd8027e2aea15ca54e78 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-59,6
+59,7
@@
#include "lttng-relayd.h"
#include "live.h"
#include "health-relayd.h"
#include "lttng-relayd.h"
#include "live.h"
#include "health-relayd.h"
+#include "testpoint.h"
/* command line options */
char *opt_output_path;
/* command line options */
char *opt_output_path;
@@
-85,7
+86,7
@@
const char *tracing_group_name = DEFAULT_TRACING_GROUP;
* Quit pipe for all threads. This permits a single cancellation point
* for all threads when receiving an event on the pipe.
*/
* Quit pipe for all threads. This permits a single cancellation point
* for all threads when receiving an event on the pipe.
*/
-
static
int thread_quit_pipe[2] = { -1, -1 };
+int thread_quit_pipe[2] = { -1, -1 };
/*
* This pipe is used to inform the worker thread that a command is queued and
/*
* This pipe is used to inform the worker thread that a command is queued and
@@
-165,12
+166,13
@@
int parse_args(int argc, char **argv)
{ "help", 0, 0, 'h', },
{ "output", 1, 0, 'o', },
{ "verbose", 0, 0, 'v', },
{ "help", 0, 0, 'h', },
{ "output", 1, 0, 'o', },
{ "verbose", 0, 0, 'v', },
+ { "background", 0, 0, 'b' },
{ NULL, 0, 0, 0, },
};
while (1) {
int option_index = 0;
{ NULL, 0, 0, 0, },
};
while (1) {
int option_index = 0;
- c = getopt_long(argc, argv, "dhv" "C:D:L:o:g:",
+ c = getopt_long(argc, argv, "dhv" "C:D:L:o:g:
b
",
long_options, &option_index);
if (c == -1) {
break;
long_options, &option_index);
if (c == -1) {
break;
@@
-216,6
+218,9
@@
int parse_args(int argc, char **argv)
case 'd':
opt_daemon = 1;
break;
case 'd':
opt_daemon = 1;
break;
+ case 'b':
+ opt_background = 1;
+ break;
case 'g':
tracing_group_name = optarg;
break;
case 'g':
tracing_group_name = optarg;
break;
@@
-476,7
+481,7
@@
int create_thread_poll_set(struct lttng_poll_event *events, int size)
}
/* Add quit pipe */
}
/* Add quit pipe */
- ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN);
+ ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN
| LPOLLERR
);
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
@@
-613,6
+618,10
@@
void *relay_thread_listener(void *data)
lttng_relay_notify_ready();
lttng_relay_notify_ready();
+ if (testpoint(relayd_thread_listener)) {
+ goto error_testpoint;
+ }
+
while (1) {
health_code_update();
while (1) {
health_code_update();
@@
-713,6
+722,7
@@
restart:
exit:
error:
error_poll_add:
exit:
error:
error_poll_add:
+error_testpoint:
lttng_poll_clean(&events);
error_create_poll:
if (data_sock->fd >= 0) {
lttng_poll_clean(&events);
error_create_poll:
if (data_sock->fd >= 0) {
@@
-756,6
+766,10
@@
void *relay_thread_dispatcher(void *data)
health_register(health_relayd, HEALTH_RELAYD_TYPE_DISPATCHER);
health_register(health_relayd, HEALTH_RELAYD_TYPE_DISPATCHER);
+ if (testpoint(relayd_thread_dispatcher)) {
+ goto error_testpoint;
+ }
+
health_code_update();
while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
health_code_update();
while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
@@
-802,6
+816,7
@@
void *relay_thread_dispatcher(void *data)
err = 0;
error:
err = 0;
error:
+error_testpoint:
if (err) {
health_error();
ERR("Health error occurred in %s", __func__);
if (err) {
health_error();
ERR("Health error occurred in %s", __func__);
@@
-2420,6
+2435,10
@@
void *relay_thread_worker(void *data)
health_register(health_relayd, HEALTH_RELAYD_TYPE_WORKER);
health_register(health_relayd, HEALTH_RELAYD_TYPE_WORKER);
+ if (testpoint(relayd_thread_worker)) {
+ goto error_testpoint;
+ }
+
health_code_update();
/* table of connections indexed on socket */
health_code_update();
/* table of connections indexed on socket */
@@
-2681,6
+2700,7
@@
relay_connections_ht_error:
}
DBG("Worker thread cleanup complete");
free(data_buffer);
}
DBG("Worker thread cleanup complete");
free(data_buffer);
+error_testpoint:
if (err) {
health_error();
ERR("Health error occurred in %s", __func__);
if (err) {
health_error();
ERR("Health error occurred in %s", __func__);
@@
-2859,7
+2879,7
@@
int main(int argc, char **argv)
goto exit_listener;
}
goto exit_listener;
}
- ret = live_start_threads(live_uri, relay_ctx
, thread_quit_pipe
);
+ ret = live_start_threads(live_uri, relay_ctx);
if (ret != 0) {
ERR("Starting live viewer threads");
goto exit_live;
if (ret != 0) {
ERR("Starting live viewer threads");
goto exit_live;
This page took
0.025325 seconds
and
4
git commands to generate.