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 c670baf49d78b951888a7e220cf6bfb646f32840..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>
@@
-72,7
+71,7
@@
static int set_pollset(struct lttng_poll_event *events, size_t size)
ret = lttng_poll_add(events, the_ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);
if (ret < 0) {
ret = lttng_poll_add(events, the_ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);
if (ret < 0) {
- DBG("
[ht-thread]
lttng_poll_add error %d.", ret);
+ DBG("lttng_poll_add error %d.", ret);
goto error;
}
goto error;
}
@@
-95,7
+94,7
@@
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();
@@
-103,7
+102,7
@@
static void *thread_ht_cleanup(void *data)
health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
if (testpoint(sessiond_thread_ht_cleanup)) {
health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_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) {
This page took
0.038463 seconds
and
4
git commands to generate.