RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 14:15:07 +00:00
Code Issues Activity Actions

Kernel: Use TRY() in Thread

Browse source
This commit is contained in:
Andreas Kling 2021-09-05 14:06:42 +02:00
parent ae885b188f
commit d65fbdc44d
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Kernel/Thread.cpp
View file

@ -1028,10 +1028,7 @@ RegisterState& Thread::get_register_dump_from_stack()
KResultOr<NonnullRefPtr<Thread>> Thread::try_clone(Process& process) KResultOr<NonnullRefPtr<Thread>> Thread::try_clone(Process& process)
{ {
auto thread_or_error = Thread::try_create(process); auto clone = TRY(Thread::try_create(process));
if (thread_or_error.is_error())
return thread_or_error.error();
auto& clone = thread_or_error.value();
auto signal_action_data_span = m_signal_action_data.span(); auto signal_action_data_span = m_signal_action_data.span();
signal_action_data_span.copy_to(clone->m_signal_action_data.span()); signal_action_data_span.copy_to(clone->m_signal_action_data.span());
clone->m_signal_mask = m_signal_mask; clone->m_signal_mask = m_signal_mask;
@ -1196,14 +1193,12 @@ KResult Thread::make_thread_specific_region(Badge<Process>)
if (!range.has_value()) if (!range.has_value())
return ENOMEM; return ENOMEM;
auto region_or_error = process().address_space().allocate_region(range.value(), "Thread-specific", PROT_READ | PROT_WRITE); auto* region = TRY(process().address_space().allocate_region(range.value(), "Thread-specific", PROT_READ | PROT_WRITE));
if (region_or_error.is_error())
return region_or_error.error();
m_thread_specific_range = range.value(); m_thread_specific_range = range.value();
SmapDisabler disabler; SmapDisabler disabler;
auto* thread_specific_data = (ThreadSpecificData*)region_or_error.value()->vaddr().offset(align_up_to(process().m_master_tls_size, thread_specific_region_alignment())).as_ptr(); auto* thread_specific_data = (ThreadSpecificData*)region->vaddr().offset(align_up_to(process().m_master_tls_size, thread_specific_region_alignment())).as_ptr();
auto* thread_local_storage = (u8*)((u8*)thread_specific_data) - align_up_to(process().m_master_tls_size, process().m_master_tls_alignment); auto* thread_local_storage = (u8*)((u8*)thread_specific_data) - align_up_to(process().m_master_tls_size, process().m_master_tls_alignment);
m_thread_specific_data = VirtualAddress(thread_specific_data); m_thread_specific_data = VirtualAddress(thread_specific_data);
thread_specific_data->self = thread_specific_data; thread_specific_data->self = thread_specific_data;