xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: compile error in lower gcc version

This commit is contained in:
Shengliang Guan 2025-02-17 11:30:46 +08:00
parent a0090b5cdf
commit acf6a6e966
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/os/src/osTimer.c
View File

@ -78,11 +78,6 @@ void taos_block_sigalrm(void) {
#include <sys/syscall.h> #include <sys/syscall.h>
#include <unistd.h> #include <unistd.h>
static void taosDeleteTimer(void *tharg) {
timer_t *pTimer = tharg;
TAOS_SKIP_ERROR(timer_delete(*pTimer));
}
static TdThread timerThread; static TdThread timerThread;
static timer_t timerId; static timer_t timerId;
static volatile bool stopTimer = false; static volatile bool stopTimer = false;
@ -110,12 +105,10 @@ static void *taosProcessAlarmSignal(void *tharg) {
sevent.sigev_signo = SIGALRM; sevent.sigev_signo = SIGALRM;
if (timer_create(CLOCK_REALTIME, &sevent, &timerId) == -1) { if (timer_create(CLOCK_REALTIME, &sevent, &timerId) == -1) {
terrno = TAOS_SYSTEM_ERROR(errno); terrno = TAOS_SYSTEM_ERROR(errno);
return NULL; return NULL;
} }
taosThreadCleanupPush(taosDeleteTimer, &timerId);
do { do {
struct itimerspec ts; struct itimerspec ts;
ts.it_value.tv_sec = 0; ts.it_value.tv_sec = 0;
@ -128,7 +121,7 @@ static void *taosProcessAlarmSignal(void *tharg) {
break; break;
} }
int signo; int signo;
int32_t code = 0; int32_t code = 0;
while (!stopTimer) { while (!stopTimer) {
code = sigwait(&sigset, &signo); code = sigwait(&sigset, &signo);
@ -141,7 +134,7 @@ static void *taosProcessAlarmSignal(void *tharg) {
} }
} while (0); } while (0);
taosThreadCleanupPop(1); timer_delete(timerId);
return NULL; return NULL;
} }