gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

futex_wait: add to check signal

Browse Source
This commit is contained in:
Tomoki Shirasawa
2015-11-12 09:38:36 +09:00
parent e822fc47dd
commit 94fcc5bb9a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/futex.c
View File

@ -79,6 +79,8 @@
#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0) #define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0)
#endif #endif
extern struct sigpending *hassigpending(struct thread *thread);
int futex_cmpxchg_enabled; int futex_cmpxchg_enabled;
/** /**
@ -775,6 +777,11 @@ retry:
if (timeout && !time_remain) if (timeout && !time_remain)
goto out_put_key; goto out_put_key;
if(hassigpending(cpu_local_var(current))){
ret = -EINTR;
goto out_put_key;
}
/* RIKEN: no signals */ /* RIKEN: no signals */
put_futex_key(fshared, &q.key); put_futex_key(fshared, &q.key);
goto retry; goto retry;