Nickiel/church_controller_rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added comments and has closed flag

Browse source
This commit is contained in:
Nickiel12 2021-12-29 22:37:34 -08:00
parent f88f186fb1
commit 8c5dd57fac
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/modules/socket_handler.rs
View file

@ -10,6 +10,7 @@ pub struct Socket{
socket_txs: Arc<Mutex<Vec<Arc<TcpStream>>>>, socket_txs: Arc<Mutex<Vec<Arc<TcpStream>>>>,
stop_listener_flag: sync_flag::SyncFlagTx, stop_listener_flag: sync_flag::SyncFlagTx,
handle_connections_join_handle: Option<JoinHandle<()>>, handle_connections_join_handle: Option<JoinHandle<()>>,
pub has_closed: workctl::sync_flag::SyncFlagRx,
} }
impl Socket { impl Socket {
@ -19,6 +20,7 @@ impl Socket {
} }
pub fn handle_connections(listener: TcpListener, messenger_tx: Sender<String>) -> Self { pub fn handle_connections(listener: TcpListener, messenger_tx: Sender<String>) -> Self {
let (mut has_closed_tx, has_closed_rx) = sync_flag::new_syncflag(false);
let (tx, thread_stop_flag) = sync_flag::new_syncflag(true); let (tx, thread_stop_flag) = sync_flag::new_syncflag(true);
let socket_streams = Arc::new(Mutex::new(vec![])); let socket_streams = Arc::new(Mutex::new(vec![]));
@ -27,23 +29,28 @@ impl Socket {
listener.set_nonblocking(true).unwrap(); listener.set_nonblocking(true).unwrap();
while thread_stop_flag.get() { while thread_stop_flag.get() {
for (strm, _addr) in listener.accept() { for (strm, _addr) in listener.accept() {
//create thread-passable pointer of current socket stream
let stream = Arc::new(strm); let stream = Arc::new(strm);
//get lock on list of thread-passable pointers
let mut streams = thread_owned_streams.lock().unwrap(); let mut streams = thread_owned_streams.lock().unwrap();
streams.push(Arc::clone(&stream)); streams.push(Arc::clone(&stream));
Socket::handle_client(stream.as_ref(), messenger_tx.clone(), thread_stop_flag.clone()); //pass off a clone of the thread-passable pointer
Socket::handle_client(stream.as_ref(), messenger_tx.clone(), thread_stop_flag.clone(), Arc::clone(&thread_owned_streams));
} }
thread::sleep(Duration::from_millis(100)); thread::sleep(Duration::from_millis(100));
} }
has_closed_tx.set(true);
drop(listener); drop(listener);
}); });
Socket { Socket {
socket_txs: socket_streams, socket_txs: socket_streams,
stop_listener_flag: tx, stop_listener_flag: tx,
handle_connections_join_handle: Some(handle), handle_connections_join_handle: Some(handle),
has_closed: has_closed_rx
} }
} }
pub fn handle_client(mut stream: &TcpStream, update_tx: Sender<String>, program_shutdown_flag: sync_flag::SyncFlagRx) { pub fn handle_client(mut stream: &TcpStream, update_tx: Sender<String>, program_shutdown_flag: sync_flag::SyncFlagRx, thread_owned_streams: Arc<Mutex<Vec<Arc<TcpStream>>>>) {
let mut buffer = [0; 1024]; let mut buffer = [0; 1024];
stream.set_read_timeout(Some(Duration::from_millis(100))).expect("Could not set a read timeout"); stream.set_read_timeout(Some(Duration::from_millis(100))).expect("Could not set a read timeout");
while program_shutdown_flag.get() { while program_shutdown_flag.get() {