github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-06-30 16:42:14 +00:00
Code Issues Projects Releases Wiki Activity

fix(userspace): switch to timer_settime API in stats writer.

Browse Source 
It seems like `setitimer` is not correctly working when built from CI; perhaps a gcc/glibc bug?

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
This commit is contained in:
Federico Di Pierro 2023-06-21 11:06:46 +02:00 committed by poiana
parent 5b0ed1eb56
commit c0ea9b3618
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/falcosecurity-rules

@ -1 +1 @@
Subproject commit f5ef8d98d5ac8642f48dd6a478d5501ef0d903dd Subproject commit 3f52480618491a9232a1ec6a1f692fc04899c989

30
userspace/falco/stats_writer.cpp
View File

@ -15,7 +15,8 @@ limitations under the License.
*/ */
#include <sys/time.h> #include <sys/time.h>
#include <signal.h> #include <ctime>
#include <csignal>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <atomic> #include <atomic>
@ -39,10 +40,10 @@ static void timer_handler(int signum)
bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err) bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err)
{ {
struct itimerval timer; struct itimerspec timer = {};
struct sigaction handler; struct sigaction handler = {};
memset (&handler, 0, sizeof (handler)); memset (&handler, 0, sizeof(handler));
handler.sa_handler = &timer_handler; handler.sa_handler = &timer_handler;
if (sigaction(SIGALRM, &handler, NULL) == -1) if (sigaction(SIGALRM, &handler, NULL) == -1)
{ {
@ -50,14 +51,29 @@ bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err)
return false; return false;
} }
timer_t timerid;
struct sigevent sev = {};
/* Create the timer */
sev.sigev_notify = SIGEV_SIGNAL;
sev.sigev_signo = SIGALRM;
sev.sigev_value.sival_ptr = &timerid;
if (timer_create(CLOCK_MONOTONIC, &sev, &timerid) == -1) {
err = std::string("Could not create periodic timer: ") + strerror(errno);
return false;
}
timer.it_value.tv_sec = interval_msec / 1000; timer.it_value.tv_sec = interval_msec / 1000;
timer.it_value.tv_usec = (interval_msec % 1000) * 1000; timer.it_value.tv_nsec = (interval_msec % 1000) * 1000 * 1000;
timer.it_interval = timer.it_value; timer.it_interval = timer.it_value;
if (setitimer(ITIMER_REAL, &timer, NULL) == -1)
{ if (timer_settime(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;
} }
//if (setitimer(ITIMER_REAL, &timer, NULL) == -1)
//{
// err = std::string("Could not set up periodic timer: ") + strerror(errno);
// return false;
//}
return true; return true;
} }