sysdeps/zinnia: Implement PosixMadvise, Pause, Ifaddrs

Author: marv7000

abis/zinnia/limits.h

@@ -0,0 +1,10 @@
+#ifndef _ABIBITS_LIMITS_H
+#define _ABIBITS_LIMITS_H
+
+#define __MLIBC_IOV_MAX 1024
+#define __MLIBC_LOGIN_NAME_MAX 256
+#define __MLIBC_HOST_NAME_MAX 64
+#define __MLIBC_NAME_MAX 255
+#define __MLIBC_OPEN_MAX 1024
+
+#endif /*_ABIBITS_LIMITS_H */

abis/zinnia/socket.h

@@ -89,7 +89,7 @@ struct cmsghdr {
 #define SO_PRIORITY 31
 #define SO_MARK 32
 
-#define SOMAXCONN 1
+#define SOMAXCONN 128
 
 #define MSG_CTRUNC 0x1
 #define MSG_DONTROUTE 0x2

sysdeps/zinnia/generic/ifaddrs.cpp

@@ -0,0 +1,17 @@
+#include <ifaddrs.h>
+#include <stdlib.h>
+
+// TODO
+
+int getifaddrs(struct ifaddrs **ifap) {
+	*ifap = nullptr;
+	return 0;
+}
+
+void freeifaddrs(struct ifaddrs *ifa) {
+	while (ifa != nullptr) {
+		struct ifaddrs *next = ifa->ifa_next;
+		free(ifa);
+		ifa = next;
+	}
+}

sysdeps/zinnia/generic/internal.cpp

@@ -50,7 +50,7 @@ int Sysdeps<FutexWait>::operator()(int *pointer, int expected, const struct time
 }
 
 int Sysdeps<FutexWake>::operator()(int *pointer, bool all) {
-	return zinnia_syscall(SYSCALL_FUTEX_WAKE, (size_t)pointer, all).error;
+	return zinnia_syscall(SYSCALL_FUTEX_WAKE, (size_t)pointer, all ? UINT32_MAX : 1).error;
 }
 
 int Sysdeps<AnonAllocate>::operator()(size_t size, void **pointer) {

sysdeps/zinnia/generic/posix.cpp

@@ -326,12 +326,8 @@ void Sysdeps<Yield>::operator()() { zinnia_syscall(SYSCALL_YIELD); }
 
 int
 Sysdeps<Waitpid>::operator()(pid_t pid, int *status, int flags, struct rusage *ru, pid_t *ret_pid) {
-	if (ru) {
-		mlibc::infoLogger() << "mlibc: struct rusage in sys_waitpid is unsupported" << frg::endlog;
-		return ENOSYS;
-	}
 again:
-	auto r = zinnia_syscall(SYSCALL_WAITPID, pid, (size_t)status, flags);
+	auto r = zinnia_syscall(SYSCALL_WAITPID, pid, (size_t)status, flags, (size_t)ru);
 	if (r.error) {
 		if (r.error == EINTR)
 			goto again;
@@ -740,6 +736,10 @@ int Sysdeps<Madvise>::operator()(void *addr, size_t length, int advice) {
 	return zinnia_syscall(SYSCALL_MADVISE, (size_t)addr, length, advice).error;
 }
 
+int Sysdeps<PosixMadvise>::operator()(void *addr, size_t length, int advice) {
+	return zinnia_syscall(SYSCALL_MADVISE, (size_t)addr, length, advice).error;
+}
+
 int Sysdeps<GetItimer>::operator()(int which, struct itimerval *curr_value) {
 	return zinnia_syscall(SYSCALL_ITIMER_GET, which, (size_t)curr_value).error;
 }
@@ -889,4 +889,8 @@ int Sysdeps<Sysconf>::operator()(int num, long *ret) {
 	return 0;
 }
 
+int Sysdeps<Pause>::operator()() {
+	return sysdep<Ppoll>(NULL, 0, NULL, NULL, NULL);
+}
+
 } // namespace mlibc

sysdeps/zinnia/include/abi-bits/limits.h

@@ -1 +1 @@
-../../../../abis/linux/limits.h
+../../../../abis/zinnia/limits.h

sysdeps/zinnia/include/ifaddrs.h

@@ -0,0 +1,37 @@
+
+#ifndef  _IFADDRS_H
+#define  _IFADDRS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <netinet/in.h>
+#include <sys/socket.h>
+
+/* Struct definitions taken from musl */
+struct ifaddrs {
+	struct ifaddrs *ifa_next;
+	char *ifa_name;
+	unsigned ifa_flags;
+	struct sockaddr *ifa_addr;
+	struct sockaddr *ifa_netmask;
+	/* the man page (and glibc) place `ifa_broadaddr` and `ifa_dstaddr` in a union */
+	/* TODO: decide whether we should do it, too */
+	struct sockaddr *ifa_broadaddr;
+	struct sockaddr *ifa_dstaddr;
+	void *ifa_data;
+};
+
+#ifndef __MLIBC_ABI_ONLY
+
+int getifaddrs(struct ifaddrs **__ifap);
+void freeifaddrs(struct ifaddrs *__ifa);
+
+#endif /* !__MLIBC_ABI_ONLY */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _IFADDRS_H */

sysdeps/zinnia/include/mlibc/sysdeps.hpp

@@ -133,6 +133,7 @@ struct ZinniaSysdepTags :
 	Sigsuspend,
 	Sigpending,
 	Madvise,
+	PosixMadvise,
 	GetItimer,
 	SetItimer,
 	TimerCreate,
@@ -167,7 +168,8 @@ struct ZinniaSysdepTags :
 	TimerfdGettime,
 	Msync,
 	InetConfigured,
-	Sysconf
+	Sysconf,
+	Pause
 {};
 
 template<typename Tag>

sysdeps/zinnia/meson.build

@@ -26,6 +26,7 @@ libc_sources += files(
 	'generic/signalfd.cpp',
 	'generic/timerfd.cpp',
 	'generic/eventfd.cpp',
+	'generic/ifaddrs.cpp',
 	host_machine.cpu_family() / 'thread.S',
 	host_machine.cpu_family() / 'signal.S',
 )
@@ -105,6 +106,7 @@ if not no_headers
 	)
 
 	install_headers('include/mntent.h')
+	install_headers('include/ifaddrs.h')
 endif
 
 if not headers_only