Changeset 10501 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 11, 2008 9:29:38 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33180

Message:

FE/SDL: added (undocumented) -pidfile parameter

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (2 diffs)
• VBoxSDL.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -42 +42 @@
 #include <VBox/err.h>
 #include <VBox/log.h>
-#include <signal.h>
 
 #include "VBoxSDL.h"
@@ -145 +144 @@
         return;
     }
-
-#ifdef VBOXSDL_WITH_X11
-    /* NOTE: we still want Ctrl-C to work, so we undo the SDL redirections */
-    signal(SIGINT, SIG_DFL);
-    signal(SIGQUIT, SIG_DFL);
-#endif
 
     const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -164 +164 @@
 #endif
 static const char *gHostKeyDisabledCombinations = "";
+static const char *gpszPidFile;
 static BOOL gfGrabbed = FALSE;
 static BOOL gfGrabOnMouseClick = TRUE;
@@ -743 +744 @@
  * annoying enough for introducing this hack.
  */
-void signal_handler(int sig, siginfo_t *info, void *secret)
+void signal_handler_SIGUSR1(int sig, siginfo_t *info, void *secret)
 {
     /* only SIGUSR1 is interesting */
@@ -751 +752 @@
         ResetKeys();
     }
+}
+
+/**
+ * Custom signal handler for catching exit events.
+ */
+void signal_handler_SIGINT(int sig)
+{
+    if (gpszPidFile)
+        RTFileDelete(gpszPidFile);
+    signal(SIGINT, SIG_DFL);
+    signal(SIGQUIT, SIG_DFL);
+    signal(SIGSEGV, SIG_DFL);
+    kill(getpid(), sig);
 }
 #endif /* VBOXSDL_WITH_X11 */
@@ -1326 +1340 @@
             gfACPITerm = TRUE;
         }
+        else if (strcmp(argv[curArg], "-pidfile") == 0)
+        {
+            if (++curArg >= argc)
+            {
+                RTPrintf("Error: missing file name for -pidfile!\n");
+                rc = E_FAIL;
+                break;
+            }
+            gpszPidFile = argv[curArg];
+        }
         else if (strcmp(argv[curArg], "-hda") == 0)
         {
@@ -1902 +1926 @@
     gpFrameBuffer->AddRef();
     if (fFullscreen)
-    {
         gpFrameBuffer->setFullscreen(true);
-    }
+
 #ifdef VBOX_SECURELABEL
     if (fSecureLabel)
@@ -1951 +1974 @@
         gpFrameBuffer->setSecureLabelText(labelUtf8.raw());
     }
+#endif
+
+#ifdef VBOXSDL_WITH_X11
+    /* NOTE1: We still want Ctrl-C to work, so we undo the SDL redirections.
+     * NOTE2: We have to remove the PidFile if this file exists. */
+    signal(SIGINT,  signal_handler_SIGINT);
+    signal(SIGQUIT, signal_handler_SIGINT);
+    signal(SIGSEGV, signal_handler_SIGINT);
 #endif
 
@@ -2130 +2161 @@
 #ifdef VBOXSDL_WITH_X11
     struct sigaction sa;
-    sa.sa_sigaction = signal_handler;
+    sa.sa_sigaction = signal_handler_SIGUSR1;
     sigemptyset (&sa.sa_mask);
     sa.sa_flags = SA_RESTART | SA_SIGINFO;
@@ -2319 +2350 @@
      */
     SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+
+    /*
+     * Create PID file.
+     */
+    if (gpszPidFile)
+    {
+        char szBuf[32];
+        const char *pcszLf = "\n";
+        RTFILE PidFile;
+        RTFileOpen(&PidFile, gpszPidFile, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE);
+        RTStrFormatNumber(szBuf, RTProcSelf(), 10, 0, 0, 0);
+        RTFileWrite(PidFile, szBuf, strlen(szBuf), NULL);
+        RTFileWrite(PidFile, pcszLf, strlen(pcszLf), NULL);
+        RTFileClose(PidFile);
+    }
 
     /*
@@ -2719 +2765 @@
 
 leave:
+    if (gpszPidFile)
+        RTFileDelete(gpszPidFile);
+
     LogFlow(("leaving...\n"));
 #if defined(VBOX_WITH_XPCOM) && !defined(RT_OS_DARWIN) && !defined(RT_OS_OS2)