github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-06-28 23:57:29 +00:00
Code Issues Projects Releases Wiki Activity

fix(userspace/falco): properly delete metrics timer upon leaving.

Browse Source 
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
This commit is contained in:
Federico Di Pierro 2023-09-01 14:46:59 +02:00 committed by poiana
parent 442d1accbe
commit 0ec492086e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
userspace/falco/app/restart_handler.cpp
View File

@ -31,8 +31,9 @@ limitations under the License.
falco::app::restart_handler::~restart_handler() falco::app::restart_handler::~restart_handler()
{ {
close(m_inotify_fd);
stop(); stop();
close(m_inotify_fd);
m_inotify_fd = -1;
} }
void falco::app::restart_handler::trigger() void falco::app::restart_handler::trigger()

14
userspace/falco/stats_writer.cpp
View File

@ -32,6 +32,7 @@ limitations under the License.
// overflows here. Threads calling stats_writer::handle() will just // overflows here. Threads calling stats_writer::handle() will just
// check that this value changed since their last observation. // check that this value changed since their last observation.
static std::atomic<stats_writer::ticker_t> s_timer((stats_writer::ticker_t) 0); static std::atomic<stats_writer::ticker_t> s_timer((stats_writer::ticker_t) 0);
static timer_t s_timerid;
static void timer_handler(int signum) static void timer_handler(int signum)
{ {
@ -51,14 +52,15 @@ bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err)
return false; return false;
} }
timer_t timerid;
struct sigevent sev = {}; struct sigevent sev = {};
/* Create the timer */ /* Create the timer */
sev.sigev_notify = SIGEV_SIGNAL; sev.sigev_notify = SIGEV_SIGNAL;
sev.sigev_signo = SIGALRM; sev.sigev_signo = SIGALRM;
sev.sigev_value.sival_ptr = &timerid; sev.sigev_value.sival_ptr = &s_timerid;
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
if (timer_create(CLOCK_MONOTONIC, &sev, &timerid) == -1) { // delete any previously set timer
timer_delete(s_timerid);
if (timer_create(CLOCK_MONOTONIC, &sev, &s_timerid) == -1) {
err = std::string("Could not create periodic timer: ") + strerror(errno); err = std::string("Could not create periodic timer: ") + strerror(errno);
return false; return false;
} }
@ -68,7 +70,7 @@ bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err)
timer.it_interval = timer.it_value; timer.it_interval = timer.it_value;
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
if (timer_settime(timerid, 0, &timer, NULL) == -1) { if (timer_settime(s_timerid, 0, &timer, NULL) == -1) {
err = std::string("Could not set up periodic timer: ") + strerror(errno); err = std::string("Could not set up periodic timer: ") + strerror(errno);
return false; return false;
} }
@ -122,6 +124,10 @@ stats_writer::~stats_writer()
{ {
m_file_output.close(); m_file_output.close();
} }
// delete timerID and reset timer
#ifndef __EMSCRIPTEN__
timer_delete(s_timerid);
#endif
} }
} }