async tests pass

Author: yowl

crates/csharp/src/AsyncSupport.cs

@@ -184,6 +184,7 @@ public static unsafe uint Callback(EventWaitable e, ContextTask* contextPtr, Act
             if (waitables.Count == 0)
             {
                 Console.WriteLine($"No more waitables for waitable {e.Waitable} in set {contextTaskPtr->WaitableSetHandle}");
+                Console.WriteLine($"taskReturn is null {taskReturn == null}");
                 if(taskReturn != null)
                 {
                     taskReturn();
@@ -206,7 +207,7 @@ internal static unsafe Task TaskFromStatus(uint status)
         var subtaskStatus = new SubtaskStatus(status);
         status = status & 0xF;
 
-        var tcs = new TaskCompletionSource();
+        var tcs = new TaskCompletionSource<int>();
         if (subtaskStatus.IsSubtaskStarting || subtaskStatus.IsSubtaskStarted)
         {
             ContextTask* contextTaskPtr = ContextGet();
@@ -215,11 +216,13 @@ internal static unsafe Task TaskFromStatus(uint status)
                 contextTaskPtr = AllocateAndSetNewContext();
             }
 
+            AsyncSupport.Join(subtaskStatus.Handle, contextTaskPtr->WaitableSetHandle, new WaitableInfoState(tcs));
+
             return tcs.Task;
         }
         else if (subtaskStatus.IsSubtaskReturned)
         {
-            tcs.SetResult();
+            tcs.SetResult(0);
             return Task.CompletedTask;
         }
         else
@@ -232,24 +235,23 @@ internal static unsafe Task TaskFromStatus(uint status)
     public static unsafe Task<T> TaskFromStatus<T>(uint status, Func<T> liftFunc)
     {
         var subtaskStatus = new SubtaskStatus(status);
-        status = status & 0xF;
 
-        // TODO join and complete the task somwhere.
-        var tcs = new TaskCompletionSource<T>();
         if (subtaskStatus.IsSubtaskStarting || subtaskStatus.IsSubtaskStarted)
         {
             ContextTask* contextTaskPtr = ContextGet();
             if (contextTaskPtr == null) {
-                contextTaskPtr = (ContextTask *)Marshal.AllocHGlobal(Marshal.SizeOf<ContextTask>());
-                Console.WriteLine("TaskFromStatus<T> creating WaitableSet");
-                contextTaskPtr->WaitableSetHandle = WaitableSetNew();
-                ContextSet(contextTaskPtr);
+                contextTaskPtr = AllocateAndSetNewContext();
             }
 
+            var intTaskCompletionSource = new TaskCompletionSource<int>();
+            var tcs = new LiftingTaskCompletionSource<T>(intTaskCompletionSource, liftFunc);
+            AsyncSupport.Join(subtaskStatus.Handle, contextTaskPtr->WaitableSetHandle, new WaitableInfoState(intTaskCompletionSource));
+
             return tcs.Task;
         }
         else if (subtaskStatus.IsSubtaskReturned)
         {
+            var tcs = new TaskCompletionSource<T>();
             tcs.SetResult(liftFunc());
             return tcs.Task;
         }
@@ -259,12 +261,24 @@ public static unsafe Task<T> TaskFromStatus<T>(uint status, Func<T> liftFunc)
         }
     }
 
+    internal class LiftingTaskCompletionSource<T> : TaskCompletionSource<T>
+    {
+        internal LiftingTaskCompletionSource(TaskCompletionSource<int> innerTaskCompletionSource, Func<T> _liftFunc)
+        {
+            innerTaskCompletionSource.Task.ContinueWith(t => {
+                throw new NotImplementedException("lifting results from async functions not implemented yet");
+            });
+        }
+    }
+
     // unsafe because we are working with native memory.
     internal static unsafe ContextTask* AllocateAndSetNewContext()
     {
+        Console.WriteLine("AllocateAndSetNewContext creating WaitableSet");
+
         var contextTaskPtr = (ContextTask *)Marshal.AllocHGlobal(Marshal.SizeOf<ContextTask>());
-        contextTaskPtr->WaitableSetHandle = AsyncSupport.WaitableSetNew();
-        AsyncSupport.ContextSet(contextTaskPtr);
+        contextTaskPtr->WaitableSetHandle = WaitableSetNew();
+        ContextSet(contextTaskPtr);
         return contextTaskPtr;
     }
 }
@@ -878,16 +892,21 @@ internal WaitableInfoState(ComponentTask componentTask, IFutureStream futureStre
         FutureStream = futureStream;        
     }
 
-    internal WaitableInfoState(ComponentTask componentTask)
+    internal WaitableInfoState(TaskCompletionSource<int> taskCompletionSource)
     {
-        this.componentTask = componentTask;
+        this.taskCompletionSource = taskCompletionSource;
     }
 
     internal void SetResult(int count)
     {
-            Console.WriteLine("WaitableInfoState SetResult");
+        Console.WriteLine("WaitableInfoState SetResult");
 
-        if (componentTask != null)
+        if (taskCompletionSource != null)
+        {
+            Console.WriteLine("Setting result for Task");
+            taskCompletionSource.SetResult(count);
+        }
+        else if (componentTask != null)
         {
             Console.WriteLine("Setting result for void waitable completion source");
             componentTask.SetResult();
@@ -916,9 +935,11 @@ internal void SetException(Exception e)
         }
     }
 
-    private ComponentTask componentTask;
-    private ComponentTask<int> componentTaskInt;
-    internal IFutureStream FutureStream;
+    // We have a taskCompletionSource for an async function, a ComponentTask for a future or stream.
+    private TaskCompletionSource<int>? taskCompletionSource;
+    private ComponentTask? componentTask;
+    private ComponentTask<int>? componentTaskInt;
+    internal IFutureStream? FutureStream;
 }
 
 public class StreamDroppedException : Exception

crates/csharp/src/function.rs

@@ -1161,7 +1161,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
 
                         Console.WriteLine("Async function {name} completed. Returning result.");
                         {name}TaskReturn({ret_param});
-                        Console.WriteLine("Async function {name} TaskRetunr completed.");
+                        Console.WriteLine("Async function {name} TaskReturn completed.");
 
                     }}, TaskContinuationOptions.ExecuteSynchronously);