Merge pull request #2 from rickymohk/fight_with_github_actions

Fight with GitHub actions
rickymohk · Sep 27, 2023 · 02aa39c · 02aa39c
2 parents 5c417d0 + 74dea62
commit 02aa39c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 23 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -5,9 +5,9 @@ name: Swift
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "fight_with_github_actions" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "fight_with_github_actions" ]
 
 jobs:
   build:

diff --git a/Sources/SwiftTaskQueue/SwiftTaskQueue.swift b/Sources/SwiftTaskQueue/SwiftTaskQueue.swift
@@ -1,3 +1,5 @@
+import Foundation
+
 public class TaskQueue{
     private class PendingTask{
         let label:String?
@@ -36,6 +38,8 @@ public class TaskQueue{
 
     private var scope: Task<Void,Never>?
 
+    private let initTaskDispatchQueue = DispatchQueue(label: "initTask")
+
     private var initTask: Task<Void,Error>?
 
     private var preInitPendingTasks: [PendingTask] = []
@@ -114,18 +118,25 @@ public class TaskQueue{
         initTask = Task{
             await withCheckedContinuation{ initScope(initContinuation: $0) }
             //pendingTasks should be available since here
-            if let pendingTasksContinuation = pendingTasksContinuation
-            {
-                for pendingTask in preInitPendingTasks
+//            print("initScope done. pendingTasksContinuation=\(pendingTasksContinuation)")
+            try initTaskDispatchQueue.sync {
+                if let pendingTasksContinuation = pendingTasksContinuation
+                {
+
+//                    print("yield preInitPendingTasks start \(preInitPendingTasks.count)")
+                    for pendingTask in preInitPendingTasks
+                    {
+                        pendingTasksContinuation.yield(pendingTask)
+                    }
+//                    print("yield preInitPendingTasks done \(preInitPendingTasks.count)")
+
+                }
+                else
                 {
-                    pendingTasksContinuation.yield(pendingTask)
+                    throw fatalError("pendingTasksContinuation not available after init")
                 }
             }
-            else
-            {
-                throw fatalError("pendingTasksContinuation not available after init")
-            }
-
+//            print("initTask done")
             initTask = nil
         }
     }
@@ -141,18 +152,18 @@ public class TaskQueue{
 
     public func dispatch(label:String?=nil,block: @escaping () async throws -> Void)
     {
-        if let pendingTasksContinuation = pendingTasksContinuation
+        if initTask == nil, let pendingTasksContinuation = pendingTasksContinuation
         {
+//            print("yield directly \(label)")
             pendingTasksContinuation.yield(AsyncTask(label: label, continuation: nil, block: block))
         }
         else
         {
-            preInitPendingTasks.append(AsyncTask(label: label, continuation: nil, block: block))
-//            Task{
-//                await initTask.value
-//                pendingTasksContinuation?.yield(AsyncTask(label: label, continuation: nil, block: block))
-//            }
-
+            initTaskDispatchQueue.sync {
+//                print("append preInitPendingTasks \(label) start \(preInitPendingTasks.count)")
+                preInitPendingTasks.append(AsyncTask(label: label, continuation: nil, block: block))
+//                print("append preInitPendingTasks \(label) done \(preInitPendingTasks.count)")
+            }
         }
     }
 

diff --git a/Tests/SwiftTaskQueueTests/SwiftTaskQueueTests.swift b/Tests/SwiftTaskQueueTests/SwiftTaskQueueTests.swift
@@ -19,16 +19,16 @@ final class SwiftTaskQueueTests: XCTestCase {
         let taskQueue = TaskQueue()
 
         ({
-            taskQueue.dispatch {
+            taskQueue.dispatch(label: "task1") {
                 await result.append("1")
             }
-            taskQueue.dispatch {
+            taskQueue.dispatch(label: "task2") {
                 await result.append("2")
             }
-            taskQueue.dispatch {
+            taskQueue.dispatch(label: "task3") {
                 await result.append("3")
             }
-            taskQueue.dispatch {
+            taskQueue.dispatch(label: "task4") {
                 await result.append("4")
             }
         }())
@@ -178,7 +178,7 @@ final class SwiftTaskQueueTests: XCTestCase {
             }
         }
 
-        try? await Task.sleep(nanoseconds: 5000000000)
+        try? await Task.sleep(nanoseconds: 1000000000)
         try? await taskQueue.dispatch {
             print("ensure unwaited task1 is executed")
         }