Merge pull request swiftlang#15 from dgrove-oss/fixtests-cp1

Port most of libdispatch tests to Linux (31 compile; 21 pass).

Author: MadCoder

configure.ac

@@ -115,8 +115,11 @@ AS_IF([test "x$DTRACE" != "x"], [use_dtrace=true],[
 AM_CONDITIONAL(USE_DTRACE, $use_dtrace)
 AC_PATH_PROG(LEAKS, leaks)
 AS_IF([test "x$LEAKS" != "x"],
-  [AC_DEFINE(HAVE_LEAKS, 1, [Define if Apple leaks program is present])]
+  [AC_DEFINE(HAVE_LEAKS, 1, [Define if Apple leaks program is present])
+   have_leaks=true],
+  [have_leaks=false]
 )
+AM_CONDITIONAL(HAVE_LEAKS, $have_leaks)
 
 DISPATCH_C_ATOMIC_BUILTINS
 

tests/Makefile.am

@@ -19,13 +19,55 @@ check_PROGRAMS=					\
 
 noinst_SCRIPTS=leaks-wrapper.sh
 
-TESTS=							\
+UNPORTED_TESTS=					\
+	dispatch_deadname			\
+	dispatch_proc				\
+	dispatch_vm				\
+	dispatch_vnode				\
+	dispatch_select
+
+PORTED_TESTS_FAILED=				\
+	dispatch_group				\
+	dispatch_priority			\
+	dispatch_priority2			\
+	dispatch_concur				\
+	dispatch_context_for_key		\
+	dispatch_read				\
+	dispatch_read2				\
+	dispatch_readsync			\
+	dispatch_io				\
+	dispatch_io_net				
+
+PORTED_TESTS_PASSED=				\
 	dispatch_apply				\
 	dispatch_api				\
 	dispatch_c99				\
-	dispatch_deadname			\
 	dispatch_debug				\
 	dispatch_queue_finalizer	\
+	dispatch_overcommit			\
+	dispatch_pingpong			\
+	dispatch_plusplus			\
+	dispatch_after				\
+	dispatch_timer				\
+	dispatch_timer_short			\
+	dispatch_timer_timeout			\
+	dispatch_sema				\
+	dispatch_suspend_timer			\
+	dispatch_timer_bit31			\
+	dispatch_timer_bit63			\
+	dispatch_timer_set_time			\
+	dispatch_starfish			\
+	dispatch_cascade			\
+	dispatch_drift				\
+	dispatch_data
+
+ORIGINAL_LIST_OF_TESTS=				\
+	dispatch_apply				\
+	dispatch_api				\
+	dispatch_c99				\
+	dispatch_deadname			\
+	dispatch_debug				\
+	dispatch_queue_finalizer		\
 	dispatch_group				\
 	dispatch_overcommit			\
 	dispatch_pingpong			\
@@ -57,6 +99,8 @@ TESTS=							\
 	dispatch_vnode				\
 	dispatch_select
 
+TESTS=$(PORTED_TESTS_PASSED) $(PORTED_TESTS_FAILED)
+
 dispatch_c99_CFLAGS=$(AM_CFLAGS) -std=c99
 dispatch_plusplus_SOURCES=dispatch_plusplus.cpp
 dispatch_priority2_SOURCES=dispatch_priority.c
@@ -65,15 +109,27 @@ dispatch_priority2_CPPFLAGS=$(AM_CPPFLAGS) -DUSE_SET_TARGET_QUEUE=1
 AM_CPPFLAGS=-I$(top_builddir) -I$(top_srcdir)
 
 DISPATCH_TESTS_CFLAGS=-Wall -Wno-deprecated-declarations $(MARCH_FLAGS)
-AM_CFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS)
+AM_CFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS) $(KQUEUE_CFLAGS)
 AM_OBJCFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS)
 AM_CXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS)
 AM_OBJCXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS)
 
-LDADD=libbsdtests.la ../src/libdispatch.la
+if HAVE_PTHREAD_WORKQUEUES
+PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
+endif
+
+LDADD=libbsdtests.la ../src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
 libbsdtests_la_LDFLAGS=-avoid-version
 
