From 2b2115bde64d282659b4e3e9e5ffa5d608846c19 Mon Sep 17 00:00:00 2001
From: Florian Engelhardt <florian.engelhardt@datadoghq.com>
Date: Fri, 8 Nov 2024 10:35:27 +0100
Subject: [PATCH] update

---
 profiling/src/profiling/thread_utils.rs       | 65 ++++++++-----------
 .../tests/correctness/exceptions_zts.json     |  4 +-
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/profiling/src/profiling/thread_utils.rs b/profiling/src/profiling/thread_utils.rs
index e8f9acbb6bb..5d1389b65a0 100644
--- a/profiling/src/profiling/thread_utils.rs
+++ b/profiling/src/profiling/thread_utils.rs
@@ -1,10 +1,13 @@
-use libc::{c_char, sched_yield};
+#[cfg(php_zts)]
+use libc::c_char;
+use libc::sched_yield;
 use log::warn;
 use std::mem::MaybeUninit;
 use std::thread::JoinHandle;
 use std::time::{Duration, Instant};
-
 use crate::SAPI;
+#[cfg(php_zts)]
+use crate::sapi::Sapi;
 
 /// Spawns a thread and masks off the signals that the Zend Engine uses.
 pub fn spawn<F, T>(name: &str, f: F) -> JoinHandle<T>
@@ -73,27 +76,33 @@ pub fn join_timeout(handle: JoinHandle<()>, timeout: Duration, impact: &str) {
 }
 
 pub fn get_current_thread_name() -> String {
+    #[cfg(php_zts)]
     let mut thread_name = SAPI.to_string();
+    #[cfg(not(php_zts))]
+    let thread_name = SAPI.to_string();
 
     #[cfg(php_zts)]
     {
-        let mut name = [0u8; 32];
-
-        let result = unsafe {
-            libc::pthread_getname_np(
-                libc::pthread_self(),
-                name.as_mut_ptr() as *mut c_char,
-                name.len(),
-            )
-        };
-
-        if result == 0 {
-            // If successful, convert the result to a Rust String
-            let cstr = unsafe { std::ffi::CStr::from_ptr(name.as_ptr() as *const c_char) };
-            let str_slice: &str = cstr.to_str().unwrap();
-            if !str_slice.is_empty() {
-                thread_name.push_str(": ");
-                thread_name.push_str(str_slice);
+        // So far, only FrankenPHP sets meaningful thread names
+        if *SAPI == Sapi::FrankenPHP {
+            let mut name = [0u8; 32];
+
+            let result = unsafe {
+                libc::pthread_getname_np(
+                    libc::pthread_self(),
+                    name.as_mut_ptr() as *mut c_char,
+                    name.len(),
+                )
+            };
+
+            if result == 0 {
+                // If successful, convert the result to a Rust String
+                let cstr = unsafe { std::ffi::CStr::from_ptr(name.as_ptr() as *const c_char) };
+                let str_slice: &str = cstr.to_str().unwrap();
+                if !str_slice.is_empty() {
+                    thread_name.push_str(": ");
+                    thread_name.push_str(str_slice);
+                }
             }
         }
     }
@@ -117,23 +126,5 @@ mod tests {
             );
         }
         assert_eq!(get_current_thread_name(), "unknown");
-
-        unsafe {
-            libc::pthread_setname_np(
-                #[cfg(target_os = "linux")]
-                libc::pthread_self(),
-                b"foo\0".as_ptr() as *const c_char,
-            );
-        }
-        assert_eq!(get_current_thread_name(), "unknown: foo");
-
-        unsafe {
-            libc::pthread_setname_np(
-                #[cfg(target_os = "linux")]
-                libc::pthread_self(),
-                b"bar\0".as_ptr() as *const c_char,
-            );
-        }
-        assert_eq!(get_current_thread_name(), "unknown: bar");
     }
 }
diff --git a/profiling/tests/correctness/exceptions_zts.json b/profiling/tests/correctness/exceptions_zts.json
index 509ebbcdde7..622595d1233 100644
--- a/profiling/tests/correctness/exceptions_zts.json
+++ b/profiling/tests/correctness/exceptions_zts.json
@@ -25,7 +25,9 @@
             },
             {
               "key": "thread name",
-              "values_regex": "^cli.*$"
+              "values": [
+                "cli"
+              ]
             }
           ]
         }