[WASI] timers based on wasi:clocks #105879
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <linker> | ||
| <assembly fullname="System.Private.CoreLib"> | ||
| <!-- these methods are temporarily accessed via UnsafeAccessor from generated code until we have it in public API, probably in WASI preview3 and promises --> | ||
| <type fullname="System.Threading.Thread"> | ||
| <method name="RegisterWasiPollableHandle" /> | ||
| <method name="PollWasiEventLoopUntilResolved" /> | ||
| </type> | ||
| </assembly> | ||
| </linker> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,22 +5,34 @@ | |
| using System.Runtime; | ||
| using System.Runtime.InteropServices; | ||
| using Microsoft.Win32.SafeHandles; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace System.Threading | ||
| { | ||
| public sealed partial class Thread | ||
| { | ||
| // these methods are temporarily accessed via UnsafeAccessor from generated code until we have it in public API, probably in WASI preview3 and promises | ||
| #if TARGET_WASI | ||
| internal static System.Threading.Tasks.Task RegisterWasiPollableHandle(int handle) | ||
| { | ||
| return WasiEventLoop.RegisterWasiPollableHandle(handle); | ||
| } | ||
|
|
||
| internal static int PollWasiEventLoopUntilResolved(Task<int> mainTask) | ||
| { | ||
| while (!mainTask.IsCompleted) | ||
|
There was a problem hiding this comment. This is probably too naive solution. Such code/tasks/continuations could have (expected) externally observable side effects (after we exit the entry point). But I don't know how to do that at this point. So I guess it will be some next PR. cc @dicej There was a problem hiding this comment. In the browser we schedule browser callback any time the new job triggers Maybe we need to run cc @SingleAccretion , any thoughts ? There was a problem hiding this comment. I agree that full event loop emulation requires what is effectively: bool workItemsLeft;
do
{
workItemsLeft = ThreadPoolWorkQueue.Dispatch();
}
while (workItemsLeft)I think it's ok to wait for the top-level task only here. It matches "normal" platform's behavior: ThreadPool.QueueUserWorkItem(x => { Thread.Sleep(100); Console.WriteLine(); });
> dotnet run
; Nothing printed because thread pool threads are background threads.So it seems unlikely our tests would depend on it. It does not match Browser's behavior, of course. It is a point to debate whether we'd want the eventual async main experience to match browser or not-browser. |
||
| { | ||
| WasiEventLoop.DispatchWasiEventLoop(); | ||
| } | ||
| var exception = mainTask.Exception; | ||
| if (exception is not null) | ||
| { | ||
| throw exception; | ||
| } | ||
|
|
||
| return mainTask.Result; | ||
| } | ||
|
|
||
| #endif | ||
|
|
||
| // the closest analog to Sleep(0) on Unix is sched_yield | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // Generated by `wit-bindgen` 0.29.0. DO NOT EDIT! | ||
| // <auto-generated /> | ||
| #nullable enable | ||
|
|
||
| using System; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Collections; | ||
| using System.Runtime.InteropServices; | ||
| using System.Text; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.Diagnostics.CodeAnalysis; | ||
|
|
||
| namespace WasiPollWorld.wit.imports.wasi.clocks.v0_2_1 | ||
| { | ||
| internal static class MonotonicClockInterop { | ||
|
|
||
| internal static class NowWasmInterop | ||
| { | ||
| [DllImport("wasi:clocks/[email protected]", EntryPoint = "now"), WasmImportLinkage] | ||
| internal static extern long wasmImportNow(); | ||
|
|
||
| } | ||
|
|
||
| internal static unsafe ulong Now() | ||
| { | ||
| var result = NowWasmInterop.wasmImportNow(); | ||
| return unchecked((ulong)(result)); | ||
|
|
||
| //TODO: free alloc handle (interopString) if exists | ||
| } | ||
|
|
||
| internal static class ResolutionWasmInterop | ||
| { | ||
| [DllImport("wasi:clocks/[email protected]", EntryPoint = "resolution"), WasmImportLinkage] | ||
| internal static extern long wasmImportResolution(); | ||
|
|
||
| } | ||
|
|
||
| internal static unsafe ulong Resolution() | ||
| { | ||
| var result = ResolutionWasmInterop.wasmImportResolution(); | ||
| return unchecked((ulong)(result)); | ||
|
|
||
| //TODO: free alloc handle (interopString) if exists | ||
| } | ||
|
|
||
| internal static class SubscribeInstantWasmInterop | ||
| { | ||
| [DllImport("wasi:clocks/[email protected]", EntryPoint = "subscribe-instant"), WasmImportLinkage] | ||
| internal static extern int wasmImportSubscribeInstant(long p0); | ||
|
|
||
| } | ||
|
|
||
| internal static unsafe global::WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.Pollable SubscribeInstant(ulong when) | ||
| { | ||
| var result = SubscribeInstantWasmInterop.wasmImportSubscribeInstant(unchecked((long)(when))); | ||
| var resource = new global::WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.Pollable(new global::WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.Pollable.THandle(result)); | ||
| return resource; | ||
|
|
||
| //TODO: free alloc handle (interopString) if exists | ||
| } | ||
|
|
||
| internal static class SubscribeDurationWasmInterop | ||
| { | ||
| [DllImport("wasi:clocks/[email protected]", EntryPoint = "subscribe-duration"), WasmImportLinkage] | ||
| internal static extern int wasmImportSubscribeDuration(long p0); | ||
|
|
||
| } | ||
|
|
||
| internal static unsafe global::WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.Pollable SubscribeDuration(ulong when) | ||
| { | ||
| var result = SubscribeDurationWasmInterop.wasmImportSubscribeDuration(unchecked((long)(when))); | ||
| var resource = new global::WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.Pollable(new global::WasiPollWorld.wit.imports.wasi.io.v0_2_1.IPoll.Pollable.THandle(result)); | ||
| return resource; | ||
|
|
||
| //TODO: free alloc handle (interopString) if exists | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ tar xzf v0.2.1.tar.gz | |
| cat >wasi-http-0.2.1/wit/world.wit <<EOF | ||
| world wasi-poll { | ||
| import wasi:io/[email protected]; | ||
| import wasi:clocks/[email protected]; | ||
| } | ||
| EOF | ||
| wit-bindgen c-sharp -w wasi-poll -r native-aot --internal --skip-support-files wasi-http-0.2.1/wit | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.