Merge pull request #38113 from apple/tsan-actor_counters.swift-cherry-pick

🍒[5.5][Concurrency] Add tsan_release edge on task creation

Author: DougGregor

stdlib/public/Concurrency/GlobalExecutor.cpp

@@ -335,6 +335,8 @@ static void swift_task_enqueueGlobalImpl(Job *job) {
 }
 
 void swift::swift_task_enqueueGlobal(Job *job) {
+  _swift_tsan_release(job);
+
   if (swift_task_enqueueGlobal_hook)
     swift_task_enqueueGlobal_hook(job, swift_task_enqueueGlobalImpl);
   else

stdlib/public/Concurrency/Task.cpp

@@ -950,7 +950,7 @@ static void resumeTaskAfterContinuation(AsyncTask *task,
 
   // Make sure TSan knows that the resume call happens-before the task
   // restarting.
-  _swift_tsan_release(task);
+  _swift_tsan_release(static_cast<Job *>(task));
 
   // The status should be either Pending or Awaited.  If it's Awaited,
   // which is probably the most likely option, then we should immediately

stdlib/public/Concurrency/ThreadSanitizer.cpp

@@ -31,12 +31,18 @@ TSanFunc *tsan_acquire, *tsan_release;
 void swift::_swift_tsan_acquire(void *addr) {
   if (tsan_acquire) {
     tsan_acquire(addr);
+#if SWIFT_TASK_PRINTF_DEBUG
+    fprintf(stderr, "[%lu] tsan_acquire on %p\n", _swift_get_thread_id(), addr);
+#endif
   }
 }
 
 void swift::_swift_tsan_release(void *addr) {
   if (tsan_release) {
     tsan_release(addr);
+#if SWIFT_TASK_PRINTF_DEBUG
+    fprintf(stderr, "[%lu] tsan_release on %p\n", _swift_get_thread_id(), addr);
+#endif
   }
 }
 

test/Concurrency/Runtime/actor_counters.swift

@@ -28,6 +28,12 @@ actor Counter {
     value = value + 1
     return current
   }
+
+  deinit {
+      for i in 0..<value {
+          assert(scratchBuffer[i] == 1)
+      }
+  }
 }
 
 

test/Sanitizers/tsan/actor_counters.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-concurrency %import-libdispatch -parse-as-library -sanitize=thread) | grep -v "^Worker"
+// RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-concurrency %import-libdispatch -parse-as-library -sanitize=thread)
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
@@ -8,12 +8,6 @@
 // UNSUPPORTED: linux
 // UNSUPPORTED: windows
 
-#if canImport(Darwin)
-import Darwin
-#elseif canImport(Glibc)
-import Glibc
-#endif
-
 @available(SwiftStdlib 5.5, *)
 actor Counter {
   private var value = 0
@@ -66,7 +60,7 @@ func runTest(numCounters: Int, numWorkers: Int, numIterations: Int) async {
   for i in 0..<numWorkers {
     workers.append(
       detach { [counters] in
-        usleep(UInt32.random(in: 0..<100) * 1000)
+        await Task.sleep(UInt64.random(in: 0..<100) * 1_000_000)
         await worker(identity: i, counters: counters, numIterations: numIterations)
       }
     )