syscalls/rt_tgsigqueueinfo: fix compilation for Android
PATCH 1/1 syscalls/rt_tgsigqueueinfo: fix compilation for Android
Glibc refers to the sigval_t in _sifields._rt as si_sigval. This differs from what is in the kernel's uapi siginfo.h, _sigval, which is what is used by Android's bionic.
Signed-off-by Steve Muckle <[email protected]>
--- .../rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c +11 -4
@@ -18,12 +18,19 @@*/ #define _GNU_SOURCE +#include <err.h> #include <pthread.h> #include "tst_safe_pthread.h" #include "tst_test.h" #include "lapi/syscalls.h" +#ifndef ANDROID +#define SI_SIGVAL si_sigval +#else +#define SI_SIGVAL _sigval +#endif +static char sigval_send[] ="rt_tgsigqueueinfo data" ;static volatile int signum_rcv;static char *sigval_rcv;
@@ -32,7 +39,7 @@ static void sigusr1_handler(int signum, siginfo_t *uinfo, void *p LTP_ATTRIBUTE_UNUSED) { signum_rcv = signum; - sigval_rcv = uinfo->_sifields._rt.si_sigval.sival_ptr; + sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; }void *send_rcv_func (void *arg)
@@ -44,7 +51,7 @@ void *send_rcv_func(void *arg) uinfo.si_errno =0 ; uinfo.si_code =SI_QUEUE ; - uinfo._sifields._rt.si_sigval.sival_ptr = sigval_send; + uinfo._sifields._rt.SI_SIGVAL.sival_ptr = sigval_send;TEST (tst_syscall (__NR_rt_tgsigqueueinfo,getpid (),syscall (__NR_gettid),SIGUSR1 , &uinfo));
@@ -106,7 +113,7 @@ static void verify_signal_parent_thread(void) uinfo.si_errno =0 ; uinfo.si_code =SI_QUEUE ; - uinfo._sifields._rt.si_sigval.sival_ptr = sigval_send; + uinfo._sifields._rt.SI_SIGVAL.sival_ptr = sigval_send;TEST (tst_syscall (__NR_rt_tgsigqueueinfo,getpid (), tid,SIGUSR1 , &uinfo));
@@ -123,7 +130,7 @@ void *sender_func(void *arg) uinfo.si_errno =0 ; uinfo.si_code =SI_QUEUE ; - uinfo._sifields._rt.si_sigval.sival_ptr = sigval_send; + uinfo._sifields._rt.SI_SIGVAL.sival_ptr = sigval_send;TEST (tst_syscall (__NR_rt_tgsigqueueinfo,getpid (), *tid,SIGUSR1 , &uinfo));
Signature · 1 line
2.21.0.352.gf09ad66450-goog
PATCH 1/1 syscalls/rt_tgsigqueueinfo: fix compilation for Android
Quoted 10 lines · Steve Muckle
Glibc refers to the
sigval_tin _sifields._rt assi_sigval. This differs from what is in the kernel's uapisiginfo.h,_sigval, which is what is used by Android's bionic.Signed-off-by Steve Muckle <[email protected]>--- .../rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
Reviewed-by Sumit Garg <[email protected]>
Quoted 63 lines
testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c +11
-5@@ -18,12 +18,19 @@*/ #define _GNU_SOURCE +#include <err.h> #include <pthread.h> #include "tst_safe_pthread.h" #include "tst_test.h" #include "lapi/syscalls.h" +#ifndef ANDROID +#define SI_SIGVAL si_sigval +#else +#define SI_SIGVAL _sigval +#endif +static char sigval_send[] ="rt_tgsigqueueinfo data" ;static volatile int signum_rcv;static char *sigval_rcv;@@ -32,7 +39,7 @@ static void sigusr1_handler(int signum, siginfo_t *uinfo, void *p LTP_ATTRIBUTE_UNUSED) { signum_rcv = signum; - sigval_rcv = uinfo->_sifields._rt.si_sigval.sival_ptr; + sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; }void *send_rcv_func (void *arg)@@ -44,7 +51,7 @@ void *send_rcv_func(void *arg) uinfo.si_errno =0 ; uinfo.si_code =SI_QUEUE ; - uinfo._sifields._rt.si_sigval.sival_ptr = sigval_send; + uinfo._sifields._rt.SI_SIGVAL.sival_ptr = sigval_send;TEST (tst_syscall (__NR_rt_tgsigqueueinfo,getpid (),syscall (__NR_gettid),SIGUSR1 , &uinfo));@@ -106,7 +113,7 @@ static void verify_signal_parent_thread(void) uinfo.si_errno =0 ; uinfo.si_code =SI_QUEUE ; - uinfo._sifields._rt.si_sigval.sival_ptr = sigval_send; + uinfo._sifields._rt.SI_SIGVAL.sival_ptr = sigval_send;TEST (tst_syscall (__NR_rt_tgsigqueueinfo,getpid (), tid,SIGUSR1 , &uinfo));@@ -123,7 +130,7 @@ void *sender_func(void *arg) uinfo.si_errno =0 ; uinfo.si_code =SI_QUEUE ; - uinfo._sifields._rt.si_sigval.sival_ptr = sigval_send; + uinfo._sifields._rt.SI_SIGVAL.sival_ptr = sigval_send;TEST (tst_syscall (__NR_rt_tgsigqueueinfo,getpid (), *tid,SIGUSR1 , &uinfo)); --2.21.0.352.gf09ad66450-goog
PATCH 1/1 syscalls/rt_tgsigqueueinfo: fix compilation for Android
In reply to Steve MuckleHi!
Applied, thanks.
Signature · 2 lines
Cyril Hrubis [email protected]