address feedback, remove redundant parameters and duplicate Callback function

Author: yowl

crates/csharp/src/AsyncSupport.cs

@@ -133,9 +133,8 @@ public static unsafe void ContextSet(ContextTask* contextTask)
     }
 
     // unsafe because we are using pointers.
-    public static unsafe int Callback(EventWaitable e, ContextTask* contextPtr)
+    public static unsafe int Callback(EventWaitable e)
     {
-        Console.WriteLine("Callback");
         ContextTask* contextTaskPtr = ContextGet();
 
         var waitables = pendingTasks[contextTaskPtr->WaitableSetHandle];
@@ -152,77 +151,21 @@ public static unsafe int Callback(EventWaitable e, ContextTask* contextPtr)
             waitables.Remove(e.Waitable, out _);
             if (e.IsSubtask)
             {
-                if (e.SubtaskStatus.IsStarting)
+                switch (e.SubtaskStatus)
                 {
-                    throw new Exception("unexpected subtask status Starting " + e.Code);
-                }
-                if (e.SubtaskStatus.IsStarted || e.SubtaskStatus.IsReturned)
-                {
-                    waitableInfoState.SetResult(e.WaitableCount);
-                    Interop.SubtaskDrop(e.Waitable);
-                }
-                else
-                {
-                    throw new Exception("TODO: subtask status " + e.Code);
-                }
-            }
-            else
-            {
-                if (e.IsDropped)
-                {
-                    waitableInfoState.SetException(new StreamDroppedException());
-                }
-                else
-                {
-                    // This may add a new waitable to the set.
-                    waitableInfoState.SetResult(e.WaitableCount);
-                }
-            }
+                    case { IsStarting: true }:
+                        throw new Exception("unexpected subtask status Starting " + e.Code);
 
-            if (waitables.Count == 0)
-            {
-                ContextSet(null);
-                Marshal.FreeHGlobal((IntPtr)contextTaskPtr);
-                return (int)CallbackCode.Exit;
-            }
+                    case { IsStarted: true }:
+                        break;
 
-            return (int)CallbackCode.Wait | (int)(contextTaskPtr->WaitableSetHandle << 4);
-        }
+                    case { IsReturned: true }:
+                        waitableInfoState.SetResult(e.WaitableCount);
+                        Interop.SubtaskDrop(e.Waitable);
+                        break;
 
-        throw new NotImplementedException($"WaitableStatus not implemented {e.WaitableStatus.State} in set {contextTaskPtr->WaitableSetHandle}");
-    }
-
-    // unsafe because we are using pointers.
-    public static unsafe int Callback<T>(EventWaitable e, Func<T> liftFunc)
-    {
-        Console.WriteLine("Callback");
-        ContextTask* contextTaskPtr = ContextGet();
-
-        var waitables = pendingTasks[contextTaskPtr->WaitableSetHandle];
-        var waitableInfoState = waitables[e.Waitable];
-
-        if (e.IsDropped)
-        {
-            waitableInfoState.FutureStream!.OtherSideDropped();
-        }
-
-        if (e.IsCompleted || e.IsDropped)
-        {
-            // The operation is complete so we can free the buffer and remove the waitable from our dicitonary
-            waitables.Remove(e.Waitable, out _);
-            if (e.IsSubtask)
-            {
-                if (e.SubtaskStatus.IsStarting)
-                {
-                    throw new Exception("unexpected subtask status Starting " + e.Code);
-                }
-                if (e.SubtaskStatus.IsStarted || e.SubtaskStatus.IsReturned)
-                {
-                    Interop.SubtaskDrop(e.Waitable);
-                }
-                else
-                {
-                    throw new Exception("TODO: subtask status " + e.Code);
+                    default:
+                        throw new Exception("TODO: subtask status " + e.Code);
                 }
             }
             else
@@ -294,10 +237,6 @@ public static unsafe Task<T> TaskFromStatus<T>(uint status, Func<T> liftFunc)
             }
 
             var intTaskCompletionSource = new TaskCompletionSource<int>();
-            intTaskCompletionSource.Task.ContinueWith( t =>
-            {
-               Console.WriteLine("intTaskCompletionSource continuewith"); 
-            }, TaskContinuationOptions.ExecuteSynchronously);
             var tcs = new LiftingTaskCompletionSource<T>(intTaskCompletionSource, liftFunc);
             Join(subtaskStatus.Handle, contextTaskPtr->WaitableSetHandle, new WaitableInfoState(intTaskCompletionSource));
 

crates/csharp/src/FutureCommonSupport.cs

@@ -27,7 +27,6 @@ public readonly struct EventWaitable
 {
     public EventWaitable(EventCode eventCode, uint waitable, uint code)
     {
-        Console.WriteLine($"EventWaitable with code {code}");
         EventCode = eventCode;
         Waitable = (int)waitable;
         Code = code;

crates/csharp/src/interface.rs

@@ -432,7 +432,6 @@ impl InterfaceGenerator<'_> {
                             public static unsafe void {future_stream_name}Lower{upper_camel_future_type}(object toLower, List<Action> cleanups) 
                             {{
                                 var ptr = InteropReturnArea.returnArea.AddressOfReturnArea();
-                                Console.WriteLine("type is " + toLower.GetType());
                                 var typedToLower = ({qualified_generic_type_name})toLower;
                                 {lower_code}
                             }}
@@ -963,30 +962,18 @@ var {async_status_var} = {raw_name}({wasm_params});
             [global::System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute(EntryPoint = "[callback]{export_name}")]
             public static unsafe uint {camel_name}Callback(int eventRaw, uint waitable, uint code)
             {{
-            Console.WriteLine("Callback for {export_name} creating EventWaitable with code " + eventRaw + " for waitable " + waitable + " with code " + code);
                 EventWaitable e = new EventWaitable((EventCode)eventRaw, waitable, code);
 
             "#
             );
 
-            // TODO: Get the results from a static dictionary?
-            if sig.results.len() > 0 {
-                uwriteln!(
-                    self.csharp_interop_src,
-                    r#"
-                        return (uint)AsyncSupport.Callback(e, (ContextTask *)IntPtr.Zero);
-                    }}
-                    "#
-                );
-            } else {
-                uwriteln!(
-                    self.csharp_interop_src,
-                    r#"
-                        return (uint)AsyncSupport.Callback(e, (ContextTask *)IntPtr.Zero);
-                    }}
-                    "#
-                );
-            }
+            uwriteln!(
+                self.csharp_interop_src,
+                r#"
+                    return (uint)AsyncSupport.Callback(e);
+                }}
+                "#
+            );
         }
 
         if abi::guest_export_needs_post_return(self.resolve, func) {
@@ -1963,6 +1950,7 @@ impl<'a> CoreInterfaceGenerator<'a> for InterfaceGenerator<'a> {
 
 // TODO: Is this not publicly available elsewhere, a function that says if a type needs to be returned as a pointer
 fn needs_ptr(ty: &Type) -> bool {
+    // TODO: This list is not complete, e.g. handles should be here.
     match *ty {
         Type::Bool
         | Type::S8