Merge branch 'jiixyj:macos' into macos

Author: Torrekie

.github/workflows/build.yml

@@ -4,10 +4,14 @@ on: [push]
 
 env:
   BUILD_TYPE: RelWithDebInfo
+  CFLAGS: -DALLOW_TIMER_SLACK
 
 jobs:
-  testlinux:
-    runs-on: ubuntu-20.04
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-12]
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - name: Create Build Environment

external/tree-macros/CMakeLists.txt

@@ -4,6 +4,9 @@ project(tree-macros LANGUAGES C)
 add_library(tree-macros INTERFACE)
 target_include_directories(tree-macros
                            INTERFACE "${CMAKE_CURRENT_LIST_DIR}/include")
+if(APPLE)
+  target_compile_definitions(tree-macros INTERFACE __uintptr_t=uintptr_t)
+endif()
 
 #
 

src/CMakeLists.txt

@@ -4,6 +4,9 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
+find_package(tree-macros REQUIRED)
+find_package(queue-macros REQUIRED)
+
 add_library(rwlock OBJECT rwlock.c)
 set_property(TARGET rwlock PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(rwlock PUBLIC Threads::Threads)
@@ -18,11 +21,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   return()
 endif()
 
-find_package(tree-macros REQUIRED)
-find_package(queue-macros REQUIRED)
+add_library(wrap OBJECT wrap.c)
+set_property(TARGET wrap PROPERTY POSITION_INDEPENDENT_CODE ON)
+target_link_libraries(wrap PUBLIC Threads::Threads)
+target_include_directories(wrap
+                           PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>)
 
 macro(add_compat_target _name _condition)
   add_library(compat_${_name} OBJECT compat_${_name}.c)
+  target_link_libraries(compat_${_name} PUBLIC wrap)
   set_property(TARGET compat_${_name} PROPERTY POSITION_INDEPENDENT_CODE ON)
   target_compile_options(
     compat_${_name}
@@ -39,12 +46,13 @@ macro(add_compat_target _name _condition)
 endmacro()
 
 include(CheckSymbolExists)
+
 # FreeBSD 13 and NetBSD 10 support native eventfd descriptors. NetBSD 10
 # supports native timerfd descriptors. Prefer them if available.
 check_symbol_exists(eventfd "sys/eventfd.h" HAVE_EVENTFD)
 check_symbol_exists(timerfd_create "sys/timerfd.h" HAVE_TIMERFD)
 
-check_symbol_exists(kqueue1 "sys/event.h" HAVE_KQUEUE1)
+check_symbol_exists(kqueue1 "sys/event.h;sys/time.h" HAVE_KQUEUE1)
 add_compat_target(kqueue1 "NOT;HAVE_KQUEUE1")
 check_symbol_exists(sigandset "signal.h" HAVE_SIGANDSET)
 check_symbol_exists(sigorset "signal.h" HAVE_SIGORSET)
@@ -71,6 +79,14 @@ if(NOT ALLOWS_ONESHOT_TIMERS_WITH_TIMEOUT_ZERO)
     evfilt_timer_quirks
     INTERFACE QUIRK_EVFILT_TIMER_DISALLOWS_ONESHOT_TIMEOUT_ZERO)
 endif()
+add_compat_target(pipe2 "APPLE")
+add_compat_target(socket "APPLE")
+add_compat_target(socketpair "APPLE")
+add_compat_target(itimerspec "APPLE")
+add_compat_target(sem "APPLE")
+add_compat_target(ppoll "APPLE")
+
+target_link_libraries(rwlock PUBLIC $<BUILD_INTERFACE:compat_enable_sem>)
 
 add_library(
   epoll-shim
@@ -80,8 +96,7 @@ add_library(
   kqueue_event.c
   signalfd.c
   signalfd_ctx.c
-  timespec_util.c
-  wrap.c)
+  timespec_util.c)
 if(NOT HAVE_EVENTFD)
   target_sources(epoll-shim PRIVATE eventfd.c eventfd_ctx.c)
 endif()
@@ -94,11 +109,14 @@ target_link_libraries(
   epoll-shim
   PRIVATE Threads::Threads #
           $<BUILD_INTERFACE:queue-macros::queue-macros>
-          $<BUILD_INTERFACE:tree-macros::tree-macros>
+          $<BUILD_INTERFACE:tree-macros::tree-macros> #
           $<BUILD_INTERFACE:evfilt_timer_quirks>
           $<BUILD_INTERFACE:compat_enable_kqueue1>
+          $<BUILD_INTERFACE:compat_enable_ppoll>
+          $<BUILD_INTERFACE:compat_enable_itimerspec>
           $<BUILD_INTERFACE:compat_enable_sigops>
-          $<BUILD_INTERFACE:rwlock>)
+          $<BUILD_INTERFACE:rwlock>
+          $<BUILD_INTERFACE:wrap>)
 if(HAVE_TIMERFD)
   target_compile_definitions(epoll-shim PRIVATE HAVE_TIMERFD)
 endif()

