Mirrors/bolvan-zapret2
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-06-17 12:50:04 +04:00
Code Issues Packages Projects Releases Wiki Activity

nfqws2: do not call timer code if there're no timers

Browse Source
This commit is contained in:
bol-van
2026-04-15 08:31:28 +03:00
parent 787e5244ad
commit 640a73d25c
1 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nfq2/nfqws.c
+49 -35
View File
@@ -525,15 +525,23 @@ static int nfq_main(void)
if (bQuit) goto quit;
for(;;)
{
FD_ZERO(&fdset);
FD_SET(fd, &fdset);
res = select(fd+1, &fdset, NULL, NULL, &tv);
if (bQuit) goto quit;
if (res == -1)
if (params.timers)
{
if (errno == EINTR) continue;
DLOG_PERROR("select");
goto err;
FD_ZERO(&fdset);
FD_SET(fd, &fdset);
res = select(fd+1, &fdset, NULL, NULL, &tv);
if (bQuit) goto quit;
if (res == -1)
{
if (errno == EINTR) continue;
DLOG_PERROR("select");
goto err;
}
}
else
{
if (bQuit) goto quit;
res = 1;
}
lua_do_gc();
ReloadCheck();
@@ -555,21 +563,24 @@ static int nfq_main(void)
if (res<0) DLOG_ERR("nfq_handle_packet result %d, errno %d : %s\n", res, errno, strerror(errno));
}
bt = boottime_ms();
dbt = bt-bt_prev;
if (dbt>=params.timer_res)
if (params.timers)
{
TimerPoolRun(&params.timers, bt);
bt = boottime_ms();
dbt = bt-bt_prev;
if (dbt>=params.timer_res)
{
TimerPoolRun(&params.timers, bt);
bt_prev = bt;
tv.tv_sec = params.timer_res/1000;
tv.tv_usec = params.timer_res%1000*1000;
}
else
{
dbt = params.timer_res-dbt;
tv.tv_sec = (time_t)(dbt/1000);
tv.tv_usec = (suseconds_t)(dbt%1000*1000);
bt_prev = bt;
tv.tv_sec = params.timer_res/1000;
tv.tv_usec = params.timer_res%1000*1000;
}
else
{
dbt = params.timer_res-dbt;
tv.tv_sec = (time_t)(dbt/1000);
tv.tv_usec = (suseconds_t)(dbt%1000*1000);
}
}
}
if (errno==EINTR)
@@ -712,7 +723,7 @@ static int dvt_main(void)
}
FD_ZERO(&fdset);
for (i = 0; i < fdct; i++) FD_SET(fd[i], &fdset);
r = select(fdmax, &fdset, NULL, NULL, &tv);
r = select(fdmax, &fdset, NULL, NULL, params.timers ? &tv : NULL);
if (bQuit)
{
DLOG_CONDUP("quit requested\n");
@@ -796,21 +807,24 @@ static int dvt_main(void)
}
}
}
bt = boottime_ms();
dbt = bt-bt_prev;
if (dbt>=params.timer_res)
if (params.timers)
{
TimerPoolRun(&params.timers, bt);
bt = boottime_ms();
dbt = bt-bt_prev;
if (dbt>=params.timer_res)
{
TimerPoolRun(&params.timers, bt);
bt_prev = bt;
tv.tv_sec = params.timer_res/1000;
tv.tv_usec = params.timer_res%1000*1000;
}
else
{
dbt = params.timer_res-dbt;
tv.tv_sec = (time_t)(dbt/1000);
tv.tv_usec = (suseconds_t)(dbt%1000*1000);
bt_prev = bt;
tv.tv_sec = params.timer_res/1000;
tv.tv_usec = params.timer_res%1000*1000;
}
else
{
dbt = params.timer_res-dbt;
tv.tv_sec = (time_t)(dbt/1000);
tv.tv_usec = (suseconds_t)(dbt%1000*1000);
}
}
}