+bsdtestsummarize_LDADD=-lm
+dispatch_timer_short_LDADD=-lm $(LDADD)
+dispatch_group_LDADD=-lm $(LDADD)
+
+if HAVE_LEAKS
 TESTS_ENVIRONMENT=./bsdtestharness
+else
+TESTS_ENVIRONMENT=NOLEAKS=1 ./bsdtestharness
+endif
 DISTCLEAN=Foundation/bench.cc
 
 if HAVE_COREFOUNDATION
@@ -82,6 +138,7 @@ TESTS+=							\
 	dispatch_transform			\
 	dispatch_sync_on_main		\
 	cffd
+AM_CFLAGS+=-DHAVE_COREFOUNDATION
 
 dispatch_cf_main_LDFLAGS=-framework CoreFoundation
 dispatch_transform_LDFLAGS=-framework CoreFoundation -framework Security
@@ -95,6 +152,7 @@ TESTS+=							\
 	dispatch_apply_gc			\
 	nsoperation					\
 	bench
+AM_CFLAGS+=-DHAVE_FOUNDATION
 
 dispatch_sync_gc_SOURCES=Foundation/dispatch_sync_gc.m
 dispatch_sync_gc_LDFLAGS=-framework Foundation

tests/bsdtestharness.c

@@ -25,15 +25,25 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
+#ifdef __APPLE__
 #include <mach/clock_types.h>
 #include <mach-o/arch.h>
+#endif
 #include <sys/resource.h>
 #include <sys/time.h>
 
 #include <bsdtests.h>
 
 extern char **environ;
 
+#ifdef __linux__
+// FIXME: LINUX_PORT_HDD
+//     For initial bringup, don't use libdispatch to test libdispatch!
+#define SIMPLE_TEST_HARNESS 1
+#else
+#define SIMPLE_TEST_HARNESS 0
+#endif
+
 int
 main(int argc, char *argv[])
 {
@@ -46,10 +56,15 @@ main(int argc, char *argv[])
 		exit(1);
 	}
 
+#ifdef __APPLE__
 	short spawnflags = POSIX_SPAWN_START_SUSPENDED;
 #if TARGET_OS_EMBEDDED
 	spawnflags |= POSIX_SPAWN_SETEXEC;
 #endif
+#else
+#define POSIX_SPAWN_SETEXEC 0      /* ignore... */
+	short spawnflags = 0;
+#endif
 
 	posix_spawnattr_t attr;
 	res = posix_spawnattr_init(&attr);
@@ -58,6 +73,7 @@ main(int argc, char *argv[])
 	assert(res == 0);
 
 	uint64_t to = 0;
+#ifdef __APPLE__
 	char *tos = getenv("BSDTEST_TIMEOUT");
 	if (tos) {
 		to = strtoul(tos, NULL, 0);
@@ -73,6 +89,7 @@ main(int argc, char *argv[])
 		}
 	}
 
