Merge pull request #223 from apple/eng/PR-SR-4039

queue_specific_queue is missing its do_push vtable entry

Author: das

src/init.c

@@ -398,6 +398,7 @@ DISPATCH_VTABLE_SUBCLASS_INSTANCE(queue_root, queue,
 	.do_kind = "global-queue",
 	.do_dispose = _dispatch_pthread_root_queue_dispose,
 	.do_push = _dispatch_root_queue_push,
+	.do_invoke = NULL,
 	.do_wakeup = _dispatch_root_queue_wakeup,
 	.do_debug = dispatch_queue_debug,
 );
@@ -406,8 +407,8 @@ DISPATCH_VTABLE_SUBCLASS_INSTANCE(queue_main, queue,
 	.do_type = DISPATCH_QUEUE_SERIAL_TYPE,
 	.do_kind = "main-queue",
 	.do_dispose = _dispatch_queue_dispose,
-	.do_invoke = _dispatch_queue_invoke,
 	.do_push = _dispatch_queue_push,
+	.do_invoke = _dispatch_queue_invoke,
 	.do_wakeup = _dispatch_main_queue_wakeup,
 	.do_debug = dispatch_queue_debug,
 );
@@ -416,17 +417,17 @@ DISPATCH_VTABLE_SUBCLASS_INSTANCE(queue_runloop, queue,
 	.do_type = DISPATCH_QUEUE_RUNLOOP_TYPE,
 	.do_kind = "runloop-queue",
 	.do_dispose = _dispatch_runloop_queue_dispose,
-	.do_invoke = _dispatch_queue_invoke,
 	.do_push = _dispatch_queue_push,
+	.do_invoke = _dispatch_queue_invoke,
 	.do_wakeup = _dispatch_runloop_queue_wakeup,
 	.do_debug = dispatch_queue_debug,
 );
 
 DISPATCH_VTABLE_SUBCLASS_INSTANCE(queue_mgr, queue,
 	.do_type = DISPATCH_QUEUE_MGR_TYPE,
 	.do_kind = "mgr-queue",
-	.do_invoke = _dispatch_mgr_thread,
 	.do_push = _dispatch_queue_push,
+	.do_invoke = _dispatch_mgr_thread,
 	.do_wakeup = _dispatch_mgr_queue_wakeup,
 	.do_debug = dispatch_queue_debug,
 );
@@ -435,6 +436,7 @@ DISPATCH_VTABLE_INSTANCE(queue_specific_queue,
 	.do_type = DISPATCH_QUEUE_SPECIFIC_TYPE,
 	.do_kind = "queue-context",
 	.do_dispose = _dispatch_queue_specific_queue_dispose,
+	.do_push = (void *)_dispatch_queue_push,
 	.do_invoke = (void *)_dispatch_queue_invoke,
 	.do_wakeup = (void *)_dispatch_queue_wakeup,
 	.do_debug = (void *)dispatch_queue_debug,

tests/Makefile.am

@@ -41,7 +41,6 @@ UNRELIABLE_TESTS=				\
 	dispatch_drift				\
 	dispatch_readsync			\
 	dispatch_cascade			\
-	dispatch_context_for_key	\
 	dispatch_io
 
 if EXTENDED_TEST_SUITE
@@ -60,6 +59,7 @@ TESTS=							\
 	dispatch_group				\
 	dispatch_overcommit			\
 	dispatch_plusplus			\
+	dispatch_context_for_key	\
 	dispatch_after				\
 	dispatch_timer				\
 	dispatch_timer_short		\