Merge pull request swiftlang#55 from dgrove-oss/fix-compiler-warnings

resolve all compiler warnings

Author: MadCoder

Diff for: src/init.c

@@ -531,7 +531,7 @@ _dispatch_logv_init(void *context DISPATCH_UNUSED)
 #endif
 			dprintf(dispatch_logfile, "=== log file opened for %s[%u] at "
 					"%ld.%06u ===\n", getprogname() ?: "", getpid(),
-					tv.tv_sec, tv.tv_usec);
+					tv.tv_sec, (int)tv.tv_usec);
 		}
 	}
 }

Diff for: src/io.c

@@ -1601,7 +1601,7 @@ _dispatch_disk_init(dispatch_fd_entry_t fd_entry, dev_t dev)
 	TAILQ_INIT(&disk->operations);
 	disk->cur_rq = TAILQ_FIRST(&disk->operations);
 	char label[45];
-	snprintf(label, sizeof(label), "com.apple.libdispatch-io.deviceq.%d", dev);
+	snprintf(label, sizeof(label), "com.apple.libdispatch-io.deviceq.%d", (int)dev);
 	disk->pick_queue = dispatch_queue_create(label, NULL);
 	TAILQ_INSERT_TAIL(&_dispatch_io_devs[hash], disk, disk_list);
 out:
@@ -2367,7 +2367,7 @@ _dispatch_io_debug_attr(dispatch_io_t channel, char* buf, size_t bufsiz)
 			channel->barrier_group, channel->err, channel->params.low,
 			channel->params.high, channel->params.interval_flags &
 			DISPATCH_IO_STRICT_INTERVAL ? "(strict)" : "",
-			channel->params.interval);
+			(unsigned long long) channel->params.interval);
 }
 
 size_t
@@ -2398,10 +2398,10 @@ _dispatch_operation_debug_attr(dispatch_operation_t op, char* buf,
 			"write", op->fd_entry ? op->fd_entry->fd : -1, op->fd_entry,
 			op->channel, op->op_q, oqtarget && oqtarget->dq_label ?
 			oqtarget->dq_label : "", oqtarget, target && target->dq_label ?
-			target->dq_label : "", target, op->offset, op->length, op->total,
+			target->dq_label : "", target, (long long)op->offset, op->length, op->total,
 			op->undelivered + op->buf_len, op->flags, op->err, op->params.low,
 			op->params.high, op->params.interval_flags &
-			DISPATCH_IO_STRICT_INTERVAL ? "(strict)" : "", op->params.interval);
+			DISPATCH_IO_STRICT_INTERVAL ? "(strict)" : "", (unsigned long long)op->params.interval);
 }
 
 size_t

Diff for: src/semaphore.c

@@ -894,7 +894,7 @@ static bool _dispatch_futex_wait_slow(dispatch_futex_t dfx,
 		const struct timespec* timeout);
 
 DISPATCH_INLINE
-static int
+int
 _dispatch_futex_syscall(int *futex_addr, 
 		int op, int val, const struct timespec *timeout)
 {

Diff for: src/source.c

@@ -148,7 +148,7 @@ dispatch_source_create(dispatch_source_type_t type,
 	dk->dk_kevent.ident = handle;
 	dk->dk_kevent.flags |= EV_ADD|EV_ENABLE;
 	dk->dk_kevent.fflags |= (uint32_t)mask;
-	dk->dk_kevent.udata = (uintptr_t)dk;
+	dk->dk_kevent.udata = (typeof(dk->dk_kevent.udata))dk;
 	TAILQ_INIT(&dk->dk_sources);
 
 	ds->ds_dkev = dk;
@@ -917,9 +917,9 @@ _dispatch_kevent_init()
 	TAILQ_INSERT_TAIL(&_dispatch_sources[0],
 			&_dispatch_kevent_data_add, dk_list);
 	_dispatch_kevent_data_or.dk_kevent.udata =
-			(uintptr_t)&_dispatch_kevent_data_or;
+			(typeof(_dispatch_kevent_data_or.dk_kevent.udata))&_dispatch_kevent_data_or;
 	_dispatch_kevent_data_add.dk_kevent.udata =
-			(uintptr_t)&_dispatch_kevent_data_add;
+			(typeof(_dispatch_kevent_data_or.dk_kevent.udata))&_dispatch_kevent_data_add;
 #endif // !DISPATCH_USE_EV_UDATA_SPECIFIC
 }
 
@@ -1168,11 +1168,11 @@ _dispatch_kevent_drain(_dispatch_kevent_qos_s *ke)
 			ke->data = 0; // don't return error from caller
 			if (ke->flags & EV_DELETE) {
 				_dispatch_debug("kevent[0x%llx]: ignoring ESRCH from "
-						"EVFILT_PROC EV_DELETE", ke->udata);
+						"EVFILT_PROC EV_DELETE", (unsigned long long)ke->udata);
 				return;
 			}
 			_dispatch_debug("kevent[0x%llx]: ESRCH from EVFILT_PROC: "
-					"generating fake NOTE_EXIT", ke->udata);
+					"generating fake NOTE_EXIT", (unsigned long long)ke->udata);
 			return _dispatch_kevent_proc_exit(ke);
 		}
 		return _dispatch_kevent_error(ke);
