On 23/10/2018 14:07, Aleksandar Markovic wrote:
> From: Aleksandar Rikalo <arik...@wavecomp.com>
>
> Add support for semtimedop() emulation.
>
> Signed-off-by: Aleksandar Rikalo <arik...@wavecomp.com>
> Signed-off-by: Aleksandar Markovic <amarko...@wavecomp.com>
> ---
> linux-user/syscall.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 8b01ab0..e722ba8 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -6162,7 +6162,29 @@ static inline abi_long host_to_target_stat64(void
> *cpu_env,
> return 0;
> }
> #endif
> +#ifdef TARGET_NR_semtimedop
> +static inline abi_long do_semtimedop(int semid, abi_long ptr, unsigned nsops,
> + abi_long timeout)
> +{
> + struct sembuf sops[nsops];
> + struct timespec ts, *pts;
> +
> + if (timeout) {
> + pts = &ts;
> + if (target_to_host_timespec(pts, timeout)) {
> + return -TARGET_EFAULT;
> + }
> + } else {
> + pts = NULL;
> + }
>
> + if (target_to_host_sembuf(sops, ptr, nsops)) {
> + return -TARGET_EFAULT;
> + }
> +
> + return get_errno(semtimedop(semid, sops, nsops, pts));
> +}
The current function do_semop() actually uses a safe_semtimedop() with a
NULL timeout pointer. Perhaps you can change/rename this function to
take the timeout pointer and convert it, and use it for TARGET_NR_semop
with NULL timeout pointer and with TARGET_NR_semtimeop with the pointer
to the target timeout.
And agree with Philippe, I think it's a good opportunity to replace the
stack allocated structure by a g_mallocated_one()
Thanks,
Laurent