+#endif
 	int i;
 	char** newargv = calloc(argc, sizeof(void*));
 	for (i = 1; i < argc; ++i) {
@@ -98,6 +115,29 @@ main(int argc, char *argv[])
 	//fprintf(stderr, "pid = %d\n", pid);
 	assert(pid > 0);
 
+#if SIMPLE_TEST_HARNESS
+	int status;
+	struct rusage usage;
+	struct timeval tv_stop, tv_wall;
+
+	gettimeofday(&tv_stop, NULL);
+	tv_wall.tv_sec = tv_stop.tv_sec - tv_start.tv_sec;
+	tv_wall.tv_sec -= (tv_stop.tv_usec < tv_start.tv_usec);
+	tv_wall.tv_usec = abs(tv_stop.tv_usec - tv_start.tv_usec);
+
+	int res2 = wait4(pid, &status, 0, &usage);
+	assert(res2 != -1);
+	test_long("Process exited", (WIFEXITED(status) && WEXITSTATUS(status) && WEXITSTATUS(status) != 0xff) || WIFSIGNALED(status), 0);
+	printf("[PERF]\twall time: %ld.%06d\n", tv_wall.tv_sec, tv_wall.tv_usec);
+	printf("[PERF]\tuser time: %ld.%06d\n", usage.ru_utime.tv_sec, usage.ru_utime.tv_usec);
+	printf("[PERF]\tsystem time: %ld.%06d\n", usage.ru_stime.tv_sec, usage.ru_stime.tv_usec);
+	printf("[PERF]\tmax resident set size: %ld\n", usage.ru_maxrss);
+	printf("[PERF]\tpage faults: %ld\n", usage.ru_majflt);
+	printf("[PERF]\tswaps: %ld\n", usage.ru_nswap);
+	printf("[PERF]\tvoluntary context switches: %ld\n", usage.ru_nvcsw);
+	printf("[PERF]\tinvoluntary context switches: %ld\n", usage.ru_nivcsw);
+	exit((WIFEXITED(status) && WEXITSTATUS(status)) || WIFSIGNALED(status));
+#else
 	dispatch_queue_t main_q = dispatch_get_main_queue();
 
 	tmp_ds = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC, pid, DISPATCH_PROC_EXIT, main_q);
@@ -155,6 +195,7 @@ main(int argc, char *argv[])
 	kill(pid, SIGCONT);
 
 	dispatch_main();
+#endif // SIMPLE_TEST_HARNESS
 
 	return 0;
 }

tests/bsdtests.c

@@ -25,8 +25,10 @@
 #include <errno.h>
 #include <sys/errno.h>
 #include <string.h>
+#ifdef __APPLE__
 #include <crt_externs.h>
 #include <mach/mach_error.h>
+#endif
 #include <spawn.h>
 #include <inttypes.h>
 #include "bsdtests.h"
@@ -308,6 +310,7 @@ test_errno_format(long actual, long expected, const char *format, ...)
 	_test_errno(NULL, 0, desc, actual, expected);
 }
 
+#ifdef __APPLE__
 void
 _test_mach_error(const char* file, long line, const char* desc,
 		mach_error_t actual, mach_error_t expected)
@@ -328,6 +331,7 @@ test_mach_error_format(mach_error_t actual, mach_error_t expected, const char *f
 	GENERATE_DESC
 	_test_mach_error(NULL, 0, desc, actual, expected);
 }
+#endif
 
 void
 _test_skip(const char* file, long line, const char* desc)
@@ -400,6 +404,19 @@ test_start(const char* desc)
 	usleep(100000);	// give 'gdb --waitfor=' a chance to find this proc
 }
 
