add BProcess

blog_channels.txt

@@ -18,3 +18,4 @@ BDHCPClientCore 4
 BDHCPClient 4
 NCDIfConfig 4
 BUnixSignal 4
+BProcess 4

generated/blog_channel_BProcess.h

@@ -0,0 +1,4 @@
+#ifdef BLOG_CURRENT_CHANNEL
+#undef BLOG_CURRENT_CHANNEL
+#endif
+#define BLOG_CURRENT_CHANNEL BLOG_CHANNEL_BProcess

generated/blog_channels_defines.h

@@ -18,4 +18,5 @@
 #define BLOG_CHANNEL_BDHCPClient 17
 #define BLOG_CHANNEL_NCDIfConfig 18
 #define BLOG_CHANNEL_BUnixSignal 19
-#define BLOG_NUM_CHANNELS 20
+#define BLOG_CHANNEL_BProcess 20
+#define BLOG_NUM_CHANNELS 21

generated/blog_channels_list.h

@@ -18,3 +18,4 @@
 {.name = "BDHCPClient", .loglevel = 4},
 {.name = "NCDIfConfig", .loglevel = 4},
 {.name = "BUnixSignal", .loglevel = 4},
+{.name = "BProcess", .loglevel = 4},

system/BProcess.c

@@ -0,0 +1,228 @@
+/**
+ * @file BProcess.c
+ * @author Ambroz Bizjak <ambrop7@gmail.com>
+ * 
+ * @section LICENSE
+ * 
+ * This file is part of BadVPN.
+ * 
+ * BadVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ * 
+ * BadVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stddef.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <misc/offset.h>
+#include <system/BLog.h>
+
+#include <system/BProcess.h>
+
+#include <generated/blog_channel_BProcess.h>
+
+static void call_handler (BProcess *o, int normally, uint8_t normally_exit_status)
+{
+    #ifndef NDEBUG
+    DEAD_ENTER(o->d_dead)
+    #endif
+    
+    o->handler(o->user, normally, normally_exit_status);
+    
+    #ifndef NDEBUG
+    ASSERT(DEAD_KILLED)
+    DEAD_LEAVE(o->d_dead);
+    #endif
+}
+
+static void signal_handler (BProcessManager *o, struct BUnixSignal_siginfo siginfo)
+{
+    ASSERT(siginfo.signo == SIGCHLD)
+    DebugObject_Access(&o->d_obj);
+    
+    // find process
+    BProcess *p = NULL;
+    LinkedList2Iterator it;
+    LinkedList2Iterator_InitForward(&it, &o->processes);
+    LinkedList2Node *node;
+    while (node = LinkedList2Iterator_Next(&it)) {
+        BProcess *this_p = UPPER_OBJECT(node, BProcess, list_node);
+        if (this_p->pid == siginfo.pid) {
+            p = this_p;
+            LinkedList2Iterator_Free(&it);
+            break;
+        }
+    }
+    
+    if (!p) {
+        BLog(BLOG_ERROR, "got SIGCHLD for unknown pid");
+        return;
+    }
+    
+    // read exit status with waitpid()
+    int status;
+    pid_t res = waitpid(p->pid, &status, WNOHANG);
+    if (res < 0) {
+        BLog(BLOG_ERROR, "waitpid(%"PRIiMAX") failed", (intmax_t)p->pid);
+        return;
+    }
+    if (res == 0) {
+        BLog(BLOG_ERROR, "waitpid(%"PRIiMAX") returned 0", (intmax_t)p->pid);
+        return;
+    }
+    
+    if (WIFEXITED(status)) {
+        uint8_t exit_status = WEXITSTATUS(status);
+        
+        BLog(BLOG_INFO, "child %"PRIiMAX" exited with status %"PRIu8, (intmax_t)p->pid, exit_status);
+        
+        call_handler(p, 1, exit_status);
+        return;
+    }
+    
+    if (WIFSIGNALED(status)) {
+        int signo = WTERMSIG(status);
+        
+        BLog(BLOG_INFO, "child %"PRIiMAX" exited with signal %d", (intmax_t)p->pid, signo);
+        
+        call_handler(p, 0, 0);
+        return;
+    }
+    
+    BLog(BLOG_ERROR, "unknown wait status type for pid %"PRIiMAX" (%d)", (intmax_t)p->pid, status);
+}
+
+int BProcessManager_Init (BProcessManager *o, BReactor *reactor)
+{
+    // init arguments
+    o->reactor = reactor;
+    
+    // init signal handling
+    sigset_t sset;
+    ASSERT_FORCE(sigemptyset(&sset) == 0)
+    ASSERT_FORCE(sigaddset(&sset, SIGCHLD) == 0)
+    if (!BUnixSignal_Init(&o->signal, o->reactor, sset, (BUnixSignal_handler)signal_handler, o)) {
+        BLog(BLOG_ERROR, "BUnixSignal_Init failed");
+        goto fail0;
+    }
+    
+    // init processes list
+    LinkedList2_Init(&o->processes);
+    
+    DebugObject_Init(&o->d_obj);
+    
+    return 1;
+    
+fail0:
+    return 0;
+}
+
+void BProcessManager_Free (BProcessManager *o)
+{
+    ASSERT(LinkedList2_IsEmpty(&o->processes))
+    DebugObject_Free(&o->d_obj);
+    
+    // free signal handling
+    BUnixSignal_Free(&o->signal, 1);
+}
+
+int BProcess_Init (BProcess *o, BProcessManager *m, BProcess_handler handler, void *user, const char *file, char *const argv[])
+{
+    // init arguments
+    o->m = m;
+    o->handler = handler;
+    o->user = user;
+    
+    // fork
+    pid_t pid = fork();
+    if (pid < 0) {
+        BLog(BLOG_ERROR, "fork failed");
+        goto fail0;
+    }
+    
+    if (pid == 0) {
+        // this is child
+        
+        int max_fd = sysconf(_SC_OPEN_MAX);
+        if (max_fd < 0) {
+            abort();
+        }
+        
+        for (int i = 0; i < max_fd; i++) {
+            close(i);
+        }
+        
+        execv(file, argv);
+        
+        abort();
+    }
+    
+    // remember pid
+    o->pid = pid;
+    
+    // add to processes list
+    LinkedList2_Append(&o->m->processes, &o->list_node);
+    
+    DebugObject_Init(&o->d_obj);
+    #ifndef NDEBUG
+    DEAD_INIT(o->d_dead);
+    #endif
+    
+    return 1;
+    
+fail0:
+    return 0;
+}
+
+void BProcess_Free (BProcess *o)
+{
+    DebugObject_Free(&o->d_obj);
+    #ifndef NDEBUG
+    DEAD_KILL(o->d_dead);
+    #endif
+    
+    // remove from processes list
+    LinkedList2_Remove(&o->m->processes, &o->list_node);
+}
+
+int BProcess_Terminate (BProcess *o)
+{
+    DebugObject_Access(&o->d_obj);
+    
+    ASSERT(o->pid > 0)
+    
+    if (kill(o->pid, SIGTERM) < 0) {
+        BLog(BLOG_ERROR, "kill(%"PRIiMAX", SIGTERM) failed", (intmax_t)o->pid);
+        return 0;
+    }
+    
+    return 1;
+}
+
+int BProcess_Kill (BProcess *o)
+{
+    DebugObject_Access(&o->d_obj);
+    
+    ASSERT(o->pid > 0)
+    
+    if (kill(o->pid, SIGKILL) < 0) {
+        BLog(BLOG_ERROR, "kill(%"PRIiMAX", SIGKILL) failed", (intmax_t)o->pid);
+        return 0;
+    }
+    
+    return 1;
+}

system/BProcess.h

@@ -0,0 +1,64 @@
+/**
+ * @file BProcess.h
+ * @author Ambroz Bizjak <ambrop7@gmail.com>
+ * 
+ * @section LICENSE
+ * 
+ * This file is part of BadVPN.
+ * 
+ * BadVPN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ * 
+ * BadVPN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef BADVPN_SYSTEM_BPROCESS_H
+#define BADVPN_SYSTEM_BPROCESS_H
+
+#include <stdint.h>
+#include <unistd.h>
+
+#include <misc/debug.h>
+#include <misc/dead.h>
+#include <structure/LinkedList2.h>
+#include <system/DebugObject.h>
+#include <system/BUnixSignal.h>
+
+typedef struct {
+    BReactor *reactor;
+    BUnixSignal signal;
+    LinkedList2 processes;
+    DebugObject d_obj;
+} BProcessManager;
+
+typedef void (*BProcess_handler) (void *user, int normally, uint8_t normally_exit_status);
+
+typedef struct {
+    BProcessManager *m;
+    BProcess_handler handler;
+    void *user;
+    pid_t pid;
+    LinkedList2Node list_node; // node in BProcessManager.processes
+    DebugObject d_obj;
+    #ifndef NDEBUG
+    dead_t d_dead;
+    #endif
+} BProcess;
+
+int BProcessManager_Init (BProcessManager *o, BReactor *reactor) WARN_UNUSED;
+void BProcessManager_Free (BProcessManager *o);
+
+int BProcess_Init (BProcess *o, BProcessManager *m, BProcess_handler handler, void *user, const char *file, char *const argv[]) WARN_UNUSED;
+void BProcess_Free (BProcess *o);
+int BProcess_Terminate (BProcess *o);
+int BProcess_Kill (BProcess *o);
+
+#endif

system/CMakeLists.txt

@@ -8,6 +8,7 @@ if (NOT WIN32)
     list(APPEND BSYSTEM_ADDITIONAL_SOURCES
         BLog_syslog.c
         BUnixSignal.c
+        BProcess.c
     )
 endif ()