loopd: heartbeat tick on the background slot

Co-Authored-By: ornith-1.5-35b-a3b <agent@wntrmute.dev>
This commit is contained in:
2026-10-03 16:48:23 -07:00
co-authored by ornith-1.5-35b-a3b
parent 4dd3b87db3
commit ea0708e305
7 changed files with 377 additions and 1 deletions
+17 -1
View File
@@ -47,16 +47,32 @@ impl Context {
busy: Mutex::new(HashSet::new()),
}
}
/// Mark `id` busy. `Err(Busy)` if it already is. Tests and the scheduler use this so a skip
/// is not a sleep (T27).
pub fn hold(&self, id: SessionId) -> Result<Held<'_>, Busy> {
let mut busy = self.busy.lock().unwrap_or_else(|p| p.into_inner());
if busy.contains(&id) {
return Err(Busy);
}
busy.insert(id.clone());
drop(busy);
Ok(Held { ctx: self, id })
}
}
/// While a turn runs, the session is in the busy set. The guard holds only an immutable borrow of
/// the context and a clone of the id, never the lock, so another connection can still check
/// membership while this turn is slow. The id is removed when the guard drops.
struct Held<'a> {
pub struct Held<'a> {
ctx: &'a Context,
id: SessionId,
}
/// The session is already in the busy set.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct Busy;
impl Drop for Held<'_> {
fn drop(&mut self) {
let mut busy = self.ctx.busy.lock().unwrap_or_else(|p| p.into_inner());
+1
View File
@@ -10,6 +10,7 @@ pub mod http;
pub mod jobs;
pub mod llama;
pub mod memory;
pub mod scheduler;
pub mod selftest;
pub mod session;
pub mod socket;
+11
View File
@@ -151,6 +151,17 @@ fn run_serve(path: &Path) -> ExitCode {
let memory = Box::new(MemoryPort::new(cfg.memory_socket(), MEMORY_WAIT));
let ctx = Arc::new(Context::new(cfg, client, port, Registry::m5c(), memory));
// A heartbeat on the background slot, independent of the channel (M5b spec, section 4).
let ctx_sched = Arc::clone(&ctx);
std::thread::spawn(move || {
let mut sched = loopd::scheduler::Scheduler::new(bxcore::Timestamp::now());
loop {
sched.tick(&ctx_sched, bxcore::Timestamp::now());
std::thread::sleep(std::time::Duration::from_secs(1));
}
});
if let Err(e) = channel::serve(listener, ctx) {
eprintln!("loopd: the channel server stopped: {e}");
return ExitCode::from(1);
+176
View File
@@ -0,0 +1,176 @@
//! Isolated heartbeat (and, from task 07, cron) turns (M5b spec, section 4).
use crate::baseline::Baseline;
use crate::channel::{Busy, Context};
use crate::compact;
use crate::jobs::{self, Run, RunStatus};
use crate::session::{Session, SessionError};
use crate::turn::{Runtime, run_turn};
use bxcore::{SessionId, Timestamp, TurnEvent};
use std::fs;
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum TickWork {
Heartbeat,
SkippedBusy { session: SessionId },
HeartbeatUnreadable,
Job { name: String, session: SessionId },
SkippedJob { name: String },
}
pub struct Scheduler {
started: Timestamp,
last_heartbeat: Option<Timestamp>,
leftovers_closed: bool,
heartbeat_unreadable_logged: bool,
}
impl Scheduler {
pub fn new(started: Timestamp) -> Scheduler {
Scheduler {
started,
last_heartbeat: None,
leftovers_closed: false,
heartbeat_unreadable_logged: false,
}
}
pub fn tick(&mut self, ctx: &Context, now: Timestamp) -> Vec<TickWork> {
let mut work = Vec::new();
if !self.leftovers_closed {
close_idle_leftovers(ctx, now);
self.leftovers_closed = true;
}
self.heartbeat(ctx, now, &mut work);
work
}
fn heartbeat(&mut self, ctx: &Context, now: Timestamp, work: &mut Vec<TickWork>) {
if ctx.cfg.heartbeat.every_s == 0 {
return;
}
let last = self.last_heartbeat.unwrap_or(self.started);
let due = now.unix_millis().saturating_sub(last.unix_millis())
>= ctx.cfg.heartbeat.every_s.saturating_mul(1000);
if !due {
return;
}
let id = match SessionId::new("heartbeat") {
Ok(id) => id,
Err(_) => return,
};
let prompt = ctx.cfg.heartbeat_prompt();
let file = match fs::read_to_string(&prompt) {
Ok(file) => file,
Err(e) => {
if !self.heartbeat_unreadable_logged {
eprintln!(
"loopd: {}: {e}; see docs/runbook.md#heartbeat-prompt-unreadable",
prompt.display()
);
self.heartbeat_unreadable_logged = true;
}
work.push(TickWork::HeartbeatUnreadable);
return;
}
};
let held = match ctx.hold(id.clone()) {
Ok(held) => held,
Err(Busy) => {
work.push(TickWork::SkippedBusy { session: id });
return;
}
};
let mut session = match Session::open(&ctx.cfg.paths.home, id.clone()) {
Ok(session) => session,
Err(SessionError::NotFound(_)) => {
let baseline = match Baseline::assemble(&ctx.cfg, &ctx.registry) {
Ok(baseline) => baseline,
Err(e) => {
eprintln!("loopd: heartbeat baseline: {e}");
return;
}
};
match Session::create(
&ctx.cfg.paths.home,
id.clone(),
baseline,
ctx.cfg.slots.background,
) {
Ok(session) => session,
Err(e) => {
eprintln!("loopd: heartbeat session {}: {e}", id.as_str());
return;
}
}
}
Err(e) => {
eprintln!("loopd: heartbeat session {}: {e}", id.as_str());
return;
}
};
let runtime = Runtime {
cfg: &ctx.cfg,
client: &ctx.client,
port: &*ctx.port,
registry: &ctx.registry,
};
let text = format!("It is {}.\n\n{file}", now.to_rfc3339());
let mut emit = |_event: &TurnEvent| {};
let outcome = run_turn(&mut session, &runtime, &text, None, &mut emit);
let outcome = compact::finish_turn(
&mut session,
&runtime,
&*ctx.memory,
&text,
None,
&mut emit,
outcome,
);
if outcome.is_ok() {
self.last_heartbeat = Some(now);
work.push(TickWork::Heartbeat);
}
drop(held);
}
}
fn close_idle_leftovers(ctx: &Context, now: Timestamp) {
let jobs_dir = ctx.cfg.paths.home.join("jobs");
let runs_path = jobs_dir.join("runs.jsonl");
let jobs = match jobs::load(&jobs_dir) {
Ok(jobs) => jobs,
Err(e) => {
eprintln!("loopd: cannot read the jobs: {e}");
return;
}
};
for job in &jobs {
let session = match jobs::live_session(&runs_path, &job.name) {
Ok(Some(session)) => session,
Ok(None) => continue,
Err(e) => {
eprintln!("loopd: cannot read the live session for {}: {e}", job.name);
continue;
}
};
if let Ok(held) = ctx.hold(session.clone()) {
drop(held);
let _ = jobs::append(
&runs_path,
&Run {
time: now,
name: job.name.clone(),
session,
status: RunStatus::Failed,
},
);
}
}
}