fixup

Author: realFlowControl

profiling/src/lib.rs

@@ -3,8 +3,8 @@ pub mod capi;
 mod clocks;
 mod config;
 mod logging;
-mod pthread;
 pub mod profiling;
+mod pthread;
 mod sapi;
 mod thin_str;
 mod wall_time;
@@ -936,4 +936,4 @@ fn notify_trace_finished(local_root_span_id: u64, span_type: Cow<str>, resource:
             }
         }
     });
-}
+}

profiling/src/pthread.rs

@@ -10,30 +10,32 @@ pub(crate) unsafe fn startup() {
 }
 
 extern "C" fn prepare() {
-    trace!("Preparing profiler for upcomming fork call.");
-
     // Hold mutexes across the handler. If there are any spurious wakeups by
     // the threads while the fork is occurring, they cannot acquire locks
     // since this thread holds them, preventing a deadlock situation.
     if let Some(profiler) = Profiler::get() {
+        trace!("Preparing profiler for upcomming fork call.");
         let _ = profiler.fork_prepare();
     }
 }
 
 extern "C" fn parent() {
-    trace!("Re-enabling profiler in parent after fork call.");
     if let Some(profiler) = Profiler::get() {
+        trace!("Re-enabling profiler in parent after fork call.");
         profiler.post_fork_parent();
     }
 }
 
 unsafe extern "C" fn child() {
+    if let None = Profiler::get() {
+        // No profiler, so nothing to do. This can happen in Apache forking SAPI, where Apache
+        // would first go through MINIT phase and then fork(), so we'd observe the fork but there
+        // is no profiler yet.
+        return;
+    }
     trace!("Shutting down profiler for child process after fork");
-    // Disable the profiler because either:
-    //  1. This is the child, and we don't support this yet.
-    //  2. Something went wrong, and disable it to be safe.
-    // And then leak the old profiler. Its drop method is not safe to run in
-    // these situations.
+    // Disable the profiler because this is the child, and we don't support this yet.
+    // And then leak the old profiler. Its drop method is not safe to run in these situations.
     Profiler::kill();
 
     alloc_prof_rshutdown();