Windows improvements #453
Windows improvements #453
Conversation
compnerd
force-pushed
the
windows-improvements
branch
from
eae6d65
to
7c795d9
Compare
compnerd
force-pushed
the
windows-improvements
branch
from
f8334c7
to
1088aab
Compare
|
CC: @MadCoder @ktopley-apple - okay, with this patch set, I can pass the XCTest test suite (modulo some unrelated changes). |
There was a problem hiding this comment.
This makes sense to me, @ktopley-apple should handle when it should be merged.
|
@MadCoder thanks for having a look! |
compnerd
force-pushed
the
windows-improvements
branch
from
9ce4395
to
3cff8ff
Compare
|
@swift-ci please test |
1 similar comment
|
@swift-ci please test |
Once 1121 is completed, the other PRs can then be merged on top of it (assuming they still apply cleanly). I will be continuing work on the 1121 merge this week. |
|
@ktopley-apple - okay, this definitely wont apply cleanly to 1121. I'm definitely looking forward to the 1121 merge, but this is a fairly huge improvement to libdispatch on Windows, and is needed to get XCTest building and passing tests on Windows, so it would be really helpful to get this in (I'm okay with getting 1121 merged and then re-doing this patchset for 1121, as that has a bunch of improvements that I am really looking forward to). |
The `_dispatch_sema4_t` type is a pointer to the handle of the semaphore, so we need to indirect through the pointer before using it. This site was incorrectly using it directly.
compnerd
force-pushed
the
windows-improvements
branch
from
3cff8ff
to
d78a680
Compare
This sets up the event loop for Windows to run and schedule timers. This allows us to start running some of the timer sources.
This cleans up the __LP64__ usage to allow libdispatch to work correctly on LLP64 targets (like Windows x64).
Linux, FreeBSD already define DISPATCH_COCOA_COMPAT, and Windows was defining that in a couple of places in an unstructured haphazard manner. Define it similarly and clean up the other sites.
FlsAlloc returns FLS_OUT_OF_INDEXES in an error scenario, everything else is a valid result. Correct the assertion.
The NT time representation uses 1/1/1601 as epoch as opposed to Unix which uses 1/1/1970. Account for the offset in the calculation. This corrects the calculation of now.
This is needed for XCTest to run its test suite.
Use the `GetSystemTimePreciseAsFileTime` rather than `GetSystemTimeAsFileTime` as we may otherwise get a cached value from the last context switch.
Ideally we would do the lazy semaphore approach that Mach does. Unfortunately, the queue wasn't getting drained as in that case. A follow up should investigate and fix the lazy allocation.
|
@ktopley-apple - if there are reasons to do the changes differently, please let me know, and Ill update the diffs. |
All looks good, thanks. |
|
@swift-ci please test |
This was being re-implemented in CF by means of a macro. Just expose the function instead.
The dispatch_cascade test is very slow on Windows right now (often taking 4-5 minutes to execute on my machine and sometimes locking it up entirely) because contention is not being handled correctly. `_dispatch_contention_usleep()` is expected to put the thread to sleep, but on Windows it spins on `QueryPerformanceCounter()`. This is causing a huge amount of starvation in the dispatch_cascade test. Implement it using `Sleep()`, and accordingly adjust `DISPATCH_CONTENTION_USLEEP_START` to be 1ms on Windows. Additionally, `_dispatch_contention_spins()` is currently implemented using the `rand_s()` function. This is slow (and experimentally seems to be slower than not randomizing the spin count at all!) because `rand_s()` guarantees cryptographic security, which is unnecessary for dispatch's use case. Replace it with a basic linear congruential generator (from K&R) since there isn't any other `rand_r()` equivalent. Based on the average wall clock times reported by bsdtestharness, this is around 35% faster on my PC (i7-8700K). These changes bring the runtime of the dispatch_cascade test down to around 1-2s at most for me. (It's even faster than this if stdout isn't a console window because that slows down the histogram display.)
The 1121 merge introduced additional usage of sys/queue.h. Flesh out the shims header further to repair the build on Windows.
The `dsema_value` field was marked as long which is incorrect for LLP64 environments. Update the type to `intptr_t` which is the portable type for this value.
This should use `QueryUnbiasedInterruptTime` `QueryPerformanceCounter` is roughly in units of of TSC frequency. We would need to use `QueryPerformanceFrequency` to convert that into nanoseconds. Additionally, `QueryPerformanceCounter` includes time spent during suspend, which is not what is desired. Switch to `QueryUnbiasedInterruptTime` to get something close to `CLOCK_MONOTONIC` on Linux.
Windows does not support 128-bit division, disable the support for now. One option is to statically link compiler-rt to provide `__udivti3`.
compnerd
force-pushed
the
windows-improvements
branch
from
cc64a88
to
c675edc
Compare
|
@swift-ci please test |
This addresses the updates that were not applied to the Windows port but were applied to the Linux port and the macOS port.
PR apple#453 provides an initial implementation for timer support on Windows. Support building and running the `DISPATCH_SOURCE_TYPE_TIMER` tests so we can easily verify that timers work correctly. These tests should pass on Windows with this and apple#453 applied: - dispatch_drift - dispatch_suspend_timer - dispatch_timer - dispatch_timer_bit31 - dispatch_timer_bit63 - dispatch_timer_set_time - dispatch_timer_short - dispatch_timer_timeout
compnerd
force-pushed
the
windows-improvements
branch
from
c675edc
to
3085ae0
Compare
|
@swift-ci please test |
|
@ktopley-apple - okay, so, I've pulled in the changes from @adierking into this set to run the tests as well. There was a dropped change that caused the failure, but this now builds and passes the timer queue tests as well! With this set of changes, libdispatch 1121 should be as good as 931 on Windows (well, better than what was actually in tree). This should be ready to merge now :-) |
Great! I'll merge it once the build is clean. |
|
@ktopley-apple - awesome, seems that this is through the build bot, and should greatly improve libdispatch on Windows! Thanks for the help with that |
Windows improvements Signed-off-by: Kim Topley <ktopley@apple.com>
No description provided.