Re: [Xenomai-help] mlockall error after calling mlockall()

[Jan Kiszka <jan.kiszka@domain.hid>]

[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]

Jan Kiszka wrote:
> Gilles Chanteperdrix wrote:
>> Gilles Chanteperdrix wrote:
>>> Try this:
>>>
>>> diff --git a/ksrc/skins/native/syscall.c b/ksrc/skins/native/syscall.c
>>> index 40e5cfd..d4e885c 100644
>>> --- a/ksrc/skins/native/syscall.c
>>> +++ b/ksrc/skins/native/syscall.c
>>> @@ -1869,9 +1869,12 @@ static int __rt_cond_wait_prologue(struct pt_regs *regs)
>>>
>>>         err = rt_cond_wait_prologue(cond, mutex, &lockcnt, timeout_mode, timeout);
>>>
>>> -       if (err == 0 || err == -ETIMEDOUT)
>>> -               err = rt_cond_wait_epilogue(mutex, lockcnt);
>>> -
>>> +       if (err == 0 || err == -ETIMEDOUT) {
>>> +               int loc_err = rt_cond_wait_epilogue(mutex, lockcnt);
>>> +               if (loc_err < 0)
>>> +                       err = loc_err;
>>> +       }
>>> +
>>>         if (err == -EINTR && __xn_reg_arg3(regs)
>>>             && __xn_safe_copy_to_user((void __user *)__xn_reg_arg3(regs),
>>>                                       &lockcnt, sizeof(lockcnt)))
>> No. That is not ok either. We need to store the first status somewhere
>> for returning it to user-space after looping several times in the
>> epilogue function.
> 
> Precisely (also in user space).
> 

As we do not specify if rt_cond_wait behaves like pthread_cond_wait on
signals or errors of the cond variable, I checked the 2.4 behavior
again: we used to ignore all errors of the final rt_mutex_lock. Guess we
should restore that for all contexts (except for -EINTR).

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]