public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/nolibc: implement waitpid() in terms of waitid()

Browse source 
The old wait4() syscall used by waitpid() before is not available everywhere.
Switch to the waitid() syscall which is the new replacement.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>
This commit is contained in:
Thomas Weißschuh 2025-04-11 11:00:45 +02:00 • committed by Thomas Weißschuh
parent 67fe525e34
commit 0c89abf5ab
1 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
tools/include/nolibc/sys/wait.h
View file

@ -15,6 +15,7 @@
* pid_t wait(int *status); * pid_t wait(int *status);
* pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage); * pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage);
* pid_t waitpid(pid_t pid, int *status, int options); * pid_t waitpid(pid_t pid, int *status, int options);
* int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options);
*/ */
static __attribute__((unused)) static __attribute__((unused))
@ -39,18 +40,6 @@ pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage)
return __sysret(sys_wait4(pid, status, options, rusage)); return __sysret(sys_wait4(pid, status, options, rusage));
} }
static __attribute__((unused))
pid_t waitpid(pid_t pid, int *status, int options)
{
return __sysret(sys_wait4(pid, status, options, NULL));
}
/*
* int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options);
*/
static __attribute__((unused)) static __attribute__((unused))
int sys_waitid(int which, pid_t pid, siginfo_t *infop, int options, struct rusage *rusage) int sys_waitid(int which, pid_t pid, siginfo_t *infop, int options, struct rusage *rusage)
{ {
@ -64,6 +53,63 @@ int waitid(int which, pid_t pid, siginfo_t *infop, int options)
} }
static __attribute__((unused))
pid_t waitpid(pid_t pid, int *status, int options)
{
int idtype, ret;
siginfo_t info;
pid_t id;
if (pid == INT_MIN) {
SET_ERRNO(ESRCH);
return -1;
} else if (pid < -1) {
idtype = P_PGID;
id = -pid;
} else if (pid == -1) {
idtype = P_ALL;
id = 0;
} else if (pid == 0) {
idtype = P_PGID;
id = 0;
} else {
idtype = P_PID;
id = pid;
}
options |= WEXITED;
ret = waitid(idtype, id, &info, options);
if (ret)
return ret;
switch (info.si_code) {
case 0:
*status = 0;
break;
case CLD_EXITED:
*status = (info.si_status & 0xff) << 8;
break;
case CLD_KILLED:
*status = info.si_status & 0x7f;
break;
case CLD_DUMPED:
*status = (info.si_status & 0x7f) | 0x80;
break;
case CLD_STOPPED:
case CLD_TRAPPED:
*status = (info.si_status << 8) + 0x7f;
break;
case CLD_CONTINUED:
*status = 0xffff;
break;
default:
return -1;
}
return info.si_pid;
}
/* make sure to include all global symbols */ /* make sure to include all global symbols */
#include "../nolibc.h" #include "../nolibc.h"