mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-22 23:50:19 +00:00
da5cc34ebb
Fix some problems with join blocks where the joining thread block condition was added twice, which lead to a crash when trying to unblock that condition a second time. Deferred block condition evaluation by File objects were also not properly keeping the File object alive, which lead to some random crashes and corruption problems. Other problems were caused by the fact that the Queued state didn't handle signals/interruptions consistently. To solve these issues we remove this state entirely, along with Thread::wait_on and change the WaitQueue into a BlockCondition instead. Also, deliver signals even if there isn't going to be a context switch to another thread. Fixes #4336 and #4330
86 lines
3 KiB
C++
86 lines
3 KiB
C++
/*
|
|
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
* list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <AK/Time.h>
|
|
#include <Kernel/Process.h>
|
|
|
|
namespace Kernel {
|
|
|
|
WaitQueue& Process::futex_queue(Userspace<const i32*> userspace_address)
|
|
{
|
|
auto& queue = m_futex_queues.ensure(userspace_address.ptr());
|
|
if (!queue)
|
|
queue = make<WaitQueue>();
|
|
return *queue;
|
|
}
|
|
|
|
int Process::sys$futex(Userspace<const Syscall::SC_futex_params*> user_params)
|
|
{
|
|
REQUIRE_PROMISE(thread);
|
|
|
|
Syscall::SC_futex_params params;
|
|
if (!copy_from_user(¶ms, user_params))
|
|
return -EFAULT;
|
|
|
|
switch (params.futex_op) {
|
|
case FUTEX_WAIT: {
|
|
i32 user_value;
|
|
if (!copy_from_user(&user_value, params.userspace_address))
|
|
return -EFAULT;
|
|
if (user_value != params.val)
|
|
return -EAGAIN;
|
|
|
|
Thread::BlockTimeout timeout;
|
|
if (params.timeout) {
|
|
timespec ts_abstimeout { 0, 0 };
|
|
if (!copy_from_user(&ts_abstimeout, params.timeout))
|
|
return -EFAULT;
|
|
timeout = Thread::BlockTimeout(true, &ts_abstimeout);
|
|
}
|
|
|
|
WaitQueue& wait_queue = futex_queue((FlatPtr)params.userspace_address);
|
|
Thread::BlockResult result = wait_queue.wait_on(timeout, "Futex");
|
|
if (result == Thread::BlockResult::InterruptedByTimeout) {
|
|
return -ETIMEDOUT;
|
|
}
|
|
|
|
break;
|
|
}
|
|
case FUTEX_WAKE:
|
|
if (params.val == 0)
|
|
return 0;
|
|
if (params.val == 1) {
|
|
futex_queue((FlatPtr)params.userspace_address).wake_one();
|
|
} else {
|
|
futex_queue((FlatPtr)params.userspace_address).wake_n(params.val);
|
|
}
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
}
|