Made ROOT_SPV private and added a "root_supervisor" to System.

bastion-rs · Nov 9, 2019 · ad5e847 · ad5e847
1 parent fc89463
commit ad5e847
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bastion/src/bastion.rs b/bastion/src/bastion.rs
@@ -2,7 +2,7 @@ use crate::broadcast::{Broadcast, Parent};
 use crate::children::{Children, ChildrenRef};
 use crate::message::{BastionMessage, Message};
 use crate::supervisor::{Supervisor, SupervisorRef};
-use crate::system::{ROOT_SPV, SYSTEM, SYSTEM_SENDER};
+use crate::system::{System, SYSTEM, SYSTEM_SENDER};
 use std::fmt::{self, Debug, Formatter};
 use std::thread;
 
@@ -266,7 +266,7 @@ impl Bastion {
         C: FnOnce(Children) -> Children,
     {
         // FIXME: unsafe?
-        if let Some(supervisor) = unsafe { &ROOT_SPV } {
+        if let Some(supervisor) = System::root_supervisor() {
             supervisor.children(init)
         } else {
             // TODO: Err(Error)

diff --git a/bastion/src/system.rs b/bastion/src/system.rs
@@ -13,7 +13,7 @@ use qutex::Qutex;
 use std::cell::RefCell;
 use std::task::Poll;
 
-pub(crate) static mut ROOT_SPV: Option<SupervisorRef> = None;
+static mut ROOT_SPV: Option<SupervisorRef> = None;
 
 lazy_static! {
     pub(crate) static ref SYSTEM: Qutex<Option<RecoverableHandle<()>>> = Qutex::new(None);
@@ -75,6 +75,10 @@ impl System {
         sender
     }
 
+    pub(crate) fn root_supervisor() -> Option<&'static SupervisorRef> {
+        unsafe { ROOT_SPV.as_ref() }
+    }
+
     // TODO: set a limit?
     async fn recover(&mut self, mut supervisor: Supervisor) {
         let parent = Parent::system();