Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement internal runner

Browse source
This commit is contained in:
Joscha 2023-08-12 14:16:22 +02:00
parent d15d6588f7
commit 416e3e6aa1
7 changed files with 247 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/worker/server.rs
View file

@ -59,7 +59,7 @@ impl Server {
let name = self.name.clone();
async {
loop {
match self.ping().await {
match self.ping(&poke_tx).await {
Ok(()) => {}
Err(e) => warn!("Error talking to server:\n{e:?}"),
}
@ -82,12 +82,12 @@ impl Server {
while poke_rx.try_recv().is_ok() {}
}
async fn ping(&mut self) -> somehow::Result<()> {
async fn ping(&mut self, poke_tx: &mpsc::UnboundedSender<()>) -> somehow::Result<()> {
debug!("Pinging server");
let info = self.coordinator.lock().unwrap().active(&self.name);
if info.active {
self.ping_active(info).await?;
self.ping_active(info, poke_tx).await?;
} else {
self.ping_inactive(info).await?;
}
@ -106,7 +106,11 @@ impl Server {
Ok(())
}
async fn ping_active(&mut self, info: ActiveInfo) -> somehow::Result<()> {
async fn ping_active(
&mut self,
info: ActiveInfo,
poke_tx: &mpsc::UnboundedSender<()>,
) -> somehow::Result<()> {
let run = self
.run
.as_ref()
@ -166,7 +170,13 @@ impl Server {
self.run = Some((run.clone(), abort_tx));
self.coordinator.lock().unwrap().look_busy(&self.name);
tokio::spawn(run::run(run, abort_rx, work.bench));
tokio::spawn(run::run(
self.server_config,
poke_tx.clone(),
run,
work.bench,
abort_rx,
));
}
// Finally, advance to the next server if it makes sense to do so