src/compat_itimerspec.c

@@ -0,0 +1 @@
+#include "compat_itimerspec.h"

src/compat_itimerspec.h

@@ -0,0 +1,14 @@
+#ifndef COMPAT_ITIMERSPEC_H
+#define COMPAT_ITIMERSPEC_H
+
+#ifdef COMPAT_ENABLE_ITIMERSPEC
+
+#include <time.h>
+
+struct itimerspec {
+	struct timespec it_interval;
+	struct timespec it_value;
+};
+#endif
+
+#endif

src/compat_kqueue1.c

@@ -38,6 +38,15 @@ compat_kqueue1_impl(int *fd_out, int flags)
 				goto out;
 			}
 		}
+#ifdef __APPLE__
+		else {
+			if ((r = fcntl(fd, F_GETFD, 0)) < 0 ||
+			    fcntl(fd, F_SETFD, r & ~FD_CLOEXEC) < 0) {
+				ec = errno;
+				goto out;
+			}
+		}
+#endif
 
 		if (flags & O_NONBLOCK) {
 			if ((r = real_fcntl(fd, F_GETFL)) < 0) {

src/compat_pipe2.c

@@ -0,0 +1,68 @@
+#include "compat_pipe2.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+#include <unistd.h>
+
+#include "wrap.h"
+
+static errno_t
+compat_pipe2_impl(int pipefd[2], int flags)
+{
+	errno_t ec;
+
+	if (flags & ~(O_CLOEXEC | O_NONBLOCK)) {
+		return EINVAL;
+	}
+
+	int p[2];
+	if (pipe(p) < 0) {
+		return errno;
+	}
+
+	{
+		int r;
+
+		if (flags & O_NONBLOCK) {
+			if ((r = fcntl(p[0], F_GETFL, 0)) < 0 ||
+			    fcntl(p[0], F_SETFL, r | O_NONBLOCK) < 0 ||
+			    (r = fcntl(p[1], F_GETFL, 0)) < 0 ||
+			    fcntl(p[1], F_SETFL, r | O_NONBLOCK) < 0) {
+				ec = errno;
+				goto out;
+			}
+		}
+
+		if (flags & O_CLOEXEC) {
+			if ((r = fcntl(p[0], F_GETFD, 0)) < 0 ||
+			    fcntl(p[0], F_SETFD, r | FD_CLOEXEC) < 0 ||
+			    (r = fcntl(p[1], F_GETFD, 0)) < 0 ||
+			    fcntl(p[1], F_SETFD, r | FD_CLOEXEC) < 0) {
+				ec = errno;
+				goto out;
+			}
+		}
+	}
+
+	pipefd[0] = p[0];
+	pipefd[1] = p[1];
+
+	return 0;
+
+out:
+	(void)real_close(p[0]);
+	(void)real_close(p[1]);
+	return ec;
+}
+
+int
+compat_pipe2(int pipefd[2], int flags)
+{
+	errno_t ec = compat_pipe2_impl(pipefd, flags);
+	if (ec != 0) {
+		errno = ec;
+		return -1;
+	}
+	return 0;
+}

src/compat_pipe2.h

@@ -0,0 +1,12 @@
+#ifndef COMPAT_PIPE2_H
+#define COMPAT_PIPE2_H
+
+#include <fcntl.h>
+#include <unistd.h>
+
+int compat_pipe2(int pipefd[2], int flags);
+#ifdef COMPAT_ENABLE_PIPE2
+#define pipe2 compat_pipe2
+#endif
+
+#endif