Initial implementation of "startup" components.

These are components that are run at program startup. Starting
other components is delayed until all startup components terminate.
This is similar to SysV "bootwait" components.

Upon termination, startup components are removed from the configuration.
They are not renewed upon configuratuion reload.

* src/comp.c (comp_array_remove): Remove from the depmap as well.
(component_ref_decr): Use comp_array_remove for active components
and plain component_free for inactive ones.
(component_build_depmap): Use comp_array_remove.
(component_config_commit): Special handling for pies_comp_startup
components.
* src/pies.c (modetab): New component modes: "startup" and "shutdown".
(main): Run program_init_startup.
* src/pies.h (pies_comp_mode): New modes: pies_comp_startup and
pies_comp_shutdown.
(program_init_startup): New proto.
* src/progman.c (progman_waiting_p): Return 1 if a startup component
is still running.
(program_init_startup): New function.
(progman_cleanup): Handle pies_comp_startup termination.
* src/socket.c (switch_eids): Avoid unnecessary calls to setegid
and seteuid.

* tests/atlocal.in (auxdir): New variable.
* tests/mailer: Move to tests/aux/
* tests/respawn: Move to tests/aux/
* tests/retcode: Move to tests/aux/
* tests/aux/startup: New auxiliary program.
* tests/redirect.at: Start components from $auxdir.
* tests/respawn.at: Likewise.
* tests/ret-exec.at: Likewise.
* tests/ret-notify.at: Likewise.
* tests/startup.at: New file.
* tests/testsuite.at: Include startup.at
* tests/Makefile.am: Add new tests.

17 files changed, 442 insertions, 260 deletions

diff --git a/src/comp.c b/src/comp.c
index c3e998a..2346306 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -24,6 +24,11 @@ struct complist
   struct component *tail;
 };
 
+/* 0 on the first load, and 1 on all subsequent reloads. Tells the
+   component_config_commit whether we're starting from scratch or just
+   updating an already loaded configuration */
+static int loaded;
+
 static struct complist comp_list[2];
 static int cur;
 
@@ -32,13 +37,13 @@ static size_t comp_count;
 
 static pies_depmap_t depmap;
 
-static int
+static inline int
 next_index (void)
 {
   return (cur + 1) % ARRAY_SIZE (comp_list);
 }
 
-static int
+static inline int
 prev_index (void)
 {
   return (cur + ARRAY_SIZE (comp_list) - 1) % ARRAY_SIZE (comp_list);
@@ -85,6 +90,22 @@ component_append (struct component *comp)
 }
 
 void
+comp_array_remove (size_t i)
+{
+  struct component *comp = comp_array[i];
+
+  depmap_remove (depmap, i);
+  while (i < comp_count -1)
+    {
+      comp_array[i] = comp_array[i+1];
+      comp_array[i]->arridx = i;
+      i++;
+    }
+  component_free (comp);
+  comp_count--;
+}
+
+void
 component_unlink (struct component *comp)
 {
   struct complist *list = &comp_list[comp->listidx];
@@ -201,7 +222,12 @@ component_ref_decr (struct component *comp)
 {
   assert (comp->ref_count > 0);
   if (--comp->ref_count == 0)
-    component_free (comp);
+    {
+      if (component_is_active (comp))
+        comp_array_remove (comp->arridx);
+      else
+        component_free (comp);
+    }
 }
 
 static int
@@ -425,17 +451,6 @@ report_cyclic_dependency (pies_depmap_t dp, size_t idx)
 }
 
 void
-comp_array_remove (size_t i)
-{
-  struct component *comp = comp_array[i];
-  if (i < comp_count - 1)
-    memmove (&comp_array[i], &comp_array[i+1],
-             (comp_count - i - 1) * sizeof comp_array[0]);
-  component_free (comp);
-  comp_count--;
-}
-
-void
 component_build_depmap (void)
 {
   size_t i;
@@ -460,7 +475,6 @@ component_build_depmap (void)
                           "which is not declared"),
                         comp->tag, tag);
                 comp_array_remove (i);
-                depmap_remove (depmap, i);
                 continue;
               }
             depmap_set (depmap, i, tgt);
@@ -497,10 +511,7 @@ component_build_depmap (void)
 
   for (i = 0; i < comp_count;)
     if (comp_array[i]->flags & CF_REMOVE)
-      {
-        comp_array_remove (i);
-        depmap_remove (depmap, i);
-      }
+      comp_array_remove (i);
     else
       i++;
 
@@ -528,22 +539,36 @@ component_config_commit (void)
     comp_array = grecs_realloc (comp_array, i * sizeof (comp_array[0]));
   comp_count = i;
 
-  /* Rearrange components, registering prog entries for the new ones */
-  for (comp = list->head, i = 0; comp; comp = comp->next, i++)
+  /* Rearrange components, registering entries for the new ones */
+  for (comp = list->head, i = 0; comp; )
     {
-      match = complist_find_match (prev, comp);
-      if (match)
+      struct component *next = comp->next;
+      if (loaded && comp->mode == pies_comp_startup)
         {
-          component_merge (match, comp);
-          component_unlink (match);
-          match->listidx = cur;
-          component_link (match, comp->prev);
+          /* Ignore startup components */
+          component_unlink (comp);
           component_free (comp);
-          comp = match;
         }
-      comp_array[i] = comp;
-      comp->arridx = i;
+      else
+        {
+          match = complist_find_match (prev, comp);
+          if (match)
+            {
+              component_merge (match, comp);
+              component_unlink (match);
+              match->listidx = cur;
+              component_link (match, comp->prev);
+              component_free (comp);
+              comp = match;
+            }
+          comp_array[i] = comp;
+          comp->arridx = i;
+          i++;
+        }
+      comp = next;
     }
+  /* Adjust comp_count */
+  comp_count = i;
 
   /* Mark orphaned progs for termination */
   list = &comp_list[prev];
@@ -560,6 +585,8 @@ component_config_commit (void)
   for (comp = comp_list[cur].head; comp; comp = comp->next)
     if (!comp->prog)
       register_prog (comp);
+
+  loaded = 1;
 }
 
 static int
diff --git a/src/pies.c b/src/pies.c
index 89c0b7e..98488a6 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -132,7 +132,7 @@ int
 config_file_remove (const char *name)
 {
   struct grecs_list_entry *ep;
-  
+
   for (ep = config_list->head; ep; ep = ep->next)
     {
       struct config_file *file = ep->data;
@@ -156,7 +156,7 @@ void
 config_file_list_serialize (struct json_value *ar)
 {
   struct grecs_list_entry *ep;
-  
+
   for (ep = config_list->head; ep; ep = ep->next)
     {
       struct config_file *file = ep->data;
@@ -327,7 +327,7 @@ action_free (struct action *act)
   free (act->addr);
   free (act->message);
   free (act->command);
-  
+
   free (act);
 }
 
@@ -359,7 +359,7 @@ create_action (struct component *comp,