projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: ust: app stuck on recv message during UST comm timeout scenario
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
timer.c
diff --git
a/src/bin/lttng-sessiond/timer.c
b/src/bin/lttng-sessiond/timer.c
index bf56d9306449634157951ed690aad73bc8c7ba7d..4e522a7fc70e4770b30904cd0ddd01065f8c2bd9 100644
(file)
--- a/
src/bin/lttng-sessiond/timer.c
+++ b/
src/bin/lttng-sessiond/timer.c
@@
-7,7
+7,6
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <assert.h>
#include <inttypes.h>
#include <signal.h>
#include <inttypes.h>
#include <signal.h>
@@
-23,7
+22,7
@@
#define UINT_TO_PTR(value) \
({ \
#define UINT_TO_PTR(value) \
({ \
-
assert(value <= UINTPTR_MAX);
\
+
LTTNG_ASSERT(value <= UINTPTR_MAX);
\
(void *) (uintptr_t) value; \
})
#define PTR_TO_UINT(ptr) ((uintptr_t) ptr)
(void *) (uintptr_t) value; \
})
#define PTR_TO_UINT(ptr) ((uintptr_t) ptr)
@@
-238,8
+237,8
@@
int timer_session_rotation_pending_check_stop(struct ltt_session *session)
{
int ret;
{
int ret;
-
assert
(session);
-
assert
(session->rotation_pending_check_timer_enabled);
+
LTTNG_ASSERT
(session);
+
LTTNG_ASSERT
(session->rotation_pending_check_timer_enabled);
DBG("Disabling session rotation pending check timer on session %" PRIu64,
session->id);
DBG("Disabling session rotation pending check timer on session %" PRIu64,
session->id);
@@
-289,7
+288,7
@@
int timer_session_rotation_schedule_timer_stop(struct ltt_session *session)
{
int ret = 0;
{
int ret = 0;
-
assert
(session);
+
LTTNG_ASSERT
(session);
if (!session->rotation_schedule_timer_enabled) {
goto end;
if (!session->rotation_schedule_timer_enabled) {
goto end;
@@
-394,12
+393,12
@@
void *thread_timer(void *data)
* still fire.
*/
} else {
* still fire.
*/
} else {
- ERR("Unexpected signal %d
\n
", info.si_signo);
+ ERR("Unexpected signal %d", info.si_signo);
}
}
end:
}
}
end:
- DBG("
[timer-thread] E
xit");
+ DBG("
Thread e
xit");
health_unregister(the_health_sessiond);
rcu_thread_offline();
rcu_unregister_thread();
health_unregister(the_health_sessiond);
rcu_thread_offline();
rcu_unregister_thread();
This page took
0.025007 seconds
and
4
git commands to generate.