tidy

Author: yowl

crates/csharp/src/AsyncSupport.cs

@@ -85,12 +85,6 @@ public static unsafe void WaitableSetPoll(int waitableHandle)
         }
     }
 
-    internal static void Join(SubtaskStatus subtask, int waitableSetHandle, WaitableInfoState waitableInfoState) 
-    {
-        AddTaskToWaitables(waitableSetHandle, subtask.Handle, waitableInfoState);
-        Interop.WaitableJoin(subtask.Handle, waitableSetHandle);
-    }
-
     internal static void Join(int readerWriterHandle, int waitableHandle, WaitableInfoState waitableInfoState) 
     {
         AddTaskToWaitables(waitableHandle, readerWriterHandle, waitableInfoState);
@@ -123,7 +117,7 @@ public static void WaitableSetDrop(int handle)
         Interop.WaitableSetDrop(handle);
     }
 
-    // unsafe because we are using pointers. 
+    // unsafe because we are using pointers.
     public static unsafe void ContextSet(ContextTask* contextTask)
     {
         Interop.ContextSet(contextTask);
@@ -200,7 +194,7 @@ internal static unsafe Task TaskFromStatus(uint status)
                 contextTaskPtr = AllocateAndSetNewContext();
             }
 
-            AsyncSupport.Join(subtaskStatus.Handle, contextTaskPtr->WaitableSetHandle, new WaitableInfoState(tcs));
+            Join(subtaskStatus.Handle, contextTaskPtr->WaitableSetHandle, new WaitableInfoState(tcs));
 
             return tcs.Task;
         }
@@ -229,7 +223,7 @@ public static unsafe Task<T> TaskFromStatus<T>(uint status, Func<T> liftFunc)
 
             var intTaskCompletionSource = new TaskCompletionSource<int>();
             var tcs = new LiftingTaskCompletionSource<T>(intTaskCompletionSource, liftFunc);
-            AsyncSupport.Join(subtaskStatus.Handle, contextTaskPtr->WaitableSetHandle, new WaitableInfoState(intTaskCompletionSource));
+            Join(subtaskStatus.Handle, contextTaskPtr->WaitableSetHandle, new WaitableInfoState(intTaskCompletionSource));
 
             return tcs.Task;
         }
@@ -245,6 +239,7 @@ public static unsafe Task<T> TaskFromStatus<T>(uint status, Func<T> liftFunc)
         }
     }
 
+    // Placeholder, TODO: Needs implementing for async functions that return values.
     internal class LiftingTaskCompletionSource<T> : TaskCompletionSource<T>
     {
         internal LiftingTaskCompletionSource(TaskCompletionSource<int> innerTaskCompletionSource, Func<T> _liftFunc)
@@ -854,12 +849,6 @@ internal WaitableInfoState(ComponentTask<int> componentTaskInt, IFutureStream fu
         FutureStream = futureStream;        
     }
 
-    internal WaitableInfoState(ComponentTask componentTask, IFutureStream futureStream)
-    {
-        this.componentTask = componentTask;
-        FutureStream = futureStream;        
-    }
-
     internal WaitableInfoState(TaskCompletionSource<int> taskCompletionSource)
     {
         this.taskCompletionSource = taskCompletionSource;