Copy BSD sys/queue.h to shims/sys_queue.h and remove HACK around SAFE macros

Author: dgrove-oss

src/internal.h

@@ -209,7 +209,11 @@ 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/io.c

@@ -1782,37 +1782,17 @@ _dispatch_stream_cleanup_operations(dispatch_stream_t stream,
 	dispatch_operation_t op, tmp;
 	typeof(*stream->operations) *operations;
 	operations = &stream->operations[DISPATCH_IO_RANDOM];
-#ifdef __LINUX_PORT_HDD__
-	LINUX_PORT_ERROR();
-        // NOT CORRECT (doesn't support removal during iteration)
-	TAILQ_FOREACH(op, operations, operation_list) {
-		if (!channel || op->channel == channel) {
-			_dispatch_stream_complete_operation(stream, op);
-		}
-	}
-#else
 	TAILQ_FOREACH_SAFE(op, operations, operation_list, tmp) {
 		if (!channel || op->channel == channel) {
 			_dispatch_stream_complete_operation(stream, op);
 		}
 	}
-#endif
 	operations = &stream->operations[DISPATCH_IO_STREAM];
-#ifdef __LINUX_PORT_HDD__
-	LINUX_PORT_ERROR();
-        // NOT CORRECT (doesn't support removal during iteration)
-	TAILQ_FOREACH(op, operations, operation_list) {
-		if (!channel || op->channel == channel) {
-			_dispatch_stream_complete_operation(stream, op);
-		}
-	}
-#else
 	TAILQ_FOREACH_SAFE(op, operations, operation_list, tmp) {
 		if (!channel || op->channel == channel) {
 			_dispatch_stream_complete_operation(stream, op);
 		}
 	}
-#endif	
 	if (stream->source_running && !_dispatch_stream_operation_avail(stream)) {
 		dispatch_suspend(stream->source);
 		stream->source_running = false;
@@ -1824,21 +1804,11 @@ _dispatch_disk_cleanup_operations(dispatch_disk_t disk, dispatch_io_t channel)
 {
 	// On pick queue
 	dispatch_operation_t op, tmp;
-#ifdef __LINUX_PORT_HDD__
-	LINUX_PORT_ERROR();
-        // NOT CORRECT (doesn't support removal during iteration)
-	TAILQ_FOREACH(op, &disk->operations, operation_list) {
-		if (!channel || op->channel == channel) {
-			_dispatch_disk_complete_operation(disk, op);
-		}
-	}
-#else	
 	TAILQ_FOREACH_SAFE(op, &disk->operations, operation_list, tmp) {
 		if (!channel || op->channel == channel) {
 			_dispatch_disk_complete_operation(disk, op);
 		}
 	}
-#endif	
 }
 
 #pragma mark -

src/queue.c

@@ -1717,18 +1717,6 @@ _dispatch_queue_specific_queue_dispose(dispatch_queue_specific_queue_t dqsq)
 {
 	dispatch_queue_specific_t dqs, tmp;
 
-#ifdef __LINUX_PORT_HDD__
-	LINUX_PORT_ERROR();
-        // NOT CORRECT (doesn't support removal during iteration)
-	TAILQ_FOREACH(dqs, &dqsq->dqsq_contexts, dqs_list) {
-		if (dqs->dqs_destructor) {
-			dispatch_async_f(_dispatch_get_root_queue(
-					_DISPATCH_QOS_CLASS_DEFAULT, false), dqs->dqs_ctxt,
-					dqs->dqs_destructor);
-		}
-		free(dqs);
-	}
-#else
 	TAILQ_FOREACH_SAFE(dqs, &dqsq->dqsq_contexts, dqs_list, tmp) {
 		if (dqs->dqs_destructor) {
 			dispatch_async_f(_dispatch_get_root_queue(
@@ -1737,7 +1725,6 @@ _dispatch_queue_specific_queue_dispose(dispatch_queue_specific_queue_t dqsq)
 		}
 		free(dqs);
 	}
-#endif
 	_dispatch_queue_destroy((dispatch_queue_t)dqsq);
 }