Print forked processes and prevent closing the socket

src/library/checkpoint/Checkpoint.cpp

@@ -753,7 +753,8 @@ static void readAnArea(SaveState &saved_state, int spmfd, SaveState &parent_stat
 static void writeAllAreas(bool base)
 {
     if (shared_config.savestate_settings & SharedConfig::SS_FORK) {
-        pid_t pid = fork();
+        pid_t pid;
+        NATIVECALL(pid = fork());
         if (pid != 0)
             return;
 

src/library/global.cpp

@@ -24,6 +24,7 @@ namespace libtas {
 SharedConfig shared_config;
 GameInfo game_info;
 volatile bool is_exiting = false;
+volatile bool is_fork = false;
 bool skipping_draw = false;
 Display* gameDisplays[GAMEDISPLAYNUM] = {};
 xcb_connection_t* gameConnections[GAMEDISPLAYNUM] = {};

src/library/global.h

@@ -50,6 +50,9 @@ namespace libtas {
     /* Indicate if the game is exiting. It helps avoiding some invalid or blocking calls */
     extern volatile bool is_exiting;
 
+    /* Indicate if this is a forked process. We should not use socket on forked processes */
+    extern volatile bool is_fork;
+
     /* Do we skip all rendering functions for the current frame */
     extern bool skipping_draw;
 

src/library/logging.cpp

@@ -79,11 +79,15 @@ void debuglogstdio(LogCategoryFlag lcf, const char* fmt, ...)
     snprintf(s + size, maxsize-size-1, "[libTAS f:%" PRIu64 "] ", framecount);
     size = strlen(s);
 
-    pid_t tid = ThreadManager::getThreadTid();
-    if (ThreadManager::isMainThread())
-        snprintf(s + size, maxsize-size-1, "Thread %d (main) ", tid);
+    pid_t tid;
+    if (is_fork)
+        /* For forked processes, the thread manager have wrong pid values (those of parent process) */
+        NATIVECALL(tid = getpid());
     else
-        snprintf(s + size, maxsize-size-1, "Thread %d        ", tid);
+        tid = ThreadManager::getThreadTid();
+
+    snprintf(s + size, maxsize-size-1, "Thread %d %s ", tid, is_fork?"(fork)":(ThreadManager::isMainThread()?"(main)":""));
+
     size = strlen(s);
 
     if (isTerm) {

src/library/main.cpp

@@ -180,10 +180,12 @@ void __attribute__((constructor)) init(void)
 void __attribute__((destructor)) term(void)
 {
     if (is_inited) {
-        ThreadManager::deallocateThreads();
-        sendMessage(MSGB_QUIT);
-        closeSocket();
+        if (!is_fork) {
+            sendMessage(MSGB_QUIT);
+            closeSocket();
+        }
         debuglog(LCF_SOCKET, "Exiting.");
+        ThreadManager::deallocateThreads();
     }
 }
 

src/library/systemwrappers.cpp

@@ -27,6 +27,7 @@
 namespace libtas {
 
 DEFINE_ORIG_POINTER(getpid);
+DEFINE_ORIG_POINTER(fork);
 
 /* Override */ pid_t getpid (void) throw()
 {
@@ -54,4 +55,21 @@ DEFINE_ORIG_POINTER(getpid);
     return pid;
 }
 
+/* Override */  pid_t fork(void) __THROWNL
+{
+    LINK_NAMESPACE_GLOBAL(fork);
+    pid_t pid = orig::fork();
+
+    if (GlobalState::isNative()) {
+        return pid;
+    }
+
+    DEBUGLOGCALL(LCF_SYSTEM);
+
+    if (pid == 0) {
+        is_fork = true;
+    }
+    return pid;
+}
+
 }

src/library/systemwrappers.h

@@ -27,7 +27,12 @@
 namespace libtas {
 
 /* Get the process ID of the calling process.  */
-OVERRIDE pid_t getpid (void) throw();
+OVERRIDE pid_t getpid (void) __THROWNL;
+
+/* Clone the calling process, creating an exact copy.
+   Return -1 for errors, 0 to the new process,
+   and the process ID of the new process to the old process.  */
+OVERRIDE pid_t fork(void) __THROWNL;
 
 }