Compare commits

...

2 commits

Author SHA1 Message Date
a353c48d21 RustyLee: Streamlines system lifecycle and organ commands
Removes several `LifeState` variants, focusing on a more essential set of states for the core system.

Eliminates various `OrganCommand` protocols that are no longer needed, reducing the overall complexity of inter-organ communication.

Adjusts the `Brain`'s main loop to actively process organ messages, simplifying its core operational logic.
2026-03-14 07:41:19 +00:00
6ea909347b RustyLee: Enhances Brain's Dead state behaviour and logging
The Brain now actively rests when in the `Dead` lifecycle state, ensuring consistent idle behavior and continuous logging of its status.

Adds the `Display` trait implementation for `LifeState`, providing human-readable representations of lifecycle states for improved debugging output.
2026-03-14 06:15:23 +00:00
6 changed files with 49 additions and 29 deletions

View file

@ -1 +1 @@
150
151

View file

@ -1,8 +1,7 @@
use tracing::{debug, info};
use std::sync::mpsc::{Receiver, Sender};
use std::thread::JoinHandle;
use crate::lifecycle::{LifeState, LifecycleCommand, LifecycleCommandResponse, LifecycleReceipt};
use crate::lifecycle::LifeState::{Dying, Buried, Genisys};
use crate::lifecycle::LifeState::{Dying, Buried, Genisys, Dead};
use crate::organs::organ_factory::OrganFactory;
use crate::organs::organ_socket::OrganSocket;
use crate::protocols::{BrainMessage, OrganCommand, OrganCommandEnvelope};
@ -50,12 +49,16 @@ impl Brain {
self.request_heart_beat();
}
Self::rest()
while let Ok(message) = self.organ_rx.try_recv() {
}
self.rest();
}
}
fn rest() {
debug!("Brain is resting.");
fn rest(&self) {
debug!("Brain is {} and resting.", self.state);
std::thread::sleep(std::time::Duration::from_millis(200))
}
@ -86,12 +89,11 @@ impl Brain {
fn can_transition_lifecycle(&self, command: &LifecycleCommand) -> bool
{
if command.required_state == Buried || command.required_state == Dying {
return true
}
if self.state == LifeState::Dead && command.required_state == LifeState::Genisys {
if self.state == Dead && command.required_state == Genisys {
return true
}

View file

@ -1,20 +1,40 @@
use std::time::Instant;
use std::fmt;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum LifeState {
Dead,
Genisys,
Sleeping,
Wakening,
Awake,
DeepThought,
ActionFocused,
Flight,
Panic,
// Sleeping,
// Wakening,
// Awake,
// DeepThought,
// ActionFocused,
// Flight,
// Panic,
Dying,
Buried,
}
impl fmt::Display for LifeState {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let state_str = match self {
LifeState::Dead => "Dead",
LifeState::Genisys => "In Genesis",
// LifeState::Sleeping => "Sleeping",
// LifeState::Wakening => "Wakening",
// LifeState::Awake => "Fully Awake",
// LifeState::DeepThought => "In Deep Thought",
// LifeState::ActionFocused => "Action Focused",
// LifeState::Flight => "In Flight",
// LifeState::Panic => "PANIC!",
LifeState::Dying => "Dying",
LifeState::Buried => "Buried",
};
write!(f, "{}", state_str)
}
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum LifecycleCommandResponse {
Ok,

View file

@ -59,14 +59,12 @@ fn wait_for_death(tx: Sender<LifecycleCommand>, rx: Receiver<LifecycleReceipt>)
}
fn let_there_be_life(tx: &Sender<LifecycleCommand>, rx: &Receiver<LifecycleReceipt>) {
// 3. Command: Genisys
info!("God: Commanding Genisys...");
let _ = tx.send(LifecycleCommand {
required_state: LifeState::Genisys,
command_time: Instant::now(),
});
// Wait for Brain's "OK"
if let Ok(receipt) = rx.recv() {
info!("Brain: {:?}", receipt.response);
}

View file

@ -33,7 +33,7 @@ impl Heart {
match envelope.command {
OrganCommand::Beat(_) => {
if (self.ready_to_beat()) {
if self.ready_to_beat() {
self.beat();
}
}

View file

@ -2,18 +2,18 @@ use crate::coordinates::Point3D;
#[derive(Debug)]
pub enum OrganCommand {
Sleep,
Waken,
Pause,
Resume,
// Sleep,
// Waken,
// Pause,
// Resume,
Beat (u32),
ChangeSpeed (u32),
GoFaster(u32),
GoSlower(u32),
MoveTo {
relative_to_center: Point3D,
speed: u32
}
// ChangeSpeed (u32),
// GoFaster(u32),
// GoSlower(u32),
// MoveTo {
// relative_to_center: Point3D,
// speed: u32
// }
}
#[derive(Debug)]