[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtd.C

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.45 by root, Tue Feb 19 18:58:05 2008 UTC vs.
Revision 1.51 by root, Sun Oct 24 17:34:47 2010 UTC

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#if defined(ENABLE_FRILLS) && defined(_POSIX_MEMLOCK) && _POSIX_MEMLOCK > 0
+# define ENABLE_MLOCK 1
+#endif
+#if ENABLE_MLOCK
+# include <sys/mman.h>
+#endif
 #include <cerrno>
 #include "rxvt.h"
 #include "rxvtdaemon.h"
 #include "libptytty.h"
               if (!strcmp (tok, "END"))
                 break;
               else if (!strcmp (tok, "ENV") && recv (tok))
                 envv->push_back (strdup (tok));
-              else if (!strcmp (tok, "CWD") && recv (tok))
-                {
-                  if (chdir (tok))
-                    {
-                      delete envv;
-                      delete argv;
-                      return err ("unable to change to working directory to '%s', aborting: %s.\n",
-                                  (char *)tok, strerror (errno));
-                    }
-                }
               else if (!strcmp (tok, "ARG") && recv (tok))
                 argv->push_back (strdup (tok));
               else
                 return err ("protocol error: unexpected NEW token.\n");
             }
                 success = false;
               }
             term->log_hook = 0;
-            chdir ("/");
+            chdir ("/"); // init might change to different working directory
             if (!success)
               term->destroy ();
             send ("END"); send (success ? 1 : 0);
     }
   else
     return err ();
 }
-int opt_fork, opt_opendisplay, opt_quiet;
 int
 main (int argc, const char *const *argv)
 {
+  int opt_fork, opt_opendisplay, opt_quiet;
+#if ENABLE_MLOCK
+  int opt_lock;
+#endif
   rxvt_init ();
   for (int i = 1; i < argc; i++)
     {
       if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
         opt_fork = 1;
       else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
         opt_opendisplay = 1;
       else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
         opt_quiet = 1;
+#if ENABLE_MLOCK
+      else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
+        opt_lock = 1;
+#endif
       else
         {
           rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
           return EXIT_FAILURE;
         }
       fflush (stdout);
     }
   free (sockname);
+  pid_t pid = 0;
   if (opt_fork)
     {
-      pid_t pid = fork ();
+      pid = fork ();
+    }
+#if ENABLE_MLOCK
+  // Optionally perform an mlockall so this process does not get swapped out.
+  if (opt_lock && !pid)
+    if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
+      perror ("unable to lock into ram");
+#endif
+  if (opt_fork)
+    {
       if (pid < 0)
         {
           rxvt_log ("unable to fork daemon, aborting.\n");
           return EXIT_FAILURE;
         }
       else if (pid > 0)
         _exit (EXIT_SUCCESS);
-      ev_default_fork ();
+      ev_loop_fork (EV_DEFAULT_UC);
     }
-  ev_loop (0);
+  ev_run ();
   return EXIT_SUCCESS;
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/rxvtd.C (file contents): Revision 1.45 by root, Tue Feb 19 18:58:05 2008 UTC vs. Revision 1.51 by root, Sun Oct 24 17:34:47 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.45 by root, Tue Feb 19 18:58:05 2008 UTC vs.
Revision 1.51 by root, Sun Oct 24 17:34:47 2010 UTC