RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 01:02:45 +00:00
Code Issues Activity Actions

Kernel: More PID/TID typing

Browse source
This commit is contained in:
Ben Wiederhake 2020-08-09 01:08:24 +02:00 • committed by Andreas Kling
parent 7bdf54c837
commit bee08a4b9f
21 changed files with 67 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/API/Syscall.h
View file

@ -440,7 +440,7 @@ struct SC_stat_params {
struct SC_ptrace_params { struct SC_ptrace_params {
int request; int request;
pid_t pid; pid_t tid;
Userspace<u8*> addr; Userspace<u8*> addr;
int data; int data;
}; };

4
Kernel/FileSystem/ProcFS.cpp
View file

@ -445,7 +445,7 @@ Optional<KBuffer> procfs$profile(InodeIdentifier)
KBufferBuilder builder; KBufferBuilder builder;
JsonObjectSerializer object(builder); JsonObjectSerializer object(builder);
object.add("pid", Profiling::pid()); object.add("pid", Profiling::pid().value());
object.add("executable", Profiling::executable_path()); object.add("executable", Profiling::executable_path());
auto array = object.add_array("events"); auto array = object.add_array("events");
@ -453,7 +453,7 @@ Optional<KBuffer> procfs$profile(InodeIdentifier)
Profiling::for_each_sample([&](auto& sample) { Profiling::for_each_sample([&](auto& sample) {
auto object = array.add_object(); auto object = array.add_object();
object.add("type", "sample"); object.add("type", "sample");
object.add("tid", sample.tid); object.add("tid", sample.tid.value());
object.add("timestamp", sample.timestamp); object.add("timestamp", sample.timestamp);
auto frames_array = object.add_array("stack"); auto frames_array = object.add_array("stack");
for (size_t i = 0; i < Profiling::max_stack_frame_count; ++i) { for (size_t i = 0; i < Profiling::max_stack_frame_count; ++i) {

2
Kernel/Process.cpp
View file

@ -834,7 +834,7 @@ KBuffer Process::backtrace() const
{ {
KBufferBuilder builder; KBufferBuilder builder;
for_each_thread([&](Thread& thread) { for_each_thread([&](Thread& thread) {
builder.appendf("Thread %d (%s):\n", thread.tid(), thread.name().characters()); builder.appendf("Thread %d (%s):\n", thread.tid().value(), thread.name().characters());
builder.append(thread.backtrace()); builder.append(thread.backtrace());
return IterationDecision::Continue; return IterationDecision::Continue;
}); });

19
Kernel/Process.h
View file

@ -202,8 +202,8 @@ public:
int sys$dbgputch(u8); int sys$dbgputch(u8);
int sys$dbgputstr(Userspace<const u8*>, int length); int sys$dbgputstr(Userspace<const u8*>, int length);
int sys$dump_backtrace(); int sys$dump_backtrace();
int sys$gettid(); pid_t sys$gettid();
int sys$donate(int tid); int sys$donate(pid_t tid);
int sys$ftruncate(int fd, off_t); int sys$ftruncate(int fd, off_t);
pid_t sys$setsid(); pid_t sys$setsid();
pid_t sys$getsid(pid_t); pid_t sys$getsid(pid_t);
@ -306,10 +306,10 @@ public:
int sys$sched_getparam(pid_t pid, Userspace<struct sched_param*>); int sys$sched_getparam(pid_t pid, Userspace<struct sched_param*>);
int sys$create_thread(void* (*)(void*), Userspace<const Syscall::SC_create_thread_params*>); int sys$create_thread(void* (*)(void*), Userspace<const Syscall::SC_create_thread_params*>);
void sys$exit_thread(void*); void sys$exit_thread(void*);
int sys$join_thread(int tid, void** exit_value); int sys$join_thread(pid_t tid, void** exit_value);
int sys$detach_thread(int tid); int sys$detach_thread(pid_t tid);
int sys$set_thread_name(int tid, const char* buffer, size_t buffer_size); int sys$set_thread_name(pid_t tid, const char* buffer, size_t buffer_size);
int sys$get_thread_name(int tid, char* buffer, size_t buffer_size); int sys$get_thread_name(pid_t tid, char* buffer, size_t buffer_size);
int sys$rename(Userspace<const Syscall::SC_rename_params*>); int sys$rename(Userspace<const Syscall::SC_rename_params*>);
int sys$mknod(Userspace<const Syscall::SC_mknod_params*>); int sys$mknod(Userspace<const Syscall::SC_mknod_params*>);
int sys$shbuf_create(int, void** buffer); int sys$shbuf_create(int, void** buffer);
@ -330,7 +330,7 @@ public:
int sys$profiling_enable(pid_t); int sys$profiling_enable(pid_t);
int sys$profiling_disable(pid_t); int sys$profiling_disable(pid_t);
int sys$futex(Userspace<const Syscall::SC_futex_params*>); int sys$futex(Userspace<const Syscall::SC_futex_params*>);
int sys$set_thread_boost(int tid, int amount); int sys$set_thread_boost(pid_t tid, int amount);
int sys$set_process_boost(pid_t, int amount); int sys$set_process_boost(pid_t, int amount);
int sys$chroot(const char* path, size_t path_length, int mount_flags); int sys$chroot(const char* path, size_t path_length, int mount_flags);
int sys$pledge(Userspace<const Syscall::SC_pledge_params*>); int sys$pledge(Userspace<const Syscall::SC_pledge_params*>);
@ -597,7 +597,7 @@ private:
void disown_all_shared_buffers(); void disown_all_shared_buffers();
KResult do_kill(Process&, int signal); KResult do_kill(Process&, int signal);
KResult do_killpg(pid_t pgrp, int signal); KResult do_killpg(ProcessGroupID pgrp, int signal);
KResult do_killall(int signal); KResult do_killall(int signal);
KResult do_killself(int signal); KResult do_killself(int signal);
@ -739,8 +739,7 @@ inline void Process::for_each_child(Callback callback)
ScopedSpinLock lock(g_processes_lock); ScopedSpinLock lock(g_processes_lock);
for (auto* process = g_processes->head(); process;) { for (auto* process = g_processes->head(); process;) {
auto* next_process = process->next(); auto* next_process = process->next();
// FIXME: PID/TID BUG if (process->ppid() == my_pid || process->has_tracee_thread(m_pid)) {
if (process->ppid() == my_pid || process->has_tracee_thread(m_pid.value())) {
if (callback(*process) == IterationDecision::Break) if (callback(*process) == IterationDecision::Break)
break; break;
} }

7
Kernel/Profiling.cpp
View file

@ -40,7 +40,7 @@ namespace Profiling {
static KBufferImpl* s_profiling_buffer; static KBufferImpl* s_profiling_buffer;
static size_t s_slot_count; static size_t s_slot_count;
static size_t s_next_slot_index; static size_t s_next_slot_index;
static u32 s_pid; static ProcessID s_pid { -1 };
String& executable_path() String& executable_path()
{ {
@ -50,7 +50,7 @@ String& executable_path()
return *path; return *path;
} }
u32 pid() ProcessID pid()
{ {
return s_pid; return s_pid;
} }
@ -61,7 +61,7 @@ void start(Process& process)
executable_path() = process.executable()->absolute_path().impl(); executable_path() = process.executable()->absolute_path().impl();
else else
executable_path() = {}; executable_path() = {};
s_pid = process.pid().value(); // FIXME: PID/TID INCOMPLETE s_pid = process.pid();
if (!s_profiling_buffer) { if (!s_profiling_buffer) {
s_profiling_buffer = RefPtr<KBufferImpl>(KBuffer::create_with_size(8 * MB).impl()).leak_ref(); s_profiling_buffer = RefPtr<KBufferImpl>(KBuffer::create_with_size(8 * MB).impl()).leak_ref();
@ -87,6 +87,7 @@ Sample& next_sample_slot()
void stop() void stop()
{ {
// FIXME: This probably shouldn't be empty.
} }
void did_exec(const String& new_executable_path) void did_exec(const String& new_executable_path)

6
Kernel/Profiling.h
View file

@ -39,13 +39,13 @@ namespace Profiling {
constexpr size_t max_stack_frame_count = 50; constexpr size_t max_stack_frame_count = 50;
struct Sample { struct Sample {
i32 pid; ProcessID pid;
i32 tid; ThreadID tid;
u64 timestamp; u64 timestamp;
u32 frames[max_stack_frame_count]; u32 frames[max_stack_frame_count];
}; };
extern u32 pid(); extern ProcessID pid();
extern String& executable_path(); extern String& executable_path();
Sample& next_sample_slot(); Sample& next_sample_slot();

8
Kernel/Ptrace.cpp
View file

@ -43,13 +43,17 @@ KResultOr<u32> handle_syscall(const Kernel::Syscall::SC_ptrace_params& params, P
return KSuccess; return KSuccess;
} }
if (params.pid == caller.pid().value()) // FIXME: PID/TID BUG
// This bug allows to request PT_ATTACH (or anything else) the same process, as
// long it is not the main thread. Alternatively, if this is desired, then the
// bug is that this prevents PT_ATTACH to the main thread from another thread.
if (params.tid == caller.pid().value())
return KResult(-EINVAL); return KResult(-EINVAL);
Thread* peer = nullptr; Thread* peer = nullptr;
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
peer = Thread::from_tid(params.pid); peer = Thread::from_tid(params.tid);
} }
if (!peer) if (!peer)
return KResult(-ESRCH); return KResult(-ESRCH);

5
Kernel/Scheduler.cpp
View file

@ -684,9 +684,8 @@ void Scheduler::timer_tick(const RegisterState& regs)
SmapDisabler disabler; SmapDisabler disabler;
auto backtrace = current_thread->raw_backtrace(regs.ebp, regs.eip); auto backtrace = current_thread->raw_backtrace(regs.ebp, regs.eip);
auto& sample = Profiling::next_sample_slot(); auto& sample = Profiling::next_sample_slot();
// FIXME: PID/TID INCOMPLETE sample.pid = current_thread->process().pid();
sample.pid = current_thread->process().pid().value(); sample.tid = current_thread->tid();
sample.tid = current_thread->tid().value();
sample.timestamp = g_uptime; sample.timestamp = g_uptime;
for (size_t i = 0; i < min(backtrace.size(), Profiling::max_stack_frame_count); ++i) { for (size_t i = 0; i < min(backtrace.size(), Profiling::max_stack_frame_count); ++i) {
sample.frames[i] = backtrace[i]; sample.frames[i] = backtrace[i];

2
Kernel/Syscalls/execve.cpp
View file

@ -282,7 +282,7 @@ int Process::do_exec(NonnullRefPtr<FileDescription> main_program_description, Ve
m_master_tls_size = master_tls_size; m_master_tls_size = master_tls_size;
m_master_tls_alignment = master_tls_alignment; m_master_tls_alignment = master_tls_alignment;
// FIXME: PID/TID BUG // FIXME: PID/TID ISSUE
m_pid = new_main_thread->tid().value(); m_pid = new_main_thread->tid().value();
new_main_thread->make_thread_specific_region({}); new_main_thread->make_thread_specific_region({});
new_main_thread->reset_fpu_state(); new_main_thread->reset_fpu_state();

5
Kernel/Syscalls/kill.cpp
View file

@ -43,7 +43,7 @@ KResult Process::do_kill(Process& process, int signal)
return KSuccess; return KSuccess;
} }
KResult Process::do_killpg(pid_t pgrp, int signal) KResult Process::do_killpg(ProcessGroupID pgrp, int signal)
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
@ -52,8 +52,7 @@ KResult Process::do_killpg(pid_t pgrp, int signal)
// Send the signal to all processes in the given group. // Send the signal to all processes in the given group.
if (pgrp == 0) { if (pgrp == 0) {
// Send the signal to our own pgrp. // Send the signal to our own pgrp.
// FIXME: PIF/PGID INCOMPLETE pgrp = pgid();
pgrp = pgid().value();
} }
bool group_was_empty = true; bool group_was_empty = true;

22
Kernel/Syscalls/sched.cpp
View file

@ -35,7 +35,7 @@ int Process::sys$yield()
return 0; return 0;
} }
int Process::sys$donate(int tid) int Process::sys$donate(pid_t tid)
{ {
REQUIRE_PROMISE(stdio); REQUIRE_PROMISE(stdio);
if (tid < 0) if (tid < 0)
@ -48,7 +48,7 @@ int Process::sys$donate(int tid)
return 0; return 0;
} }
int Process::sys$sched_setparam(int tid, Userspace<const struct sched_param*> user_param) int Process::sys$sched_setparam(int pid, Userspace<const struct sched_param*> user_param)
{ {
REQUIRE_PROMISE(proc); REQUIRE_PROMISE(proc);
if (!validate_read_typed(user_param)) if (!validate_read_typed(user_param))
@ -59,8 +59,8 @@ int Process::sys$sched_setparam(int tid, Userspace<const struct sched_param*> us
InterruptDisabler disabler; InterruptDisabler disabler;
auto* peer = Thread::current(); auto* peer = Thread::current();
if (tid != 0) if (pid != 0)
peer = Thread::from_tid(tid); peer = Thread::from_tid(pid);
if (!peer) if (!peer)
return -ESRCH; return -ESRCH;
@ -68,8 +68,7 @@ int Process::sys$sched_setparam(int tid, Userspace<const struct sched_param*> us
if (!is_superuser() && m_euid != peer->process().m_uid && m_uid != peer->process().m_uid) if (!is_superuser() && m_euid != peer->process().m_uid && m_uid != peer->process().m_uid)
return -EPERM; return -EPERM;
if (desired_param.sched_priority < THREAD_PRIORITY_MIN || if (desired_param.sched_priority < THREAD_PRIORITY_MIN || desired_param.sched_priority > THREAD_PRIORITY_MAX)
desired_param.sched_priority > THREAD_PRIORITY_MAX)
return -EINVAL; return -EINVAL;
peer->set_priority((u32)desired_param.sched_priority); peer->set_priority((u32)desired_param.sched_priority);
@ -84,8 +83,11 @@ int Process::sys$sched_getparam(pid_t pid, Userspace<struct sched_param*> user_p
InterruptDisabler disabler; InterruptDisabler disabler;
auto* peer = Thread::current(); auto* peer = Thread::current();
if (pid != 0) if (pid != 0) {
// FIXME: PID/TID BUG
// The entire process is supposed to be affected.
peer = Thread::from_tid(pid); peer = Thread::from_tid(pid);
}
if (!peer) if (!peer)
return -ESRCH; return -ESRCH;
@ -93,12 +95,14 @@ int Process::sys$sched_getparam(pid_t pid, Userspace<struct sched_param*> user_p
if (!is_superuser() && m_euid != peer->process().m_uid && m_uid != peer->process().m_uid) if (!is_superuser() && m_euid != peer->process().m_uid && m_uid != peer->process().m_uid)
return -EPERM; return -EPERM;
struct sched_param param { (int) peer->priority() }; struct sched_param param {
(int)peer->priority()
};
copy_to_user(user_param, &param); copy_to_user(user_param, &param);
return 0; return 0;
} }
int Process::sys$set_thread_boost(int tid, int amount) int Process::sys$set_thread_boost(pid_t tid, int amount)
{ {
REQUIRE_PROMISE(proc); REQUIRE_PROMISE(proc);
if (amount < 0 || amount > 20) if (amount < 0 || amount > 20)

10
Kernel/Syscalls/thread.cpp
View file

@ -73,7 +73,7 @@ int Process::sys$create_thread(void* (*entry)(void*), Userspace<const Syscall::S
// length + 4 to give space for our extra junk at the end // length + 4 to give space for our extra junk at the end
StringBuilder builder(m_name.length() + 4); StringBuilder builder(m_name.length() + 4);
builder.append(m_name); builder.append(m_name);
builder.appendf("[%d]", thread->tid()); builder.appendf("[%d]", thread->tid().value());
thread->set_name(builder.to_string()); thread->set_name(builder.to_string());
thread->set_priority(requested_thread_priority); thread->set_priority(requested_thread_priority);
@ -102,7 +102,7 @@ void Process::sys$exit_thread(void* exit_value)
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
int Process::sys$detach_thread(int tid) int Process::sys$detach_thread(pid_t tid)
{ {
REQUIRE_PROMISE(thread); REQUIRE_PROMISE(thread);
InterruptDisabler disabler; InterruptDisabler disabler;
@ -117,7 +117,7 @@ int Process::sys$detach_thread(int tid)
return 0; return 0;
} }
int Process::sys$join_thread(int tid, void** exit_value) int Process::sys$join_thread(pid_t tid, void** exit_value)
{ {
REQUIRE_PROMISE(thread); REQUIRE_PROMISE(thread);
if (exit_value && !validate_write_typed(exit_value)) if (exit_value && !validate_write_typed(exit_value))
@ -169,7 +169,7 @@ int Process::sys$join_thread(int tid, void** exit_value)
return 0; return 0;
} }
int Process::sys$set_thread_name(int tid, const char* user_name, size_t user_name_length) int Process::sys$set_thread_name(pid_t tid, const char* user_name, size_t user_name_length)
{ {
REQUIRE_PROMISE(thread); REQUIRE_PROMISE(thread);
auto name = validate_and_copy_string_from_user(user_name, user_name_length); auto name = validate_and_copy_string_from_user(user_name, user_name_length);
@ -188,7 +188,7 @@ int Process::sys$set_thread_name(int tid, const char* user_name, size_t user_nam
thread->set_name(name); thread->set_name(name);
return 0; return 0;
} }
int Process::sys$get_thread_name(int tid, char* buffer, size_t buffer_size) int Process::sys$get_thread_name(pid_t tid, char* buffer, size_t buffer_size)
{ {
REQUIRE_PROMISE(thread); REQUIRE_PROMISE(thread);
if (buffer_size == 0) if (buffer_size == 0)

7
Kernel/Thread.cpp
View file

@ -54,11 +54,10 @@ Thread::Thread(NonnullRefPtr<Process> process)
// First thread gets TID == PID // First thread gets TID == PID
m_tid = m_process->pid().value(); m_tid = m_process->pid().value();
} else { } else {
// TODO: Use separate counter?
m_tid = Process::allocate_pid().value(); m_tid = Process::allocate_pid().value();
} }
#ifdef THREAD_DEBUG #ifdef THREAD_DEBUG
dbg() << "Created new thread " << m_process->name() << "(" << m_process->pid() << ":" << m_tid << ")"; dbg() << "Created new thread " << m_process->name() << "(" << m_process->pid().value() << ":" << m_tid.value() << ")";
#endif #endif
set_default_signal_dispositions(); set_default_signal_dispositions();
m_fpu_state = (FPUState*)kmalloc_aligned(sizeof(FPUState), 16); m_fpu_state = (FPUState*)kmalloc_aligned(sizeof(FPUState), 16);
@ -87,7 +86,7 @@ Thread::Thread(NonnullRefPtr<Process> process)
m_tss.cr3 = m_process->page_directory().cr3(); m_tss.cr3 = m_process->page_directory().cr3();
m_kernel_stack_region = MM.allocate_kernel_region(default_kernel_stack_size, String::format("Kernel Stack (Thread %d)", m_tid), Region::Access::Read | Region::Access::Write, false, true); m_kernel_stack_region = MM.allocate_kernel_region(default_kernel_stack_size, String::format("Kernel Stack (Thread %d)", m_tid.value()), Region::Access::Read | Region::Access::Write, false, true);
m_kernel_stack_region->set_stack(true); m_kernel_stack_region->set_stack(true);
m_kernel_stack_base = m_kernel_stack_region->vaddr().get(); m_kernel_stack_base = m_kernel_stack_region->vaddr().get();
m_kernel_stack_top = m_kernel_stack_region->vaddr().offset(default_kernel_stack_size).get() & 0xfffffff8u; m_kernel_stack_top = m_kernel_stack_region->vaddr().offset(default_kernel_stack_size).get() & 0xfffffff8u;
@ -963,7 +962,7 @@ void Thread::wake_from_queue()
set_state(State::Running); set_state(State::Running);
} }
Thread* Thread::from_tid(int tid) Thread* Thread::from_tid(ThreadID tid)
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
Thread* found_thread = nullptr; Thread* found_thread = nullptr;

2
Kernel/Thread.h
View file

@ -82,7 +82,7 @@ public:
explicit Thread(NonnullRefPtr<Process>); explicit Thread(NonnullRefPtr<Process>);
~Thread(); ~Thread();
static Thread* from_tid(pid_t); static Thread* from_tid(ThreadID);
static void finalize_dying_threads(); static void finalize_dying_threads();
ThreadID tid() const { return m_tid; } ThreadID tid() const { return m_tid; }

2
Kernel/init.cpp
View file

@ -336,7 +336,7 @@ void init_stage2()
tty0->set_graphical(!text_mode); tty0->set_graphical(!text_mode);
Thread* thread = nullptr; Thread* thread = nullptr;
auto userspace_init = kernel_command_line().lookup("init").value_or("/bin/SystemServer"); auto userspace_init = kernel_command_line().lookup("init").value_or("/bin/SystemServer");
Process::create_user_process(thread, userspace_init, (uid_t)0, (gid_t)0, (pid_t)0, error, {}, {}, tty0); Process::create_user_process(thread, userspace_init, (uid_t)0, (gid_t)0, ProcessID(0), error, {}, {}, tty0);
if (error != 0) { if (error != 0) {
klog() << "init_stage2: error spawning SystemServer: " << error; klog() << "init_stage2: error spawning SystemServer: " << error;
Processor::halt(); Processor::halt();

5
Libraries/LibC/serenity.cpp
View file

@ -60,13 +60,13 @@ int profiling_disable(pid_t pid)
__RETURN_WITH_ERRNO(rc, rc, -1); __RETURN_WITH_ERRNO(rc, rc, -1);
} }
int set_thread_boost(int tid, int amount) int set_thread_boost(pid_t tid, int amount)
{ {
int rc = syscall(SC_set_thread_boost, tid, amount); int rc = syscall(SC_set_thread_boost, tid, amount);
__RETURN_WITH_ERRNO(rc, rc, -1); __RETURN_WITH_ERRNO(rc, rc, -1);
} }
int set_process_boost(int tid, int amount) int set_process_boost(pid_t tid, int amount)
{ {
int rc = syscall(SC_set_process_boost, tid, amount); int rc = syscall(SC_set_process_boost, tid, amount);
__RETURN_WITH_ERRNO(rc, rc, -1); __RETURN_WITH_ERRNO(rc, rc, -1);
@ -136,5 +136,4 @@ int get_stack_bounds(uintptr_t* user_stack_base, size_t* user_stack_size)
int rc = syscall(SC_get_stack_bounds, user_stack_base, user_stack_size); int rc = syscall(SC_get_stack_bounds, user_stack_base, user_stack_size);
__RETURN_WITH_ERRNO(rc, rc, -1); __RETURN_WITH_ERRNO(rc, rc, -1);
} }
} }

2
Libraries/LibC/serenity.h
View file

@ -52,7 +52,7 @@ int profiling_disable(pid_t);
#define THREAD_PRIORITY_HIGH 50 #define THREAD_PRIORITY_HIGH 50
#define THREAD_PRIORITY_MAX 99 #define THREAD_PRIORITY_MAX 99
int set_thread_boost(int tid, int amount); int set_thread_boost(pid_t tid, int amount);
int set_process_boost(pid_t, int amount); int set_process_boost(pid_t, int amount);
#define FUTEX_WAIT 1 #define FUTEX_WAIT 1

4
Libraries/LibC/sys/ptrace.cpp
View file

@ -31,7 +31,7 @@
extern "C" { extern "C" {
int ptrace(int request, pid_t pid, void* addr, int data) int ptrace(int request, pid_t tid, void* addr, int data)
{ {
// PT_PEEK needs special handling since the syscall wrapper // PT_PEEK needs special handling since the syscall wrapper
@ -49,7 +49,7 @@ int ptrace(int request, pid_t pid, void* addr, int data)
Syscall::SC_ptrace_params params { Syscall::SC_ptrace_params params {
request, request,
pid, tid,
reinterpret_cast<u8*>(addr), reinterpret_cast<u8*>(addr),
data data
}; };

5
Libraries/LibC/sys/ptrace.h
View file

@ -40,6 +40,9 @@ __BEGIN_DECLS
#define PT_POKE 8 #define PT_POKE 8
#define PT_SETREGS 9 #define PT_SETREGS 9
int ptrace(int request, pid_t pid, void* addr, int data); // FIXME: PID/TID ISSUE
// Affects the entirety of LibDebug and Userland/strace.cpp.
// See also Kernel/Ptrace.cpp
int ptrace(int request, pid_t tid, void* addr, int data);
__END_DECLS __END_DECLS

2
Libraries/LibCore/ProcessStatisticsReader.h
View file

@ -33,7 +33,7 @@
namespace Core { namespace Core {
struct ThreadStatistics { struct ThreadStatistics {
int tid; pid_t tid;
unsigned times_scheduled; unsigned times_scheduled;
unsigned ticks; unsigned ticks;
unsigned syscall_count; unsigned syscall_count;

6
Libraries/LibThread/Lock.h
View file

@ -44,7 +44,7 @@ public:
void unlock(); void unlock();
private: private:
Atomic<int> m_holder { 0 }; Atomic<pid_t> m_holder { 0 };
u32 m_level { 0 }; u32 m_level { 0 };
}; };
@ -65,14 +65,14 @@ private:
ALWAYS_INLINE void Lock::lock() ALWAYS_INLINE void Lock::lock()
{ {
int tid = gettid(); pid_t tid = gettid();
if (m_holder == tid) { if (m_holder == tid) {
++m_level; ++m_level;
return; return;
} }
for (;;) { for (;;) {
int expected = 0; int expected = 0;
if (m_holder.compare_exchange_strong(expected, tid, AK::memory_order_acq_rel)) { if (m_holder.compare_exchange_strong(expected, tid, AK::memory_order_acq_rel)) {
m_level = 1; m_level = 1;
return; return;
} }