mirror of
				https://github.com/RGBCube/serenity
				synced 2025-10-31 22:12:44 +00:00 
			
		
		
		
	 2a78bf8596
			
		
	
	
		2a78bf8596
		
	
	
	
	
		
			
			The Process::Handler type has KResultOr<FlatPtr> as its return type. Using a different return type with an equally-sized template parameter sort of works but breaks once that condition is no longer true, e.g. for KResultOr<int> on x86_64. Ideally the syscall handlers would also take FlatPtrs as their args so we can get rid of the reinterpret_cast for the function pointer but I didn't quite feel like cleaning that up as well.
		
			
				
	
	
		
			49 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			49 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
 | |
|  *
 | |
|  * SPDX-License-Identifier: BSD-2-Clause
 | |
|  */
 | |
| 
 | |
| #include <Kernel/Debug.h>
 | |
| #include <Kernel/Process.h>
 | |
| 
 | |
| namespace Kernel {
 | |
| 
 | |
| KResultOr<siginfo_t> Process::do_waitid(idtype_t idtype, int id, int options)
 | |
| {
 | |
|     KResultOr<siginfo_t> result = KResult(KSuccess);
 | |
|     if (Thread::current()->block<Thread::WaitBlocker>({}, options, idtype, id, result).was_interrupted())
 | |
|         return EINTR;
 | |
|     VERIFY(!result.is_error() || (options & WNOHANG) || result.error() != KSuccess);
 | |
|     return result;
 | |
| }
 | |
| 
 | |
| KResultOr<FlatPtr> Process::sys$waitid(Userspace<const Syscall::SC_waitid_params*> user_params)
 | |
| {
 | |
|     REQUIRE_PROMISE(proc);
 | |
| 
 | |
|     Syscall::SC_waitid_params params;
 | |
|     if (!copy_from_user(¶ms, user_params))
 | |
|         return EFAULT;
 | |
| 
 | |
|     switch (params.idtype) {
 | |
|     case P_ALL:
 | |
|     case P_PID:
 | |
|     case P_PGID:
 | |
|         break;
 | |
|     default:
 | |
|         return EINVAL;
 | |
|     }
 | |
| 
 | |
|     dbgln_if(PROCESS_DEBUG, "sys$waitid({}, {}, {}, {})", params.idtype, params.id, params.infop, params.options);
 | |
| 
 | |
|     auto siginfo_or_error = do_waitid(static_cast<idtype_t>(params.idtype), params.id, params.options);
 | |
|     if (siginfo_or_error.is_error())
 | |
|         return siginfo_or_error.error();
 | |
| 
 | |
|     if (!copy_to_user(params.infop, &siginfo_or_error.value()))
 | |
|         return EFAULT;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| }
 |