aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-20 00:23:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

lkl: posix: implement wrapper for timer callback

Browse Source 
Implement a wrapper for the timer callback to fix the following
compile warning:

lib/posix-host.c:383:42: warning: cast between incompatible \
 function  types from ‘void (*)(void *)’ to ‘void (*)(union sigval)’ \
 [-Wcast-function-type]
  383 |                 .sigev_notify_function = (void (*)(union sigval))fn,
      |                                          ^

Signed-off-by: Octavian Purdila <tavip@google.com>
This commit is contained in:
Octavian Purdila
2025-02-11 17:16:41 -08:00
parent 2286d495bb
commit 648f7902bc
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tools/lkl/lib/posix-host.c
View File

@@ -361,7 +361,6 @@ static void *tls_get(struct lkl_tls_key *key)
return __tls_keys[idx].data; return __tls_keys[idx].data;
} }
static unsigned long long time_ns(void) static unsigned long long time_ns(void)
{ {
struct timespec ts; struct timespec ts;
@@ -371,28 +370,46 @@ static unsigned long long time_ns(void)
return 1e9*ts.tv_sec + ts.tv_nsec; return 1e9*ts.tv_sec + ts.tv_nsec;
} }
struct lkl_timer {
timer_t timer;
void (*fn)(void *arg);
void *arg;
};
static void lkl_timer_callback(union sigval sv)
{
struct lkl_timer *lt = (struct lkl_timer *)sv.sival_ptr;
lt->fn(lt->arg);
}
static void *timer_alloc(void (*fn)(void *), void *arg) static void *timer_alloc(void (*fn)(void *), void *arg)
{ {
int err; int err;
timer_t timer;
struct sigevent se = { struct sigevent se = {
.sigev_notify = SIGEV_THREAD, .sigev_notify = SIGEV_THREAD,
.sigev_value = { .sigev_notify_function = lkl_timer_callback,
.sival_ptr = arg,
},
.sigev_notify_function = (void (*)(union sigval))fn,
}; };
struct lkl_timer *pt;
err = timer_create(CLOCK_REALTIME, &se, &timer);
pt = malloc(sizeof(*pt));
if (!pt)
return NULL;
pt->fn = fn;
pt->arg = arg;
se.sigev_value.sival_ptr = pt;
err = timer_create(CLOCK_REALTIME, &se, &pt->timer);
if (err) if (err)
return NULL; return NULL;
return (void *)(long)timer; return pt;
} }
static int timer_set_oneshot(void *_timer, unsigned long ns) static int timer_set_oneshot(void *timer, unsigned long ns)
{ {
timer_t timer = (timer_t)(long)_timer; struct lkl_timer *lt = timer;
struct itimerspec ts = { struct itimerspec ts = {
.it_value = { .it_value = {
.tv_sec = ns / 1000000000, .tv_sec = ns / 1000000000,
@@ -400,14 +417,15 @@ static int timer_set_oneshot(void *_timer, unsigned long ns)
}, },
}; };
return timer_settime(timer, 0, &ts, NULL); return timer_settime(lt->timer, 0, &ts, NULL);
} }
static void timer_free(void *_timer) static void timer_free(void *timer)
{ {
timer_t timer = (timer_t)(long)_timer; struct lkl_timer *lt = timer;
timer_delete(timer); timer_delete(lt->timer);
free(lt);
} }
static void panic(void) static void panic(void)