Updated children group's run to poll children before getting new mess…

…ages and to be pending when its broadcast stream is, and fixed supervisors to update the id of supervised elements in the order list after resetting them and when using the one-for-one supervision strategy.

Signed-off-by: Matthieu Le brazidec <matthieu@lebrazidec.email>

bastion/src/children.rs

@@ -350,6 +350,10 @@ impl Children {
 
     async fn run(mut self) -> Self {
         loop {
+            for (_, launched) in self.launched.values_mut() {
+                let _ = poll!(launched);
+            }
+
             match poll!(&mut self.bcast.next()) {
                 // TODO: Err if started == true?
                 Poll::Ready(Some(BastionMessage::Start)) => {
@@ -382,11 +386,7 @@ impl Children {
 
                     return self;
                 }
-                Poll::Pending => (),
-            }
-
-            for (_, launched) in self.launched.values_mut() {
-                let _ = poll!(launched);
+                Poll::Pending => pending!(),
             }
         }
     }

bastion/src/supervisor.rs

@@ -562,7 +562,8 @@ impl Supervisor {
                 }
 
                 let launched = supervised.launch();
-                self.launched.insert(id, (order, launched));
+                self.launched.insert(id.clone(), (order, launched));
+                self.order[order] = id;
             }
             SupervisionStrategy::OneForAll => {
                 // TODO: stop or kill?