X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftimer.cpp;h=30eb13446e3badb44e1e278e5f8ad5c636490e7c;hb=a3c9aa3ccf6bf710701074ffa97f2b7a59b0fc16;hp=9635dea81a426c4774cf85640e12b2e0efa83c37;hpb=f46376a14da2eb796690cb4e718e8b213839d6ea;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/timer.cpp b/src/bin/lttng-sessiond/timer.cpp index 9635dea81..30eb13446 100644 --- a/src/bin/lttng-sessiond/timer.cpp +++ b/src/bin/lttng-sessiond/timer.cpp @@ -10,10 +10,10 @@ #include #include -#include "timer.h" -#include "health-sessiond.h" -#include "rotation-thread.h" -#include "thread.h" +#include "timer.hpp" +#include "health-sessiond.hpp" +#include "rotation-thread.hpp" +#include "thread.hpp" #define LTTNG_SESSIOND_SIG_QS SIGRTMIN + 10 #define LTTNG_SESSIOND_SIG_EXIT SIGRTMIN + 11 @@ -27,13 +27,13 @@ }) #define PTR_TO_UINT(ptr) ((uintptr_t) ptr) +namespace { /* * Handle timer teardown race wrt memory free of private data by sessiond * signals are handled by a single thread, which permits a synchronization * point between handling of each signal. Internal lock ensures mutual * exclusion. */ -static struct timer_signal_data { /* Thread managing signals. */ pthread_t tid; @@ -44,6 +44,7 @@ struct timer_signal_data { .qs_done = 0, .lock = PTHREAD_MUTEX_INITIALIZER, }; +} /* namespace */ /* * Set custom signal mask to current thread.