X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdaemon.h;h=14436f311eeb9da7783da837517e235d9224df83;hb=a6e73618f53138eb6f55e2c66ff8c649794fd8dd;hp=d62dd4f01ae381c5008861d84381cc5d26026960;hpb=91a1e24d09ba1f08b1f8c08815f595187c6ef946;p=sliver-openvswitch.git

diff --git a/lib/daemon.h b/lib/daemon.h
index d62dd4f01..14436f311 100644
--- a/lib/daemon.h
+++ b/lib/daemon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,22 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-enum {
-    OPT_NO_CHDIR = UCHAR_MAX + 2048
-};
+#define DAEMON_OPTION_ENUMS                     \
+    OPT_DETACH,                                 \
+    OPT_NO_CHDIR,                               \
+    OPT_OVERWRITE_PIDFILE,                      \
+    OPT_PIDFILE,                                \
+    OPT_MONITOR
 
-#define DAEMON_LONG_OPTIONS                             \
-        {"detach",      no_argument, 0, 'D'},           \
-        {"no-chdir",    no_argument, 0, OPT_NO_CHDIR},  \
-        {"force",       no_argument, 0, 'f'},           \
-        {"pidfile",     optional_argument, 0, 'P'}
+#define DAEMON_LONG_OPTIONS                                             \
+        {"detach",            no_argument, NULL, OPT_DETACH},           \
+        {"no-chdir",          no_argument, NULL, OPT_NO_CHDIR},         \
+        {"pidfile",           optional_argument, NULL, OPT_PIDFILE},    \
+        {"overwrite-pidfile", no_argument, NULL, OPT_OVERWRITE_PIDFILE}, \
+        {"monitor",           no_argument, NULL, OPT_MONITOR}
 
 #define DAEMON_OPTION_HANDLERS                  \
-        case 'D':                               \
+        case OPT_DETACH:                        \
             set_detach();                       \
             break;                              \
                                                 \
@@ -40,23 +44,38 @@ enum {
             set_no_chdir();                     \
             break;                              \
                                                 \
-        case 'P':                               \
+        case OPT_PIDFILE:                       \
             set_pidfile(optarg);                \
             break;                              \
                                                 \
-        case 'f':                               \
+        case OPT_OVERWRITE_PIDFILE:             \
             ignore_existing_pidfile();          \
+            break;                              \
+                                                \
+        case OPT_MONITOR:                       \
+            daemon_set_monitor();               \
             break;
 
 char *make_pidfile_name(const char *name);
 void set_pidfile(const char *name);
 const char *get_pidfile(void);
 void set_no_chdir(void);
+bool is_chdir_enabled(void);
 void set_detach(void);
+bool get_detach(void);
+void daemon_set_monitor(void);
+void daemon_save_fd(int fd);
+void remove_pidfile_from_unlink(void);
+void add_pidfile_to_unlink(void);
 void daemonize(void);
-void die_if_already_running(void);
+void daemonize_start(void);
+void daemonize_complete(void);
 void ignore_existing_pidfile(void);
 void daemon_usage(void);
 pid_t read_pidfile(const char *name);
+pid_t read_pidfile_if_exists(const char *name);
+
+pid_t fork_and_clean_up(void);
+void daemonize_post_detach(void);
 
 #endif /* daemon.h */