projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: merge issue with thread quit pipe
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
live.c
diff --git
a/src/bin/lttng-relayd/live.c
b/src/bin/lttng-relayd/live.c
index 887066f14c0822bd6c37c676a2fd7b82a79acf09..445f432e416a60f584516770c96bf3d278685d2b 100644
(file)
--- a/
src/bin/lttng-relayd/live.c
+++ b/
src/bin/lttng-relayd/live.c
@@
-350,7
+350,7
@@
void stop_threads(void)
/* Stopping all threads */
DBG("Terminating all live threads");
/* Stopping all threads */
DBG("Terminating all live threads");
- ret = notify_thread_pipe(
live_conn
_pipe[1]);
+ ret = notify_thread_pipe(
thread_quit
_pipe[1]);
if (ret < 0) {
ERR("write error on thread quit pipe");
}
if (ret < 0) {
ERR("write error on thread quit pipe");
}
@@
-379,7
+379,7
@@
int create_thread_poll_set(struct lttng_poll_event *events, int size)
}
/* Add quit pipe */
}
/* Add quit pipe */
- ret = lttng_poll_add(events,
live_conn
_pipe[0], LPOLLIN | LPOLLERR);
+ ret = lttng_poll_add(events,
thread_quit
_pipe[0], LPOLLIN | LPOLLERR);
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
@@
-396,9
+396,9
@@
error:
* Return 1 if it was triggered else 0;
*/
static
* Return 1 if it was triggered else 0;
*/
static
-int check_
live_conn
_pipe(int fd, uint32_t events)
+int check_
thread_quit
_pipe(int fd, uint32_t events)
{
{
- if (fd ==
live_conn
_pipe[0] && (events & LPOLLIN)) {
+ if (fd ==
thread_quit
_pipe[0] && (events & LPOLLIN)) {
return 1;
}
return 1;
}
@@
-515,7
+515,7
@@
restart:
pollfd = LTTNG_POLL_GETFD(&events, i);
/* Thread quit pipe has been closed. Killing thread. */
pollfd = LTTNG_POLL_GETFD(&events, i);
/* Thread quit pipe has been closed. Killing thread. */
- ret = check_
live_conn
_pipe(pollfd, revents);
+ ret = check_
thread_quit
_pipe(pollfd, revents);
if (ret) {
err = 0;
goto exit;
if (ret) {
err = 0;
goto exit;
@@
-1854,7
+1854,7
@@
restart:
health_code_update();
/* Thread quit pipe has been closed. Killing thread. */
health_code_update();
/* Thread quit pipe has been closed. Killing thread. */
- ret = check_
live_conn
_pipe(pollfd, revents);
+ ret = check_
thread_quit
_pipe(pollfd, revents);
if (ret) {
err = 0;
goto exit;
if (ret) {
err = 0;
goto exit;
This page took
0.028502 seconds
and
5
git commands to generate.