IPC: fix SIGTERM signal handling

directvt · May 15, 2021 · 7dfa993 · 7dfa993
1 parent c7d8089
commit 7dfa993
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/netxs/os/system.hpp b/src/netxs/os/system.hpp
@@ -1860,6 +1860,13 @@ namespace netxs::os
                         case SIGWINCH:
                             resize_handler();
                             break;
+                        case SIGTERM:
+                            log("tty : SIGTERM");
+                            sock->shut();
+                            log("tty : sock->xipc::shut called");
+                            ::signal (signal, SIG_DFL);
+                            ::raise (signal);
+                            break;
                         default:
                             break;
                     }
@@ -2232,6 +2239,9 @@ namespace netxs::os
                 }
                 ok(::signal(SIGPIPE,  SIG_IGN )); // Disable sigpipe.
                 ok(::signal(SIGWINCH, sig_hndl)); // Set resize handler.
+                log("tty : Set termination handler.");
+                ok(::signal(SIGTERM, sig_hndl));   // Set termination handler.
+                log("tty : Raise resize event.");
                 ok(::raise (SIGWINCH));           // Get current terminal window size.
 
             #endif

diff --git a/src/netxs/ui/controls.hpp b/src/netxs/ui/controls.hpp
@@ -160,8 +160,9 @@ namespace netxs::ui
     {
         //todo cache specific
         sptr<face> coreface;
-        sptr<base> client; // mold: Client object.
         face& canvas; // .: Form cache.
+
+        sptr<base> client; // mold: Client object.
     public:
         rgba title_fg_color = 0xFFffffff;
         bool only_frame = faux;

diff --git a/src/netxs/ui/events.hpp b/src/netxs/ui/events.hpp
@@ -1128,6 +1128,7 @@ namespace netxs::events
         { }
         ~bell()
         {
+            e2::sync lock;
             signal<e2::release>(e2::dtor, id);
         }
     };