developer
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix timer callback bug

This commit is contained in:
Liu_Weichao 2023-10-10 13:23:05 +08:00
parent 58fe8fc887
commit ca0ef77764
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c
View File

@ -25,8 +25,11 @@
#include "include/semaphore.h" #include "include/semaphore.h"
#include "include/pthread.h" #include "include/pthread.h"
static sem_t timer_sem; #define TIMER_NUM 20
static pthread_t timer_task;
static sem_t timer_sem[TIMER_NUM];
static pthread_t timer_task[TIMER_NUM];
static char timer_idx[TIMER_NUM];
struct timer_func { struct timer_func {
union sigval value; union sigval value;
@ -34,16 +37,17 @@ struct timer_func {
void (* user_timer_function)(union sigval val); void (* user_timer_function)(union sigval val);
}; };
struct timer_func g_timer_func; struct timer_func g_timer_func[TIMER_NUM];
static void *timer_callback(void *args) static void *timer_callback(void *args)
{ {
struct sigevent *evp = (struct sigevent *)args; clockid_t clockid = *((clockid_t *)args);
while (1) { while (1) {
if (g_timer_func.user_timer_function != NULL) { if (g_timer_func[clockid].user_timer_function != NULL) {
if (0 == sem_timedwait(&timer_sem, NULL)) { if (0 == sem_timedwait(&(timer_sem[clockid]), NULL)) {
g_timer_func.user_timer_function(g_timer_func.value); g_timer_func[clockid].value.sival_ptr = &clockid;
g_timer_func[clockid].user_timer_function(g_timer_func[clockid].value);
} }
} }
} }
@ -53,6 +57,7 @@ int timer_create(clockid_t clockid, struct sigevent * evp, timer_t * timerid)
{ {
int timer_id; int timer_id;
char timer_name[16]; char timer_name[16];
sem_t sem;
if ((NULL == evp) || (NULL == timerid)) { if ((NULL == evp) || (NULL == timerid)) {
errno = EINVAL; errno = EINVAL;
@ -68,11 +73,12 @@ int timer_create(clockid_t clockid, struct sigevent * evp, timer_t * timerid)
memset(timer_name, 0, sizeof(timer_name)); memset(timer_name, 0, sizeof(timer_name));
snprintf(timer_name, sizeof(timer_name), "timer_%ld", clockid); snprintf(timer_name, sizeof(timer_name), "timer_%ld", clockid);
sem_init(&timer_sem, 0, 0); sem = timer_sem[clockid];
sem_init(&sem, 0, 0);
g_timer_func.value = evp->sigev_value; g_timer_func[clockid].value = evp->sigev_value;
g_timer_func.user_timer_function = evp->sigev_notify_function; g_timer_func[clockid].user_timer_function = evp->sigev_notify_function;
g_timer_func.timer_flags = *(int *)(evp->sigev_notify_attributes); g_timer_func[clockid].timer_flags = *(int *)(evp->sigev_notify_attributes);
pthread_attr_t attr; pthread_attr_t attr;
attr.schedparam.sched_priority = 22; attr.schedparam.sched_priority = 22;
@ -80,22 +86,25 @@ int timer_create(clockid_t clockid, struct sigevent * evp, timer_t * timerid)
pthread_args_t args; pthread_args_t args;
args.pthread_name = timer_name; args.pthread_name = timer_name;
args.arg = (void *)evp; args.arg = &clockid;
pthread_create(&timer_task, &attr, &timer_callback, (void *)&args); pthread_create(&(timer_task[clockid]), &attr, &timer_callback, (void *)&args);
timer_id = UserTimerCreate(timer_name, NULL, (void *)&timer_sem, 1000, g_timer_func.timer_flags); timer_id = UserTimerCreate(timer_name, NULL, (void *)&(timer_sem[clockid]), 1000, g_timer_func[clockid].timer_flags);
*timerid = timer_id; *timerid = timer_id;
return timer_id; return timer_id;
} }
int timer_delete(timer_t timerid) int timer_delete(timer_t timerid)
{ {
pthread_kill(timer_task, 0); sem_t sem;
int timer_id = timerid;
pthread_kill(timer_task[timer_id], 0);
UserTimerQuitRun(timerid); UserTimerQuitRun(timerid);
sem_destroy(&timer_sem); sem = timer_sem[timer_id];
sem_destroy(&sem);
return 0; return 0;
} }