Don't remove finished startup components. Just mark them with status_finished.

* src/ctl.c (pies_comp_mode_str): Add pies_comp_startup
and pies_comp_shutdown.
* src/piesctl.c (mode_trans): Likewise.
* src/progman.c (progman_startup_phase): Test the status of
pies_comp_startup components.
(progman_waiting_p): Test status instead of pid>0 to select running
components.
(progman_cleanup): Set status of the finished startup
component to status_finished, instead of removing it.
* src/comp.c (loaded): Remove unused variable.
(component_config_commit): Remove special handling for pies_comp_startup.

1 files changed, 10 insertions, 31 deletions

diff --git a/src/comp.c b/src/comp.c
index 2346306..25f2657 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -25,9 +25,4 @@ struct complist
 };
 
-/* 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;
@@ -541,33 +536,19 @@ component_config_commit (void)
 
   /* Rearrange components, registering entries for the new ones */
-  for (comp = list->head, i = 0; comp; )
+  for (comp = list->head, i = 0; comp; comp = comp->next, i++)
     {
-      struct component *next = comp->next;
-      if (loaded && comp->mode == pies_comp_startup)
+      match = complist_find_match (prev, comp);
+      if (match)
 	{
-	  /* Ignore startup components */
-	  component_unlink (comp);
+	  component_merge (match, comp);
+	  component_unlink (match);
+	  match->listidx = cur;
+	  component_link (match, comp->prev);
 	  component_free (comp);
+	  comp = match;
 	}
-      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;
+      comp_array[i] = comp;
+      comp->arridx = i;
     }
-  /* Adjust comp_count */
-  comp_count = i;
 
   /* Mark orphaned progs for termination */
@@ -586,6 +567,4 @@ component_config_commit (void)
     if (!comp->prog)
       register_prog (comp);
-
-  loaded = 1;
 }