From a594313b5f47531138b79795fdf72ae74776f1cf Mon Sep 17 00:00:00 2001 From: Scott Lawrence Date: Sat, 29 Jun 2024 10:35:42 -0700 Subject: Sending json-serialized state over socket. --- Cargo.lock | 24 ++++++++++++++++++++++++ Cargo.toml | 1 + src/main.rs | 25 +++++++++++++++++++++---- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7961e27..064dbdc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -109,6 +109,12 @@ version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + [[package]] name = "proc-macro2" version = "1.0.84" @@ -127,6 +133,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + [[package]] name = "serde" version = "1.0.203" @@ -147,6 +159,17 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_json" +version = "1.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +dependencies = [ + "itoa", + "ryu", + "serde", +] + [[package]] name = "strsim" version = "0.11.1" @@ -182,6 +205,7 @@ version = "0.1.0" dependencies = [ "clap", "serde", + "serde_json", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 118e87c..e503a55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,4 @@ edition = "2021" [dependencies] clap = { version = "4.5.4", features = ["derive"] } serde = { version = "1.0.203", features = ["derive"] } +serde_json = { version = "1.0" } diff --git a/src/main.rs b/src/main.rs index fb1165d..0282ec7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,6 @@ +use std::io::Write; use std::os::unix::net::{UnixStream,UnixListener}; -use std::sync::Mutex; +use std::sync::{Arc,Mutex}; use std::thread::{sleep,spawn}; use std::time::{Duration,Instant,SystemTime}; @@ -59,9 +60,25 @@ fn main() { let start = Instant::now(); let delay_ms: u64 = args.delay * 1000; let mut cycle: u64 = 0; - let state_mutex = Mutex::new(init_state()); - let listener = spawn(move || { - }); + let state_mutex = Arc::new(Mutex::new(init_state())); + let listen_thread = { + let state_mutex = Arc::clone(&state_mutex); + spawn(move || { + let listener = UnixListener::bind(args.socket).unwrap(); + loop { + match listener.accept() { + Ok((mut socket,accept)) => { + let json = { + let state = state_mutex.lock().unwrap(); + serde_json::to_string(&*state).unwrap() + }; + socket.write_all(json.as_bytes()).unwrap(); + }, + Err(e) => println!("error: {:?}", e) + } + } + }); + }; loop { cycle += 1; sleep(Duration::from_millis(cycle*delay_ms) - start.elapsed()); -- cgit v1.2.3-54-g00ecf