[logging] Simplified code for setting kernel thread name in Linux.

[casparcg] / common / os / linux / signal_handlers.cpp

diff --git a/common/os/linux/signal_handlers.cpp b/common/os/linux/signal_handlers.cpp
index c3cc93757880792231ddb6039c1dcb89ddf9ff37..579558a0037c167ca84503ffd8117662bae1b851 100644 (file)
--- a/common/os/linux/signal_handlers.cpp
+++ b/common/os/linux/signal_handlers.cpp
@@ -1,16 +1,73 @@
 #include "../general_protection_fault.h"
 
+#include "../../except.h"
+#include "../../log.h"
+#include "../../thread_info.h"
+
+#include <signal.h>
+#include <pthread.h>
+
 namespace caspar {
 
+struct floating_point_exception : virtual caspar_exception {};
+struct segmentation_fault_exception : virtual caspar_exception {};
+
+void catch_fpe(int signum)
+{
+       try
+       {
+               CASPAR_THROW_EXCEPTION(floating_point_exception());
+       }
+       catch (...)
+       {
+               CASPAR_LOG_CURRENT_EXCEPTION();
+               throw;
+       }
+}
+
+void catch_segv(int signum)
+{
+       try
+       {
+               CASPAR_THROW_EXCEPTION(segmentation_fault_exception());
+       }
+       catch (...)
+       {
+               CASPAR_LOG_CURRENT_EXCEPTION();
+               throw;
+       }
+}
+
+void do_install_handlers()
+{
+       signal(SIGFPE, catch_fpe);
+       signal(SIGSEGV, catch_segv);
+}
+
 void install_gpf_handler()
 {
-       // TODO: implement
+       ensure_gpf_handler_installed_for_thread();
 }
 
 void ensure_gpf_handler_installed_for_thread(
                const char* thread_description)
 {
-       // TODO: implement
+       static const int MAX_LINUX_THREAD_NAME_LEN = 15;
+       static auto install = []() { do_install_handlers(); return 0; } ();
+
+       auto& for_thread = get_thread_info();
+       
+       if (thread_description && for_thread.name.empty())
+       {
+               for_thread.name = thread_description;
+
+               std::string kernel_thread_name = for_thread.name;
+
+               if (kernel_thread_name.length() > MAX_LINUX_THREAD_NAME_LEN)
+                       kernel_thread_name.resize(MAX_LINUX_THREAD_NAME_LEN);
+
+               pthread_setname_np(pthread_self(), kernel_thread_name.c_str());
+       }
 }
 
 }