style, whitespace

Signed-off-by: Daniel A. Steffen <[email protected]>

Author: das

private/voucher_private.h

@@ -427,7 +427,7 @@ OS_VOUCHER_EXPORT OS_OBJECT_RETURNS_RETAINED OS_WARN_RESULT OS_NOTHROW
 voucher_t
 voucher_create_with_mach_msg(mach_msg_header_t *msg);
 
-#endif
+#endif // __APPLE__
 __END_DECLS
 
 #endif // __OS_VOUCHER_PRIVATE__

src/init.c

@@ -352,7 +352,7 @@ DISPATCH_VTABLE_INSTANCE(mach_msg,
 	.do_invoke = _dispatch_mach_msg_invoke,
 	.do_debug = _dispatch_mach_msg_debug,
 );
-#endif
+#endif // HAVE_MACH
 
 #if !USE_OBJC
 DISPATCH_VTABLE_INSTANCE(data,
@@ -810,7 +810,7 @@ _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 	_dispatch_free_unwind_tsd();
 	_dispatch_set_unwind_tsd(u);
 }
-#endif
+#endif // HAVE_MACH
 
 #endif // DISPATCH_USE_CLIENT_CALLOUT
 

src/inline_internal.h

@@ -43,7 +43,7 @@ DISPATCH_NOTHROW void
 _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 		dispatch_mach_msg_t dmsg, mach_error_t error,
 		dispatch_mach_handler_function_t f);
-#endif
+#endif // HAVE_MACH
 
 #else // !DISPATCH_USE_CLIENT_CALLOUT
 
@@ -70,7 +70,7 @@ _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 {
 	return f(ctxt, reason, dmsg, error);
 }
-#endif
+#endif // HAVE_MACH
 
 #endif // !DISPATCH_USE_CLIENT_CALLOUT
 

src/internal.h

@@ -324,7 +324,7 @@ DISPATCH_NOINLINE
 void _dispatch_bug_client(const char* msg);
 DISPATCH_NOINLINE
 void _dispatch_bug_mach_client(const char *msg, mach_msg_return_t kr);
-#endif
+#endif // HAVE_MACH
 DISPATCH_NOINLINE
 void _dispatch_bug_kevent_client(const char* msg, const char* filter,
 		const char *operation, int err);

src/object.m

@@ -538,7 +538,7 @@ - (NSString *)debugDescription {
 		objc_terminate();
 	}
 }
-#endif
+#endif // HAVE_MACH
 
 #endif // DISPATCH_USE_CLIENT_CALLOUT
 

src/queue.c

@@ -868,7 +868,7 @@ _dispatch_root_queue_init_pthread_pool(dispatch_root_queue_context_t qc,
 				&pqc->dpq_thread_attr, qc->dgq_qos, 0));
 #endif
 	}