@@ -1532,8 +1532,13 @@ struct dispatch_timer_s _dispatch_timer[] =  {
 #define DISPATCH_TIMER_COUNT \
 		((sizeof(_dispatch_timer) / sizeof(_dispatch_timer[0])))
 
+#if __linux__
 #define DISPATCH_KEVENT_TIMER_UDATA(tidx) \
+		(void*)&_dispatch_kevent_timer[tidx]
+#else
+#define DISPATCH_KEVENT_TIMER_UDATA(tidx)			\
 		(uintptr_t)&_dispatch_kevent_timer[tidx]
+#endif
 #ifdef __LP64__
 #define DISPATCH_KEVENT_TIMER_UDATA_INITIALIZER(tidx) \
 		.udata = DISPATCH_KEVENT_TIMER_UDATA(tidx)
@@ -1962,13 +1967,16 @@ _dispatch_timers_configure(void)
 	return _dispatch_timers_check(_dispatch_kevent_timer, _dispatch_timer);
 }
 
+
+#if HAVE_MACH
 static void
 _dispatch_timers_calendar_change(void)
 {
 	// calendar change may have gone past the wallclock deadline
 	_dispatch_timer_expired = true;
 	_dispatch_timers_qos_mask = ~0u;
 }
+#endif
 
 static void
 _dispatch_timers_kevent(_dispatch_kevent_qos_s *ke)
@@ -2194,7 +2202,7 @@ _dispatch_select_register(const _dispatch_kevent_qos_s *kev)
 						sizeof(*_dispatch_rfd_ptrs));
 			}
 			if (!_dispatch_rfd_ptrs[kev->ident]) {
-				_dispatch_rfd_ptrs[kev->ident] = kev->udata;
+				_dispatch_rfd_ptrs[kev->ident] = (uint64_t)kev->udata;
 				_dispatch_select_workaround++;
 				_dispatch_debug("select workaround used to read fd %d: 0x%lx",
 						(int)kev->ident, (long)kev->data);
@@ -2211,7 +2219,7 @@ _dispatch_select_register(const _dispatch_kevent_qos_s *kev)
 						sizeof(*_dispatch_wfd_ptrs));
 			}
 			if (!_dispatch_wfd_ptrs[kev->ident]) {
-				_dispatch_wfd_ptrs[kev->ident] = kev->udata;
+				_dispatch_wfd_ptrs[kev->ident] = (uint64_t)kev->udata;
 				_dispatch_select_workaround++;
 				_dispatch_debug("select workaround used to write fd %d: 0x%lx",
 						(int)kev->ident, (long)kev->data);
@@ -2313,7 +2321,7 @@ _dispatch_mgr_select(bool poll)
 					.filter = EVFILT_READ,
 					.flags = EV_ADD|EV_ENABLE|EV_DISPATCH,
 					.data = 1,
-					.udata = _dispatch_rfd_ptrs[i],
+					.udata = (typeof(kev.udata))_dispatch_rfd_ptrs[i],
 				};
 				_dispatch_kevent_drain(&kev);
 			}
@@ -2324,7 +2332,7 @@ _dispatch_mgr_select(bool poll)
 					.filter = EVFILT_WRITE,
 					.flags = EV_ADD|EV_ENABLE|EV_DISPATCH,
 					.data = 1,
-					.udata = _dispatch_wfd_ptrs[i],
+					.udata = (typeof(kev.udata))_dispatch_wfd_ptrs[i],
 				};
 				_dispatch_kevent_drain(&kev);
 			}
