Backport main branch improvements (#658)

* Add sys_ prefix to unwrapped system calls
* This change also implements getlogin() and getlogin_r().
* Add getgroups and setgroups (#619)
* Fix getgroups / setgroups tests across platforms. See #619
* Change accept type to struct sockaddr * (#630)
* vista: use old strace path
This commit is contained in:
Gavin Hayes 2022-10-10 23:44:29 -04:00 committed by GitHub
parent 4381b3d925
commit f4ff1729d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
831 changed files with 1381 additions and 1822 deletions

View file

@ -199,7 +199,7 @@ static int CloneXnu(int (*fn)(void *), char *stk, size_t stksz, int flags,
static int broken;
struct CloneArgs *wt;
if (!once) {
if (bsdthread_register(XnuThreadThunk, 0, 0, 0, 0, 0, 0) == -1) {
if (sys_bsdthread_register(XnuThreadThunk, 0, 0, 0, 0, 0, 0) == -1) {
broken = errno;
}
once = true;
@ -216,7 +216,8 @@ static int CloneXnu(int (*fn)(void *), char *stk, size_t stksz, int flags,
wt->ztid = flags & CLONE_CHILD_CLEARTID ? ctid : &wt->tid;
wt->tls = flags & CLONE_SETTLS ? tls : 0;
wt->lock._lock = 1;
if ((rc = bsdthread_create(fn, arg, wt, 0, PTHREAD_START_CUSTOM_XNU)) != -1) {
if ((rc = sys_bsdthread_create(fn, arg, wt, 0, PTHREAD_START_CUSTOM_XNU)) !=
-1) {
pthread_spin_lock(&wt->lock);
rc = wt->tid;
pthread_spin_unlock(&wt->lock);

View file

@ -28,7 +28,7 @@
#define PRI_FIFO_FREEBSD (PRI_REALTIME_FREEBSD | PRI_FIFO_BIT_FREEBSD)
#define PRI_TIMESHARE_FREEBSD 3
int rtprio_thread(int fun, int tid, struct rtprio *inout_rtp);
int sys_rtprio_thread(int fun, int tid, struct rtprio *inout_rtp);
int _pthread_setschedparam_freebsd(int tid, int policy,
const struct sched_param *param) {
@ -43,5 +43,5 @@ int _pthread_setschedparam_freebsd(int tid, int policy,
rtp.type = PRI_TIMESHARE_FREEBSD;
rtp.prio = 0;
}
return rtprio_thread(RTP_SET_FREEBSD, tid, &rtp);
return sys_rtprio_thread(RTP_SET_FREEBSD, tid, &rtp);
}

View file

@ -8,17 +8,18 @@ COSMOPOLITAN_C_START_
* @see darwin-libpthread/kern/kern_support.c
*/
int bsdthread_create(void *func, void *func_arg, void *stack, void *pthread,
uint32_t flags);
int bsdthread_terminate(void *stackaddr, size_t freesize, uint32_t port,
uint32_t sem);
int __pthread_kill(uint32_t port, int sig);
int bsdthread_register(
int sys_bsdthread_create(void *func, void *func_arg, void *stack, void *pthread,
uint32_t flags);
int sys_bsdthread_register(
void (*threadstart)(void *pthread, int machport, void *(*func)(void *),
void *arg, intptr_t *, unsigned),
void (*wqthread)(void *pthread, void *machport, void *, void *, int),
uint32_t flags, void *stack_addr_hint, void *targetconc_ptr,
uint32_t dispatchqueue_offset, uint32_t tsd_offset);
int bsdthread_terminate(void *stackaddr, size_t freesize, uint32_t port,
uint32_t sem);
int __pthread_kill(uint32_t port, int sig);
int bsdthread_ctl(void *cmd, void *arg1, void *arg2, void *arg3);
uint64_t thread_selfid(void);
uint64_t thread_selfusage(void);