Clean up code

Author: tcgu-amd

source/lib/core/config.cpp

@@ -1331,7 +1331,6 @@ configure_signal_handler(const std::shared_ptr<settings>& _config)
             signal_settings::enable(itr);
         if(_ignore_dyninst_trampoline)
             signal_settings::disable(static_cast<sys_signal>(_dyninst_trampoline_signal));
-
         auto enabled_signals = signal_settings::get_enabled();
         tim::signals::enable_signal_detection(enabled_signals);
     }

source/lib/rocprof-sys/library.cpp

@@ -156,7 +156,7 @@ ensure_finalization(bool _static_init = false)
         config::set_signal_handler(&finalization_handler);
 
     if(config::set_attach_signal_handler(nullptr) == nullptr)
-        config::set_signal_handler(&attach_detach_handler);
+        config::set_attach_signal_handler(&attach_detach_handler);
 
     if(_static_init)
     {
@@ -418,8 +418,16 @@ rocprofsys_init_library_hidden()
     } };
 
     ROCPROFSYS_CONDITIONAL_BASIC_PRINT_F(_debug_init, "\n");
-}
 
+    if(tim::get_env("ROCPROFSYS_ATTACH", false) &&
+       config::set_attach_signal_handler(nullptr) == nullptr)
+        config::set_attach_signal_handler(&attach_detach_handler);
+}
+// Initialize RCCL if:
+// - postinit=true - so the code doesn't hang at the initialization stage
+// - get_state() >= State::Init - so the code doesn't throw an exception
+// - rccl_initialized=false - so we don't try to initialize RCCL twice
+// - get_use_rcclp()=true - only if the environment is configured to use RCCL
 static void
 rccl_setup(bool postinit)
 {
@@ -467,14 +475,11 @@ rocprofsys_init_tooling_hidden(bool postinit)
 
     ROCPROFSYS_CONDITIONAL_BASIC_PRINT_F(_debug_init, "State is %s...\n",
                                          std::to_string(get_state()).c_str());
-    if(_is_attach)
-        if(get_state() != State::PreInit || get_state() == State::Init || _once)
-        {
-            rccl_setup(postinit);
-            if(!tim::get_env("ROCPROFSYS_ATTACH", false) ||
-               get_state() >= State::Active || _once)
-                return false;
-        }
+    if(get_state() != State::PreInit || get_state() == State::Init || _once)
+    {
+        rccl_setup(postinit);
+        if(!_is_attach || get_state() >= State::Active || _once) return false;
+    }
     _once = true;
 
     ROCPROFSYS_SCOPED_THREAD_STATE(ThreadState::Internal);
@@ -549,13 +554,10 @@ rocprofsys_init_tooling_hidden(bool postinit)
     if(get_use_sampling()) sampling::block_signals();
 
     // perfetto initialization
-    // Tim: Perfetto should only need to be setup once.
-    static bool _perfetto_once = false;
-    if(!_perfetto_once && get_use_perfetto())
+    if(get_use_perfetto())
     {
         ROCPROFSYS_VERBOSE_F(1, "Setting up Perfetto...\n");
         rocprofsys::perfetto::setup();
-        _perfetto_once = true;
     }
 
     tasking::setup();
@@ -606,7 +608,7 @@ rocprofsys_init_tooling_hidden(bool postinit)
     categories::setup();
 
 #if defined(ROCPROFSYS_USE_ROCM) && ROCPROFSYS_USE_ROCM > 0
-    rocprofiler_sdk::start();
+    if(_is_attach) rocprofiler_sdk::start();
 #endif
     // if static objects are destroyed in the inverse order of when they are
     // created this should ensure that finalization is called before perfetto