chore: remove dead code and stale comments

- Drop dead Rooms/Room infrastructure and the rooms field on Context.
- Remove unused ActorMessage::Tick variant and the now-empty handler arm.
- Strip dead active-thread tracking machinery from ThreadPool (unused
  getters, _id/_active_threads/_total_threads parameters).
- Flatten ServerActor::initiate_connection: the duplicated retry block
  was a copy-paste retry against the same address with the same args
  and could never succeed where the first attempt failed.
- Delete commented-out print_hex2/decode debug stubs, dead test
  fixtures in login.rs and message_user.rs, the 47-line commented body
  of RoomListHandler, and assorted // TODO theater.
This commit is contained in:
michel
2026-04-26 17:20:45 +02:00
parent 574833bf61
commit 44846cdfa8
11 changed files with 43 additions and 380 deletions
-14
View File
@@ -56,8 +56,6 @@ impl<M: Send> ActorHandle<M> {
pub(crate) enum ActorMessage<M> {
UserMessage(M),
Stop,
#[allow(dead_code)]
Tick,
}
/// Actor system that manages actor lifecycle
@@ -134,21 +132,9 @@ impl ActorSystem {
);
break;
}
Ok(ActorMessage::Tick) => {
tick_count += 1;
trace!(
"[actor_system] Received explicit Tick message #{}",
tick_count
);
actor.tick();
}
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
if last_tick.elapsed() >= tick_interval {
tick_count += 1;
// if tick_count % 10 == 0 {
// trace!("[actor_system] Periodic tick #{} (every 1s log)", tick_count);
// }
actor.tick();
last_tick = Instant::now();
}
+30 -130
View File
@@ -53,26 +53,14 @@ impl std::fmt::Display for PeerAddress {
}
}
#[derive(Debug)]
#[derive(Debug, Default)]
pub struct Context {
pub logged_in: Option<bool>,
#[allow(dead_code)]
rooms: Rooms,
}
impl Default for Context {
fn default() -> Self {
Self::new()
}
}
impl Context {
pub fn new() -> Self {
Self {
#[allow(dead_code)]
rooms: Rooms::new(),
logged_in: Option::None,
}
Self::default()
}
}
#[derive(Debug, Clone)]
@@ -111,72 +99,6 @@ impl UserMessage {
}
}
#[allow(dead_code)]
#[derive(Debug)]
pub struct Rooms {
pub public_rooms: Vec<Room>,
pub owned_private_rooms: Vec<Room>,
pub private_rooms: Vec<Room>,
pub operated_private_rooms: Vec<Room>,
}
impl Rooms {
fn new() -> Self {
Self {
public_rooms: Vec::new(),
owned_private_rooms: Vec::new(),
private_rooms: Vec::new(),
operated_private_rooms: Vec::new(),
}
}
#[allow(dead_code)]
pub fn print(&self) {
info!("Public rooms ({}):", self.public_rooms.len());
for room in &self.public_rooms {
room.print();
}
info!("Owned private rooms ({}):", self.owned_private_rooms.len());
for room in &self.owned_private_rooms {
room.print();
}
info!("Private rooms ({}):", self.private_rooms.len());
for room in &self.private_rooms {
room.print();
}
info!(
"Operated private rooms ({}):",
self.operated_private_rooms.len()
);
for room in &self.operated_private_rooms {
room.print();
}
}
}
#[derive(Debug)]
pub struct Room {
name: String,
number_of_users: i32,
}
impl Room {
#[allow(dead_code)]
pub fn new(name: String, number_of_users: i32) -> Self {
Self {
name,
number_of_users,
}
}
#[allow(dead_code)]
pub fn set_number_of_users(&mut self, number_of_users: i32) {
self.number_of_users = number_of_users;
}
pub fn print(&self) {
debug!(
"Room: {}, Number of users: {}",
self.name, self.number_of_users
);
}
}
#[derive(Debug, Clone)]
pub enum ServerMessage {
ProcessRead,
@@ -273,59 +195,37 @@ impl ServerActor {
let socket_addr = socket_addrs.next();
match socket_addr {
Some(addr) => {
if let Ok(stream) = TcpStream::connect(addr) {
if let Err(e) = stream.set_nonblocking(true) {
error!("[server] Failed to set non-blocking: {}", e);
self.disconnect_with_error(e);
return false;
}
let Some(addr) = socket_addr else {
let error_msg =
format!("No socket addresses found for {}:{}", host, port);
error!("[server] {}", error_msg);
self.disconnect_with_error(io::Error::new(
io::ErrorKind::InvalidInput,
error_msg,
));
return false;
};
stream.set_nodelay(true).ok();
let stream = match TcpStream::connect(addr) {
Ok(s) => s,
Err(e) => {
self.disconnect_with_error(e);
return false;
}
};
self.stream = Some(stream);
self.connection_state = ConnectionState::Connecting {
since: Instant::now(),
};
true
} else {
match TcpStream::connect(addr) {
Ok(stream) => {
if let Err(e) = stream.set_nonblocking(true) {
error!(
"[server] Failed to set non-blocking: {}",
e
);
self.disconnect_with_error(e);
return false;
}
stream.set_nodelay(true).ok();
self.stream = Some(stream);
self.connection_state =
ConnectionState::Connecting {
since: Instant::now(),
};
true
}
Err(e) => {
self.disconnect_with_error(e);
false
}
}
}
}
None => {
let error_msg =
format!("No socket addresses found for {}:{}", host, port);
error!("[server] {}", error_msg);
self.disconnect_with_error(io::Error::new(
io::ErrorKind::InvalidInput,
error_msg,
));
false
}
if let Err(e) = stream.set_nonblocking(true) {
error!("[server] Failed to set non-blocking: {}", e);
self.disconnect_with_error(e);
return false;
}
stream.set_nodelay(true).ok();
self.stream = Some(stream);
self.connection_state = ConnectionState::Connecting {
since: Instant::now(),
};
true
}
pub fn set_self_handle(&mut self, handle: ActorHandle<ServerMessage>) {