projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tests: fix unused-but-set warning in test_fd_tracker.c
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ht-cleanup.c
diff --git
a/src/bin/lttng-sessiond/ht-cleanup.c
b/src/bin/lttng-sessiond/ht-cleanup.c
index 8de175d11d50383ee07994fc49feeb563f77683b..050f18e2bc38a5fb0e65f1044c687b516b0f240a 100644
(file)
--- a/
src/bin/lttng-sessiond/ht-cleanup.c
+++ b/
src/bin/lttng-sessiond/ht-cleanup.c
@@
-6,7
+6,6
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <assert.h>
#include <common/hashtable/hashtable.h>
#include <common/common.h>
#include <common/hashtable/hashtable.h>
#include <common/common.h>
@@
-70,9
+69,9
@@
static int set_pollset(struct lttng_poll_event *events, size_t size)
goto error;
}
goto error;
}
- ret = lttng_poll_add(events, ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);
+ ret = lttng_poll_add(events,
the_
ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);
if (ret < 0) {
if (ret < 0) {
- DBG("
[ht-thread]
lttng_poll_add error %d.", ret);
+ DBG("lttng_poll_add error %d.", ret);
goto error;
}
goto error;
}
@@
-85,7
+84,7
@@
error:
static void cleanup_ht_cleanup_thread(void *data)
{
utils_close_pipe(ht_cleanup_quit_pipe);
static void cleanup_ht_cleanup_thread(void *data)
{
utils_close_pipe(ht_cleanup_quit_pipe);
- utils_close_pipe(ht_cleanup_pipe);
+ utils_close_pipe(
the_
ht_cleanup_pipe);
}
static void *thread_ht_cleanup(void *data)
}
static void *thread_ht_cleanup(void *data)
@@
-95,15
+94,15
@@
static void *thread_ht_cleanup(void *data)
uint32_t revents, nb_fd;
struct lttng_poll_event events;
uint32_t revents, nb_fd;
struct lttng_poll_event events;
- DBG("
[ht-thread]
startup.");
+ DBG("startup.");
rcu_register_thread();
rcu_thread_online();
rcu_register_thread();
rcu_thread_online();
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
+ health_register(
the_
health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
if (testpoint(sessiond_thread_ht_cleanup)) {
if (testpoint(sessiond_thread_ht_cleanup)) {
- DBG("
[ht-thread]
testpoint.");
+ DBG("testpoint.");
goto error_testpoint;
}
goto error_testpoint;
}
@@
-111,7
+110,7
@@
static void *thread_ht_cleanup(void *data)
ret = set_pollset(&events, 2);
if (ret < 0) {
ret = set_pollset(&events, 2);
if (ret < 0) {
- DBG("
[ht-thread]
sessiond_set_ht_cleanup_thread_pollset error %d.", ret);
+ DBG("sessiond_set_ht_cleanup_thread_pollset error %d.", ret);
goto error_poll_create;
}
goto error_poll_create;
}
@@
-119,10
+118,10
@@
static void *thread_ht_cleanup(void *data)
while (1) {
restart:
while (1) {
restart:
- DBG3("
[ht-thread]
Polling.");
+ DBG3("Polling.");
health_poll_entry();
ret = lttng_poll_wait(&events, -1);
health_poll_entry();
ret = lttng_poll_wait(&events, -1);
- DBG3("
[ht-thread]
Returning from poll on %d fds.",
+ DBG3("Returning from poll on %d fds.",
LTTNG_POLL_GETNB(&events));
health_poll_exit();
if (ret < 0) {
LTTNG_POLL_GETNB(&events));
health_poll_exit();
if (ret < 0) {
@@
-145,14
+144,14
@@
static void *thread_ht_cleanup(void *data)
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
- if (pollfd != ht_cleanup_pipe[0]) {
+ if (pollfd !=
the_
ht_cleanup_pipe[0]) {
continue;
}
if (revents & LPOLLIN) {
/* Get socket from dispatch thread. */
continue;
}
if (revents & LPOLLIN) {
/* Get socket from dispatch thread. */
- size_ret = lttng_read(
ht_cleanup_pipe[0], &ht
,
- sizeof(ht));
+ size_ret = lttng_read(
the_ht_cleanup_pipe[0]
,
+
&ht,
sizeof(ht));
if (size_ret < sizeof(ht)) {
PERROR("ht cleanup notify pipe");
goto error;
if (size_ret < sizeof(ht)) {
PERROR("ht cleanup notify pipe");
goto error;
@@
-195,7
+194,7
@@
static void *thread_ht_cleanup(void *data)
continue;
}
continue;
}
- if (pollfd == ht_cleanup_pipe[0]) {
+ if (pollfd ==
the_
ht_cleanup_pipe[0]) {
continue;
}
continue;
}
@@
-219,7
+218,7
@@
error_testpoint:
health_error();
ERR("Health error occurred in %s", __func__);
}
health_error();
ERR("Health error occurred in %s", __func__);
}
- health_unregister(health_sessiond);
+ health_unregister(
the_
health_sessiond);
rcu_thread_offline();
rcu_unregister_thread();
return NULL;
rcu_thread_offline();
rcu_unregister_thread();
return NULL;
@@
-243,7
+242,7
@@
struct lttng_thread *launch_ht_cleanup_thread(void)
int ret;
struct lttng_thread *thread;
int ret;
struct lttng_thread *thread;
- ret = init_pipe(ht_cleanup_pipe);
+ ret = init_pipe(
the_
ht_cleanup_pipe);
if (ret) {
goto error;
}
if (ret) {
goto error;
}
This page took
0.025467 seconds
and
4
git commands to generate.