@@ -2482,12 +2490,14 @@ _dispatch_kq_update(const _dispatch_kevent_qos_s *kev)
 
 static _dispatch_kevent_qos_s *_dispatch_kevent_enable;
 
+#if HAVE_MACH
 static void inline
 _dispatch_mgr_kevent_reenable(_dispatch_kevent_qos_s *ke)
 {
 	dispatch_assert(!_dispatch_kevent_enable || _dispatch_kevent_enable == ke);
 	_dispatch_kevent_enable = ke;
 }
+#endif
 
 unsigned long
 _dispatch_mgr_wakeup(dispatch_queue_t dq DISPATCH_UNUSED)
@@ -4755,8 +4765,9 @@ _dispatch_timer_debug_attr(dispatch_source_t ds, char* buf, size_t bufsiz)
 	dispatch_source_refs_t dr = ds->ds_refs;
 	return dsnprintf(buf, bufsiz, "timer = { target = 0x%llx, deadline = 0x%llx,"
 			" last_fire = 0x%llx, interval = 0x%llx, flags = 0x%lx }, ",
-			ds_timer(dr).target, ds_timer(dr).deadline, ds_timer(dr).last_fire,
-			ds_timer(dr).interval, ds_timer(dr).flags);
+			(unsigned long long)ds_timer(dr).target, (unsigned long long)ds_timer(dr).deadline,
+			(unsigned long long)ds_timer(dr).last_fire, (unsigned long long)ds_timer(dr).interval,
+			ds_timer(dr).flags);
 }
 
 size_t

Diff for: tests/bsdtestharness.c

@@ -31,6 +31,9 @@
 #endif
 #include <sys/resource.h>
 #include <sys/time.h>
+#ifdef __linux__
+#include <sys/wait.h>
+#endif
 
 #include <bsdtests.h>
 
@@ -47,7 +50,6 @@ extern char **environ;
 int
 main(int argc, char *argv[])
 {
-	dispatch_source_t tmp_ds;
 	int res;
 	pid_t pid = 0;
 
@@ -73,13 +75,13 @@ 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);
 		to *= NSEC_PER_SEC;
 	}
 
+#ifdef __APPLE__
 	char *arch = getenv("BSDTEST_ARCH");
 	if (arch) {
 		const NXArchInfo *ai = NXGetArchInfoFromName(arch);
@@ -123,14 +125,14 @@ main(int argc, char *argv[])
 	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);
+	tv_wall.tv_usec = labs(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]\twall time: %ld.%06ld\n", tv_wall.tv_sec, tv_wall.tv_usec);
+	printf("[PERF]\tuser time: %ld.%06ld\n", usage.ru_utime.tv_sec, usage.ru_utime.tv_usec);
+	printf("[PERF]\tsystem time: %ld.%06ld\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);
@@ -140,7 +142,7 @@ main(int argc, char *argv[])
 #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);
+	dispatch_source_t tmp_ds = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC, pid, DISPATCH_PROC_EXIT, main_q);
 	assert(tmp_ds);
 	dispatch_source_set_event_handler(tmp_ds, ^{
 		int status;

Diff for: tests/bsdtests.c

@@ -18,6 +18,10 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
+#ifdef __linux__
+// for asprintf
+#define _GNU_SOURCE 1
+#endif
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

Diff for: tests/dispatch_overcommit.c

@@ -18,6 +18,10 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
+#ifdef __linux__
+// for asprintf
+#define _GNU_SOURCE 1
+#endif
 #include <dispatch/dispatch.h>
 #include <dispatch/private.h>
 #include <stdio.h>

Diff for: tests/dispatch_starfish.c

@@ -70,7 +70,7 @@ collect(void *context __attribute__((unused)))
 
 	printf("lap: %ld\n", lap_count_down);
 	printf("count: %lu\n", COUNT);
-	printf("delta: %llu ns\n", delta);
+	printf("delta: %lu ns\n", delta);
 	printf("math: %Lf ns / lap\n", math);
 
 	for (i = 0; i < COUNT; i++) {

Diff for: tests/dispatch_timer.c

@@ -63,7 +63,7 @@ test_timer(void)
 		dispatch_source_set_event_handler(s, ^{
 			if (!finalized) {
 				test_long_less_than("timer number", j, stop_at);
-				fprintf(stderr, "timer[%lld]\n", j);
+				fprintf(stderr, "timer[%lu]\n", j);
 			}
 			dispatch_release(s);
 		});