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
+1 -1
View File
@@ -361,7 +361,7 @@ fn compute_md5_digest(mut v: Vec<u8>) -> String {
*/
fn bit_padding(input: &str) -> Vec<u8> {
let mut input_vector: Vec<u8> = convert_str_to_vec(input);
let bit_length: u64 = (input.len() as u64) * 8u64; // todo - add support for > 2^64 bit size
let bit_length: u64 = (input.len() as u64) * 8u64;
// 128_u8 is the equivalent of padding 1 as an unsigned 8-bit integer
// with lower-order bits first
+5 -58
View File
@@ -1,4 +1,3 @@
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::{Arc, Mutex, mpsc};
use std::thread;
@@ -14,7 +13,6 @@ enum Message {
pub struct ThreadPool {
workers: Vec<Worker>,
sender: Option<mpsc::Sender<Message>>,
active_threads: Arc<AtomicUsize>,
}
impl ThreadPool {
@@ -23,22 +21,15 @@ impl ThreadPool {
let (sender, receiver) = mpsc::channel();
let receiver = Arc::new(Mutex::new(receiver));
let active_threads = Arc::new(AtomicUsize::new(0));
let mut workers = Vec::with_capacity(size);
for id in 0..size {
workers.push(Worker::new(
id,
Arc::clone(&receiver),
Arc::clone(&active_threads),
size,
));
for _ in 0..size {
workers.push(Worker::new(Arc::clone(&receiver)));
}
ThreadPool {
workers,
sender: Some(sender),
active_threads,
}
}
@@ -51,26 +42,16 @@ impl ThreadPool {
sender.send(Message::NewJob(job)).unwrap();
}
}
pub fn thread_count(&self) -> usize {
self.workers.len()
}
pub fn active_thread_count(&self) -> usize {
self.active_threads.load(Ordering::SeqCst)
}
}
impl Drop for ThreadPool {
fn drop(&mut self) {
// Send termination message to all workers
if let Some(sender) = self.sender.take() {
for _ in &self.workers {
sender.send(Message::Terminate).unwrap();
}
}
// Wait for all workers to finish
for worker in &mut self.workers {
if let Some(thread) = worker.thread.take() {
thread.join().unwrap();
@@ -80,17 +61,11 @@ impl Drop for ThreadPool {
}
struct Worker {
_id: usize,
thread: Option<thread::JoinHandle<()>>,
}
impl Worker {
fn new(
id: usize,
receiver: Arc<Mutex<mpsc::Receiver<Message>>>,
_active_threads: Arc<AtomicUsize>,
_total_threads: usize,
) -> Worker {
fn new(receiver: Arc<Mutex<mpsc::Receiver<Message>>>) -> Worker {
let thread = thread::spawn(move || {
loop {
let message = match receiver.lock_safe() {
@@ -98,41 +73,13 @@ impl Worker {
Err(_) => break,
};
match message {
Ok(Message::NewJob(job)) => {
// let active =
// active_threads.fetch_add(1, Ordering::SeqCst) + 1;
// trace!(
// "Thread {} started job (active: {}/{})",
// id,
// active,
// total_threads
// );
job();
// let active =
// active_threads.fetch_sub(1, Ordering::SeqCst) - 1;
// trace!(
// "Thread {} finished job (active: {}/{})",
// id,
// active,
// total_threads
// );
}
Ok(Message::Terminate) => {
// Received termination signal
break;
}
Err(_) => {
// Channel disconnected
break;
}
Ok(Message::NewJob(job)) => job(),
Ok(Message::Terminate) | Err(_) => break,
}
}
});
Worker {
_id: id,
thread: Some(thread),
}
}