X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fdaemon.c;h=cb440d16804fadb3ae6b657612c51cf37e5e091f;hb=b0421aa20c401c8503946a102428d0a4adb976f9;hp=c0f168291e6ed053540e9260ec8e6997d4b8d4a3;hpb=b43c6fe279a5630dfbc0273e06bd1e8ca530ba35;p=openvswitch

diff --git a/lib/daemon.c b/lib/daemon.c
index c0f16829..cb440d16 100644
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -139,38 +139,20 @@ daemon_set_monitor(void)
     monitor = true;
 }
 
-/* If a pidfile has been configured and that pidfile already exists and is
- * locked by a running process, returns the pid of the running process.
- * Otherwise, returns 0. */
-static pid_t
-already_running(void)
-{
-    pid_t pid = 0;
-    if (pidfile) {
-        int fd = open(pidfile, O_RDWR);
-        if (fd >= 0) {
-            struct flock lck;
-            lck.l_type = F_WRLCK;
-            lck.l_whence = SEEK_SET;
-            lck.l_start = 0;
-            lck.l_len = 0;
-            if (fcntl(fd, F_GETLK, &lck) != -1 && lck.l_type != F_UNLCK) {
-                pid = lck.l_pid;
-            }
-            close(fd);
-        }
-    }
-    return pid;
-}
-
 /* If a locked pidfile exists, issue a warning message and, unless
  * ignore_existing_pidfile() has been called, terminate the program. */
 void
 die_if_already_running(void)
 {
-    pid_t pid = already_running();
-    if (pid) {
+    pid_t pid;
+    if (!pidfile) {
+        return;
+    }
+    pid = read_pidfile_if_exists(pidfile);
+    if (pid > 0) {
         if (!overwrite_pidfile) {
+            VLOG_ERR("%s: %s already running as pid %ld, aborting",
+                      get_pidfile(), program_name, (long int) pid);
             ovs_fatal(0, "%s: already running as pid %ld",
                       get_pidfile(), (long int) pid);
         } else {
@@ -223,11 +205,11 @@ make_pidfile(void)
                                      pidfile, strerror(errno));
                         }
                     }
-                    free(text);
                 } else {
                     VLOG_ERR("%s: write failed: %s", tmpfile, strerror(errno));
                     close(fd);
                 }
+                free(text);
             } else {
                 VLOG_ERR("%s: fcntl failed: %s", tmpfile, strerror(errno));
                 close(fd);
@@ -475,11 +457,14 @@ daemonize_start(void)
 }
 
 /* If daemonization is configured, then this function notifies the parent
- * process that the child process has completed startup successfully. */
+ * process that the child process has completed startup successfully.
+ *
+ * Calling this function more than once has no additional effect. */
 void
 daemonize_complete(void)
 {
     fork_notify_startup(daemonize_fd);
+    daemonize_fd = -1;
 
     if (detach) {
         setsid();
@@ -487,6 +472,7 @@ daemonize_complete(void)
             ignore(chdir("/"));
         }
         close_standard_fds();
+        detach = false;
     }
 }
 
@@ -503,10 +489,8 @@ daemon_usage(void)
         ovs_rundir(), program_name);
 }
 
-/* Opens and reads a PID from 'pidfile'.  Returns the nonnegative PID if
- * successful, otherwise a negative errno value. */
-pid_t
-read_pidfile(const char *pidfile)
+static pid_t
+read_pidfile__(const char *pidfile, bool must_exist)
 {
     char line[128];
     struct flock lck;
@@ -527,6 +511,9 @@ read_pidfile(const char *pidfile)
 
     file = fopen(pidfile, "r");
     if (!file) {
+        if (errno == ENOENT && !must_exist) {
+            return 0;
+        }
         error = errno;
         VLOG_WARN("%s: open: %s", pidfile, strerror(error));
         goto error;
@@ -536,6 +523,7 @@ read_pidfile(const char *pidfile)
     lck.l_whence = SEEK_SET;
     lck.l_start = 0;
     lck.l_len = 0;
+    lck.l_pid = 0;
     if (fcntl(fileno(file), F_GETLK, &lck)) {
         error = errno;
         VLOG_WARN("%s: fcntl: %s", pidfile, strerror(error));
@@ -574,3 +562,21 @@ error:
     }
     return -error;
 }
+
+/* Opens and reads a PID from 'pidfile'.  Returns the positive PID if
+ * successful, otherwise a negative errno value. */
+pid_t
+read_pidfile(const char *pidfile)
+{
+    return read_pidfile__(pidfile, true);
+}
+
+
+/* Opens and reads a PID from 'pidfile', if it exists.  Returns 0 if 'pidfile'
+ * doesn't exist, the positive PID if successful, otherwise a negative errno
+ * value. */
+pid_t
+read_pidfile_if_exists(const char *pidfile)
+{
+    return read_pidfile__(pidfile, false);
+}