+#if __linux__
+static char** get_environment(void)
+{
+	extern char **environ; 
+	return environ;
+}
+#else
+static char** get_environment(void)
+{
+	return (* _NSGetEnviron());
+}
+#endif
+
 void
 test_leaks_pid(const char *name, pid_t pid)
 {
@@ -435,7 +452,7 @@ test_leaks_pid(const char *name, pid_t pid)
 	snprintf(pidstr, sizeof(pidstr), "%d", pid);
 
 	char* args[] = { "./leaks-wrapper", pidstr, NULL };
-	res = posix_spawnp(&pid, args[0], NULL, NULL, args, * _NSGetEnviron());
+	res = posix_spawnp(&pid, args[0], NULL, NULL, args, get_environment());
 	if (res == 0 && pid > 0) {
 		int status;
 		waitpid(pid, &status, 0);

tests/bsdtests.h

@@ -22,8 +22,17 @@
 #define __BSD_TEST_H__
 
 #include <errno.h>
+#ifdef __APPLE__
 #include <mach/error.h>
+#endif
+#if defined(__APPLE__) || defined(HAVE_COREFOUNDATION)
 #include <CoreFoundation/CoreFoundation.h>
+#endif
+
+#ifdef __linux__
+#define __printflike(a,b) __attribute__((format(printf, a, b)))
+#include <inttypes.h>
+#endif
 
 static inline const char*
 __BASENAME__(const char *_str_)
@@ -121,12 +130,16 @@ void _test_errno(const char* file, long line, const char* desc, long actual, lon
 #define test_errno(a,b,c) _test_errno(__SOURCE_FILE__, __LINE__, a, b, c)
 void test_errno_format(long actual, long expected, const char *format, ...) __printflike(3,4);
 
+#ifndef __linux__
 void _test_mach_error(const char* file, long line, const char* desc, mach_error_t actual, mach_error_t expected);
 #define test_mach_error(a,b,c) _test_mach_error(__SOURCE_FILE__, __LINE__, a, b, c)
 void test_mach_error_format(mach_error_t actual, mach_error_t expected, const char *format, ...) __printflike(3,4);
+#endif
 
+#if defined(__APPLE__) || defined(HAVE_COREFOUNDATION)
 void test_cferror(const char* desc, CFErrorRef actual, CFIndex expectedCode);
 void test_cferror_format(CFErrorRef actual, CFIndex expectedCode, const char *format, ...) __printflike(3,4);
+#endif
 
 void _test_skip(const char* file, long line, const char* desc);
 #define test_skip(m) _test_skip(__SOURCE_FILE__, __LINE__, m)

tests/bsdtestsummarize.c

@@ -24,6 +24,20 @@
 #include <string.h>
 #include <sys/param.h>
 
+#ifndef __APPLE__
+static char*
+fgetln(FILE *stream, size_t *len)
+{
+	static char buf[1024];
+	char *cp = fgets(buf,1024,stream);
+	if (cp)
+		*len = strlen(cp);
+	else
+		*len = 0;
+	return cp;
+}
+#endif
+
 int
 has_prefix(const char* str, const char* prefix)
 {

tests/dispatch_after.c

@@ -23,15 +23,17 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <assert.h>
+#ifdef __APPLE__
 #include <libkern/OSAtomic.h>
+#endif
 
 #include <bsdtests.h>
 #include <Block.h>
 
 #include "dispatch_test.h"
 
 void
-done(void *arg __unused)
+done(void *arg /*__unused */)
 {
 	sleep(1);
 	test_stop();

tests/dispatch_apply.c

@@ -23,7 +23,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <assert.h>
+#ifdef __APPLE__
 #include <libkern/OSAtomic.h>
+#endif
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
@@ -74,8 +76,12 @@ void busythread(void *ignored)
 void test_apply_contended(dispatch_queue_t dq)
 {
 	uint32_t activecpu;
+#ifdef __linux__
+	activecpu = sysconf(_SC_NPROCESSORS_ONLN);
+#else
 	size_t s = sizeof(activecpu);
 	sysctlbyname("hw.activecpu", &activecpu, &s, NULL, 0);
+#endif
 	int tIndex, n_threads = activecpu;
 	dispatch_group_t grp = dispatch_group_create();
 

tests/dispatch_cf_main.c

@@ -21,7 +21,9 @@
 #include <dispatch/dispatch.h>
 #include <stdio.h>
 #include <CoreFoundation/CoreFoundation.h>
+#ifdef __APPLE__
 #include <libkern/OSAtomic.h>
+#endif
 
 #include <bsdtests.h>
 #include "dispatch_test.h"

tests/dispatch_concur.c

@@ -202,8 +202,12 @@ main(int argc __attribute__((unused)), char* argv[] __attribute__((unused)))
 	dispatch_test_start("Dispatch Private Concurrent/Wide Queue"); // <rdar://problem/8049506&8169448&8186485>
 
 	uint32_t activecpu;
+#ifdef __linux__
+	activecpu = sysconf(_SC_NPROCESSORS_ONLN);
+#else
 	size_t s = sizeof(activecpu);
 	sysctlbyname("hw.activecpu", &activecpu, &s, NULL, 0);
+#endif
 	size_t n = activecpu / 2 > 1 ? activecpu / 2 : 1, w = activecpu * 2;
 	dispatch_queue_t tq, ttq;
 	long qw, tqw, ttqw;