-#endif
+#endif // HAVE_PTHREAD_WORKQUEUES
 #if USE_MACH_SEM
 	// override the default FIFO behavior for the pool semaphores
 	kern_return_t kr = semaphore_create(mach_task_self(),
@@ -1476,7 +1476,7 @@ static const int _dispatch_mgr_sched_qos2prio[] = {
 	[_DISPATCH_QOS_CLASS_USER_INITIATED] = 37,
 	[_DISPATCH_QOS_CLASS_USER_INTERACTIVE] = 47,
 };
-#endif
+#endif // HAVE_PTHREAD_WORKQUEUE_QOS
 
 static void
 _dispatch_mgr_sched_init(void *ctxt DISPATCH_UNUSED)

src/shims/hw_config.h

@@ -81,7 +81,7 @@ static inline uint32_t
 _dispatch_hw_get_config(_dispatch_hw_config_t c)
 {
 	uint32_t val = 1;
-#if defined(__linux__)
+#if defined(__linux__) && HAVE_SYSCONF
 	switch (c) {
 	case _dispatch_hw_config_logical_cpus:
 	case _dispatch_hw_config_physical_cpus:

src/source.c

@@ -1013,7 +1013,9 @@ _dispatch_kevent_resume(dispatch_kevent_t dk, uint32_t new_flags,
 		return _dispatch_kevent_machport_resume(dk, new_flags, del_flags);
 	case DISPATCH_EVFILT_MACH_NOTIFICATION:
 		return _dispatch_kevent_mach_notify_resume(dk, new_flags, del_flags);
-#endif
+#else
+	(void)new_flags; (void)del_flags;
+#endif // HAVE_MACH
 	default:
 		if (dk->dk_kevent.flags & EV_DELETE) {
 			return 0;
@@ -1028,10 +1030,6 @@ _dispatch_kevent_resume(dispatch_kevent_t dk, uint32_t new_flags,
 		}
 		return r;
 	}
-#if !HAVE_MACH
-	(void)new_flags;
-	(void)del_flags;
-#endif
 }
 
 static long
@@ -1879,7 +1877,7 @@ static void
 _dispatch_kevent_timer_set_delay(_dispatch_kevent_qos_s *ke, uint64_t delay,
 		uint64_t leeway, uint64_t nows[]) 
 {
-	// call to return nows[]
+	// call to update nows[]
 	_dispatch_source_timer_now(nows, DISPATCH_TIMER_KIND_WALL); 
 	// adjust nsec based delay to msec based and ignore leeway	
 	delay /= 1000000L;
@@ -1890,7 +1888,6 @@ _dispatch_kevent_timer_set_delay(_dispatch_kevent_qos_s *ke, uint64_t delay,
 }
 
 #else
-
 static void 
 _dispatch_kevent_timer_set_delay(_dispatch_kevent_qos_s *ke, uint64_t delay,
 		uint64_t leeway, uint64_t nows[]) 
@@ -1904,7 +1901,7 @@ _dispatch_kevent_timer_set_delay(_dispatch_kevent_qos_s *ke, uint64_t delay,
 		ke->ext[1] = leeway;
 	}
 }
-#endif
+#endif // __linux__
 
 static bool
 _dispatch_timers_program2(uint64_t nows[], _dispatch_kevent_qos_s *ke,
@@ -4791,6 +4788,7 @@ _dispatch_mach_debug_attr(dispatch_mach_t dm, char* buf, size_t bufsiz)
 			dm->dm_refs->dm_sending, dm->dm_refs->dm_disconnect_cnt,
 			(bool)(dm->ds_atomic_flags & DSF_CANCELED));
 }
+
 size_t
 _dispatch_mach_debug(dispatch_mach_t dm, char* buf, size_t bufsiz)
 {
@@ -4803,7 +4801,7 @@ _dispatch_mach_debug(dispatch_mach_t dm, char* buf, size_t bufsiz)
 	offset += dsnprintf(&buf[offset], bufsiz - offset, "}");
 	return offset;
 }
-#endif
+#endif // HAVE_MACH
 
 #if DISPATCH_DEBUG
 DISPATCH_NOINLINE

src/source_internal.h

@@ -69,7 +69,7 @@ enum {
 	DISPATCH_MACH_RECV_MESSAGE_DIRECT_ONCE = 0x20,
 	DISPATCH_MACH_RECV_NO_SENDERS = 0x40,
 };
-#endif
+#endif // HAVE_MACH
 
 enum {
 	DISPATCH_TIMER_WALL_CLOCK = 0x4,
@@ -261,7 +261,7 @@ struct dispatch_mach_msg_s {
 		char dmsg_buf[0];
 	};
 };
-#endif
+#endif // HAVE_MACH
 
 #if TARGET_OS_EMBEDDED
 #define DSL_HASH_SIZE  64u // must be a power of two
@@ -292,7 +292,7 @@ void _dispatch_mach_msg_invoke(dispatch_mach_msg_t dmsg, dispatch_object_t dou,
 size_t _dispatch_mach_msg_debug(dispatch_mach_msg_t dmsg, char* buf, size_t bufsiz);
 
 void _dispatch_mach_barrier_invoke(void *ctxt);
-#endif
+#endif // HAVE_MACH
 
 unsigned long _dispatch_mgr_wakeup(dispatch_queue_t dq);
 void _dispatch_mgr_thread(dispatch_queue_t dq, dispatch_object_t dou,