[Lldb-commits] [lldb] [lldb] Fix race/timeout in TestInternalThreadSuspension (PR #203202)

[via lldb-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb

Author: Raphael Isemann (Teemperor)

<details>
<summary>Changes</summary>

This test launches a thread and then waits for a signal from the launched thread. Below is one possible interleaving, where the `pthread_cond_signal` (2) wins the race and becomes a no-op while (3) is locking until the test times out.

```
void *
suspend_func (void *unused) {
  [...]
  // 2. Created thread reaches this and signals.
  pthread_cond_signal(&signal_cond);
  [...]
}

int main() {

  pthread_mutex_lock(&signal_mutex);
  // 1. Thread is created
  pthread_create(&suspend_thread, NULL, suspend_func, NULL);

  // Enable this to make race reliable:
  // sleep(1);

  // 3. We start waiting on signal_cond, but 2. already executed.
  pthread_cond_wait(&signal_cond, &signal_mutex);
```

This patch guards (2) with signal_mutex so it can only be executed after pthread_cond_wait unlocks signal_mutex. I also added a check for spurious wakeups.

---
Full diff: https://github.com/llvm/llvm-project/pull/203202.diff


1 Files Affected:

- (modified) lldb/test/API/macosx/thread_suspend/main.c (+7-2) 


``````````diff
diff --git a/lldb/test/API/macosx/thread_suspend/main.c b/lldb/test/API/macosx/thread_suspend/main.c
index 03da7a71505c7..115ca4b49cc9c 100644
--- a/lldb/test/API/macosx/thread_suspend/main.c
+++ b/lldb/test/API/macosx/thread_suspend/main.c
@@ -6,6 +6,7 @@ pthread_mutex_t suspend_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t signal_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t signal_cond = PTHREAD_COND_INITIALIZER;
 
+int g_signaled = 0;
 int g_running_count = 0;
 
 int
@@ -16,7 +17,10 @@ function_to_call() {
 void *
 suspend_func (void *unused) {
   pthread_setname_np("Look for me");
+  pthread_mutex_lock(&signal_mutex);
+  g_signaled = 1;
   pthread_cond_signal(&signal_cond);
+  pthread_mutex_unlock(&signal_mutex);
   pthread_mutex_lock(&suspend_mutex);
 
   return NULL; // We allowed the suspend thread to run
@@ -40,8 +44,9 @@ main()
   pthread_mutex_lock(&signal_mutex);
   pthread_create(&suspend_thread, NULL, suspend_func, NULL);
 
-  pthread_cond_wait(&signal_cond, &signal_mutex);
-  
+  while (!g_signaled)
+    pthread_cond_wait(&signal_cond, &signal_mutex);
+
   mach_port_t th_port = pthread_mach_thread_np(suspend_thread);
   thread_suspend(th_port);
 

``````````

</details>


https://github.com/llvm/llvm-project/pull/203202