trafficlunar/computer-statistics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: keys and clicks not counting correctly

Browse source
This commit is contained in:
trafficlunar 2025-03-22 13:50:37 +00:00
parent cff4c435d2
commit c7c2a10f59
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/computer.rs
View file

@ -1,6 +1,9 @@
use std::{ use std::{
net::TcpStream, net::TcpStream,
sync::{Arc, Mutex}, sync::{
atomic::{AtomicU16, Ordering},
Arc,
},
thread, thread,
time::Duration, time::Duration,
}; };
@ -14,22 +17,20 @@ use crate::websocket;
pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) { pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) {
let mut sys = System::new(); let mut sys = System::new();
let key_counter = Arc::new(Mutex::new(0_u16)); let key_counter = Arc::new(AtomicU16::new(0));
let click_counter = Arc::new(Mutex::new(0_u16)); let click_counter = Arc::new(AtomicU16::new(0));
let key_counter_clone = Arc::clone(&key_counter); let key_counter_clone = Arc::clone(&key_counter);
let click_counter_clone = Arc::clone(&click_counter); let click_counter_clone = Arc::clone(&click_counter);
thread::spawn(move || { thread::spawn(move || {
KeybdKey::bind_all(move |_| { KeybdKey::bind_all(move |_| {
let mut count = key_counter_clone.lock().unwrap(); key_counter_clone.fetch_add(1, Ordering::SeqCst);
*count += 1;
}); });
MouseButton::bind_all(move |event| match event { MouseButton::bind_all(move |event| match event {
MouseButton::LeftButton | MouseButton::RightButton => { MouseButton::LeftButton | MouseButton::RightButton => {
let mut count = click_counter_clone.lock().unwrap(); click_counter_clone.fetch_add(1, Ordering::SeqCst);
*count += 1;
} }
_ => {} _ => {}
}); });
@ -47,17 +48,14 @@ pub fn start_sending(socket: &mut WebSocket<MaybeTlsStream<TcpStream>>) {
let used_memory = sys.used_memory(); let used_memory = sys.used_memory();
let memory_usage = ((used_memory as f64) / (total_memory as f64) * 100.0).floor() as u8; let memory_usage = ((used_memory as f64) / (total_memory as f64) * 100.0).floor() as u8;
let mut key_guard = key_counter.lock().unwrap(); let key_presses = key_counter.load(Ordering::SeqCst);
let key_presses = *key_guard; let clicks = click_counter.load(Ordering::SeqCst);
let mut click_guard = click_counter.lock().unwrap();
let clicks = *click_guard;
websocket::send(socket, cpu_usage, memory_usage, key_presses, clicks); websocket::send(socket, cpu_usage, memory_usage, key_presses, clicks);
// Reset counters after sending // Reset counters after sending
*key_guard = 0; key_counter.store(0, Ordering::SeqCst);
*click_guard = 0; click_counter.store(0, Ordering::SeqCst);
thread::sleep(Duration::from_secs(60)); thread::sleep(Duration::from_secs(60));
} }