Daemon: Added DAEMON_FLAG_SIMULATE

diff --git a/ucw/daemon.c b/ucw/daemon.c
index 00313b946545b37c4cbdb1e6362b29361fba9b84..ec9a21877ea190019cef4101a94813ed4ddac221 100644 (file)
--- a/ucw/daemon.c
+++ b/ucw/daemon.c
@@ -82,6 +82,9 @@ daemon_init(struct daemon_params *dp)
 {
   daemon_resolve_ugid(dp);
 
+  if (dp->flags & DAEMON_FLAG_SIMULATE)
+    return;
+
   if (dp->pid_file)
     {
       // Check that PID file path is absolute
@@ -115,6 +118,12 @@ daemon_init(struct daemon_params *dp)
 void
 daemon_run(struct daemon_params *dp, void (*body)(struct daemon_params *dp))
 {
+  if (dp->flags & DAEMON_FLAG_SIMULATE)
+    {
+      body(dp);
+      return;
+    }
+
   // Switch GID and UID
   if (dp->want_setgid && setresgid(dp->run_as_gid, dp->run_as_gid, dp->run_as_gid) < 0)
     die("Cannot set GID to %d: %m", (int) dp->run_as_gid);
@@ -168,6 +177,9 @@ daemon_run(struct daemon_params *dp, void (*body)(struct daemon_params *dp))
 void
 daemon_exit(struct daemon_params *dp)
 {
+  if (dp->flags & DAEMON_FLAG_SIMULATE)
+    return;
+
   if (dp->pid_file)
     {
       if (unlink(dp->pid_file) < 0)

diff --git a/ucw/daemon.h b/ucw/daemon.h
index 9cdfe05027fb65bcd414afc00a30db81ef90fed1..c5beacc060ca8186171e91fad6a9ef3b3878dffa 100644 (file)
--- a/ucw/daemon.h
+++ b/ucw/daemon.h
@@ -30,6 +30,7 @@ struct daemon_params {
 /** Flags passed to the daemon helper. **/
 enum daemon_flags {
   DAEMON_FLAG_PRESERVE_CWD = 1,                // Skip chdir("/")
+  DAEMON_FLAG_SIMULATE = 2,            // Simulate daemonization (avoid fork etc.)
 };
 
 /**
@@ -44,6 +45,9 @@ void daemon_init(struct daemon_params *dp);
  * a new process and does all necessary setup. Inside the new process, it calls
  * @body (and when it returns, it exits the process). In the original process, it writes
  * the PID file and returns.
+ *
+ * When `DAEMON_FLAG_SIMULATE` is set, it justs calls @body. This is useful
+ * for running of daemons in a debugger.
  **/
 void daemon_run(struct daemon_params *dp, void (*body)(struct daemon_params *dp));