mailing list of musl libc
 help / color / mirror / code / Atom feed
e4d3a05348bbc5c113ab922f3833d268b2fb650b blob 1242 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
 
#define _GNU_SOURCE
#include <sys/wait.h>
#include <sys/resource.h>
#include <string.h>
#include <errno.h>
#include "syscall.h"
#include "wait4_waitid.h"

pid_t wait4(pid_t pid, int *status, int options, struct rusage *ru)
{
	int r;
#ifdef SYS_wait4_time64
	if (ru) {
		long long kru64[18];
		r = __syscall(SYS_wait4_time64, pid, status, options, kru64);
		if (!r) {
			ru->ru_utime = (struct timeval)
				{ .tv_sec = kru64[0], .tv_usec = kru64[1] };
			ru->ru_stime = (struct timeval)
				{ .tv_sec = kru64[2], .tv_usec = kru64[3] };
			char *slots = (char *)&ru->ru_maxrss;
			for (int i=0; i<14; i++)
				*(long *)(slots + i*sizeof(long)) = kru64[4+i];
		}
		if (SYS_wait4_time64 == SYS_wait4 || r != -ENOSYS)
			return __syscall_ret(r);
	}
#endif
	char *dest = ru ? (char *)&ru->ru_maxrss - 4*sizeof(long) : 0;
#ifdef SYS_wait4
	r = __syscall(SYS_wait4, pid, status, options, dest);
#else
	r = __wait4_waitid(pid, status, options, dest, 0);
#endif
	if (r>0 && ru && sizeof(time_t) > sizeof(long)) {
		long kru[4];
		memcpy(kru, dest, 4*sizeof(long));
		ru->ru_utime = (struct timeval)
			{ .tv_sec = kru[0], .tv_usec = kru[1] };
		ru->ru_stime = (struct timeval)
			{ .tv_sec = kru[2], .tv_usec = kru[3] };
	}
	return __syscall_ret(r);
}
debug log:

solving e4d3a053 ...
found e4d3a053 in https://inbox.vuxu.org/musl/20200903112309.102601-8-sorear@fastmail.com/
found 83650e34 in https://git.vuxu.org/mirror/musl/
preparing index
index prepared:
100644 83650e34a860cccaf76c0b2aa102235b4114a9ba	src/linux/wait4.c

applying [1/1] https://inbox.vuxu.org/musl/20200903112309.102601-8-sorear@fastmail.com/
diff --git a/src/linux/wait4.c b/src/linux/wait4.c
index 83650e34..e4d3a053 100644

Checking patch src/linux/wait4.c...
Applied patch src/linux/wait4.c cleanly.

index at:
100644 e4d3a05348bbc5c113ab922f3833d268b2fb650b	src/linux/wait4.c

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).