WIP cleanup

Author: dgrove-oss

os/linux_base.h

@@ -19,7 +19,7 @@
 #ifndef __OS_LINUX_BASE__
 #define __OS_LINUX_BASE__
 
-#include <sys/event.h>
+// #include <sys/event.h>
 
 // marker for hacks we have made to make progress
 #define __LINUX_PORT_HDD__ 1 

src/queue.c

@@ -199,6 +199,14 @@ struct dispatch_root_queue_context_s {
 };
 typedef struct dispatch_root_queue_context_s *dispatch_root_queue_context_t;
 
+#ifdef __linux__
+#define WORKQ_BG_PRIOQUEUE_CONDITIONAL (-1)
+#define WORKQ_HIGH_PRIOQUEUE_CONDITIONAL (-1)
+#else
+#define WORKQ_BG_PRIOQUEUE_CONDITIONAL WORKQ_BG_PRIOQUEUE
+#define WORKQ_HIGH_PRIOQUEUE_CONDITIONAL WORKQ_HIGH_PRIOQUEUE
+#endif
+
 DISPATCH_CACHELINE_ALIGN
 static struct dispatch_root_queue_context_s _dispatch_root_queue_contexts[] = {
 	[DISPATCH_ROOT_QUEUE_IDX_MAINTENANCE_QOS] = {{{
@@ -226,7 +234,7 @@ static struct dispatch_root_queue_context_s _dispatch_root_queue_contexts[] = {
 	[DISPATCH_ROOT_QUEUE_IDX_BACKGROUND_QOS] = {{{
 #if HAVE_PTHREAD_WORKQUEUES
 		.dgq_qos = _DISPATCH_QOS_CLASS_BACKGROUND,
-		.dgq_wq_priority = WORKQ_BG_PRIOQUEUE,
+		.dgq_wq_priority = WORKQ_BG_PRIOQUEUE_CONDITIONAL,
 		.dgq_wq_options = 0,
 #endif
 #if DISPATCH_ENABLE_THREAD_POOL
@@ -237,7 +245,7 @@ static struct dispatch_root_queue_context_s _dispatch_root_queue_contexts[] = {
 	[DISPATCH_ROOT_QUEUE_IDX_BACKGROUND_QOS_OVERCOMMIT] = {{{
 #if HAVE_PTHREAD_WORKQUEUES
 		.dgq_qos = _DISPATCH_QOS_CLASS_BACKGROUND,
-		.dgq_wq_priority = WORKQ_BG_PRIOQUEUE,
+		.dgq_wq_priority = WORKQ_BG_PRIOQUEUE_CONDITIONAL,
 		.dgq_wq_options = WORKQ_ADDTHREADS_OPTION_OVERCOMMIT,
 #endif
 #if DISPATCH_ENABLE_THREAD_POOL
@@ -314,7 +322,7 @@ static struct dispatch_root_queue_context_s _dispatch_root_queue_contexts[] = {
 	[DISPATCH_ROOT_QUEUE_IDX_USER_INTERACTIVE_QOS] = {{{
 #if HAVE_PTHREAD_WORKQUEUES
 		.dgq_qos = _DISPATCH_QOS_CLASS_USER_INTERACTIVE,
-		.dgq_wq_priority = WORKQ_HIGH_PRIOQUEUE,
+		.dgq_wq_priority = WORKQ_HIGH_PRIOQUEUE_CONDITIONAL,
 		.dgq_wq_options = 0,
 #endif
 #if DISPATCH_ENABLE_THREAD_POOL
@@ -325,7 +333,7 @@ static struct dispatch_root_queue_context_s _dispatch_root_queue_contexts[] = {
 	[DISPATCH_ROOT_QUEUE_IDX_USER_INTERACTIVE_QOS_OVERCOMMIT] = {{{
 #if HAVE_PTHREAD_WORKQUEUES
 		.dgq_qos = _DISPATCH_QOS_CLASS_USER_INTERACTIVE,
-		.dgq_wq_priority = WORKQ_HIGH_PRIOQUEUE,
+		.dgq_wq_priority = WORKQ_HIGH_PRIOQUEUE_CONDITIONAL,
 		.dgq_wq_options = WORKQ_ADDTHREADS_OPTION_OVERCOMMIT,
 #endif
 #if DISPATCH_ENABLE_THREAD_POOL
@@ -810,7 +818,7 @@ _dispatch_root_queues_init_workq(void)
 			dispatch_root_queue_context_t qc;
 			qc = &_dispatch_root_queue_contexts[i];
 #if DISPATCH_USE_LEGACY_WORKQUEUE_FALLBACK
-			if (!disable_wq) {
+			if (!disable_wq && qc->dgq_wq_priority != -1) {
 				r = pthread_workqueue_attr_setqueuepriority_np(&pwq_attr,
 						qc->dgq_wq_priority);
 				(void)dispatch_assume_zero(r);

src/shims/linux_stubs.c

@@ -101,3 +101,4 @@ unsigned short dispatch_timer__wake_semaphore;
 unsigned short dispatch_timer__fire_semaphore;
 unsigned short dispatch_timer__configure_semaphore;
 void (*_dispatch_block_special_invoke)(void*);
+struct dispatch_queue_attr_s _dispatch_queue_attr_concurrent;