Skip to content
Snippets Groups Projects
Verified Commit f29bb7dd authored by Yaroslav Dynnikov's avatar Yaroslav Dynnikov
Browse files

chore: rename var supervisor_ipc -> to_supervisor

parent 5445fe88
No related branches found
No related tags found
1 merge request!71Fair raft join
...@@ -177,9 +177,9 @@ enum Entrypoint { ...@@ -177,9 +177,9 @@ enum Entrypoint {
} }
impl Entrypoint { impl Entrypoint {
fn exec(self, supervisor_ipc: ipc::Sender<IpcMessage>, args: args::Run) { fn exec(self, to_supervisor: ipc::Sender<IpcMessage>, args: args::Run) {
match self { match self {
Self::StartDiscover => start_discover(supervisor_ipc, &args), Self::StartDiscover => start_discover(to_supervisor, &args),
Self::StartJoin { leader_address } => start_join(&args, leader_address), Self::StartJoin { leader_address } => start_join(&args, leader_address),
} }
} }
...@@ -227,8 +227,8 @@ fn main_run(args: args::Run) -> ExitStatus { ...@@ -227,8 +227,8 @@ fn main_run(args: args::Run) -> ExitStatus {
extern "C" fn trampoline(data: *mut libc::c_void) { extern "C" fn trampoline(data: *mut libc::c_void) {
// let args = unsafe { Box::from_raw(data as _) }; // let args = unsafe { Box::from_raw(data as _) };
let argbox = unsafe { Box::<TrampolineArgs>::from_raw(data as _) }; let argbox = unsafe { Box::<TrampolineArgs>::from_raw(data as _) };
let (entrypoint, supervisor_ipc, args) = *argbox; let (entrypoint, to_supervisor, args) = *argbox;
entrypoint.exec(supervisor_ipc, args); entrypoint.exec(to_supervisor, args);
} }
// `argv` is a vec of pointers to data owned by `tt_args`, so // `argv` is a vec of pointers to data owned by `tt_args`, so
...@@ -283,7 +283,7 @@ fn main_run(args: args::Run) -> ExitStatus { ...@@ -283,7 +283,7 @@ fn main_run(args: args::Run) -> ExitStatus {
} }
} }
fn start_discover(supervisor_ipc: ipc::Sender<IpcMessage>, args: &args::Run) { fn start_discover(to_supervisor: ipc::Sender<IpcMessage>, args: &args::Run) {
tlog!(Info, ">>>>> start_discover()"); tlog!(Info, ">>>>> start_discover()");
picolib_setup(args); picolib_setup(args);
...@@ -333,7 +333,7 @@ fn start_discover(supervisor_ipc: ipc::Sender<IpcMessage>, args: &args::Run) { ...@@ -333,7 +333,7 @@ fn start_discover(supervisor_ipc: ipc::Sender<IpcMessage>, args: &args::Run) {
next_entrypoint, next_entrypoint,
drop_db: true, drop_db: true,
}; };
supervisor_ipc.send(&msg); to_supervisor.send(&msg);
std::process::exit(0); std::process::exit(0);
} }
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment