Skip to content

queue_specific_queue is missing its do_push vtable entry #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 24, 2017
Merged

queue_specific_queue is missing its do_push vtable entry #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Expand All @@ -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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW push -> wakeup -> invoke would have seemed the natural order to me ;-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just kept the order that was dominating. For real the better order is:

wakeup -> push -> invoke. (cause it's in that order it happens)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually no I'm tired, it's push on self, wakeup onto target, then invoke you're correct :P

.do_wakeup = _dispatch_main_queue_wakeup,
.do_debug = dispatch_queue_debug,
);
Expand All @@ -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,
);
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ UNRELIABLE_TESTS= \
dispatch_drift \
dispatch_readsync \
dispatch_cascade \
dispatch_context_for_key \
dispatch_io

if EXTENDED_TEST_SUITE
Expand All @@ -60,6 +59,7 @@ TESTS= \
dispatch_group \
dispatch_overcommit \
dispatch_plusplus \
dispatch_context_for_key \
dispatch_after \
dispatch_timer \
dispatch_timer_short \
Expand Down