Linux has libbsd which provides an overlay that has all we need

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>

Author: KatashiMonosato

INSTALL

@@ -109,7 +109,7 @@ Prepare your system
  2. Install dtrace (to generate provider.h)
     sudo apt-get install systemtap-sdt-dev
  3. Install libdispatch pre-reqs
-    sudo apt-get install libblocksruntime-dev libkqueue-dev libpthread-workqueue-dev 
+    sudo apt-get install libblocksruntime-dev libkqueue-dev libpthread-workqueue-dev libbsd-dev
 
 Build:
 	sh autogen.sh

configure.ac

@@ -140,6 +140,13 @@ AC_CHECK_HEADER(sys/event.h, [],
   [PKG_CHECK_MODULES(KQUEUE, libkqueue)]
 )
 
+AC_CHECK_FUNCS([strlcpy getprogname], [],
+  [PKG_CHECK_MODULES(BSD_OVERLAY, libbsd-overlay,[
+    AC_DEFINE(HAVE_STRLCPY, 1, [])
+    AC_DEFINE(HAVE_GETPROGNAME, 1, [])
+  ])], [#include <string.h>]
+)
+
 #
 # Checks for header files.
 #
@@ -241,7 +248,7 @@ AC_CHECK_DECLS([FD_COPY], [], [], [[#include <sys/select.h>]])
 AC_CHECK_DECLS([SIGEMT], [], [], [[#include <signal.h>]])
 AC_CHECK_DECLS([VQ_UPDATE, VQ_VERYLOWDISK], [], [], [[#include <sys/mount.h>]])
 AC_CHECK_DECLS([program_invocation_short_name], [], [], [[#include <errno.h>]])
-AC_CHECK_FUNCS([pthread_key_init_np pthread_main_np mach_absolute_time malloc_create_zone sysconf getprogname])
+AC_CHECK_FUNCS([pthread_key_init_np pthread_main_np mach_absolute_time malloc_create_zone sysconf])
 
 AC_CHECK_DECLS([POSIX_SPAWN_START_SUSPENDED],
   [have_posix_spawn_start_suspended=true], [have_posix_spawn_start_suspended=false],

os/linux_base.h

@@ -64,8 +64,6 @@ typedef void (*dispatch_mach_handler_function_t)(void*, dispatch_mach_reason_t,
 
 typedef void (*dispatch_mach_msg_destructor_t)(void*);
 
-typedef uint32_t voucher_activity_mode_t;
-
 struct voucher_offsets_s {
   uint32_t vo_version;
 };

src/Makefile.am

@@ -50,12 +50,13 @@ AM_CPPFLAGS=-I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_srcdir)/private -I$(top_srcdir)/os
 
 DISPATCH_CFLAGS=-Wall $(VISIBILITY_FLAGS) $(OMIT_LEAF_FP_FLAGS) \
-	$(MARCH_FLAGS) $(KQUEUE_CFLAGS)
+	$(MARCH_FLAGS) $(KQUEUE_CFLAGS) $(BSD_OVERLAY_CFLAGS)
 AM_CFLAGS=$(DISPATCH_CFLAGS) $(CBLOCKS_FLAGS)
 AM_OBJCFLAGS=$(DISPATCH_CFLAGS) $(CBLOCKS_FLAGS)
 AM_CXXFLAGS=$(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
 AM_OBJCXXFLAGS=$(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
 
+libdispatch_la_LIBADD = $(BSD_OVERLAY_LIBS)
 libdispatch_la_LDFLAGS=-avoid-version
 libdispatch_la_LIBADD=$(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS)
 

src/allocator.c

@@ -676,7 +676,7 @@ _dispatch_malloc_init(void)
 	malloc_set_zone_name(_dispatch_ccache_zone, "DispatchContinuations");
 }
 #else
-static inline void _dispatch_malloc_init(void) {}
+#define _dispatch_malloc_init() ((void)0)
 #endif // DISPATCH_USE_MALLOCZONE
 
 static dispatch_continuation_t

src/internal.h

@@ -208,11 +208,7 @@ DISPATCH_EXPORT DISPATCH_NOTHROW void dispatch_atfork_child(void);
 #if !TARGET_OS_WIN32 
 #include <sys/event.h>
 #include <sys/mount.h>
-#ifdef __linux__
-#include <shims/sys_queue.h>
-#else
 #include <sys/queue.h>
-#endif
 #include <sys/sysctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>

src/shims/hw_config.h

@@ -81,6 +81,15 @@ static inline uint32_t
 _dispatch_hw_get_config(_dispatch_hw_config_t c)
 {
 	uint32_t val = 1;
+#if defined(__linux__)
+	switch (c) {
+	case _dispatch_hw_config_logical_cpus:
+	case _dispatch_hw_config_physical_cpus:
+		return sysconf(_SC_NPROCESSORS_CONF);
+	case _dispatch_hw_config_active_cpus:
+		return sysconf(_SC_NPROCESSORS_ONLN);
+	}
+#else
 	const char *name = NULL;
 	int r;
 #if defined(__APPLE__)
@@ -106,6 +115,7 @@ _dispatch_hw_get_config(_dispatch_hw_config_t c)
 		if (r > 0) val = (uint32_t)r;
 #endif
 	}
+#endif
 	return val;
 }
 

src/shims/linux_stubs.c

@@ -21,9 +21,6 @@
 #include <config/config.h>
 
 #include "pthread.h"
-
-#define program_invocation_short_name "hi"
-
 #include "os/linux_base.h"
 #include "internal.h"
 
@@ -56,7 +53,6 @@ unsigned long _dispatch_runloop_queue_probe(dispatch_queue_t dq) {
 }
 void _dispatch_runloop_queue_xref_dispose() { LINUX_PORT_ERROR();  }
 
-void strlcpy() { LINUX_PORT_ERROR();  }
 void _dispatch_runloop_queue_dispose() { LINUX_PORT_ERROR();  }
 char* mach_error_string(mach_msg_return_t x) {
   LINUX_PORT_ERROR();
@@ -72,11 +68,6 @@ mach_port_t mach_task_self() {
   return (mach_port_t)pthread_self();
 }
 
-int sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
-		 void *newp, size_t newlen) {
-  LINUX_PORT_ERROR();
-}
-
 /*
  * Stubbed out static data
  */

src/shims/linux_stubs.h

@@ -16,9 +16,6 @@
 #ifndef __DISPATCH__STUBS__INTERNAL
 #define __DISPATCH__STUBS__INTERNAL
 
-int sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
-		 void *newp, size_t newlen);
-
 mach_port_t pthread_mach_thread_np();
 
 mach_port_t mach_task_self();