CSY/reowolf Changeset - 526b221270eb · Centrum Wiskunde & Informatica (CWI)

Changeset - 526b221270eb

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Christopher Esterhuyse - 5 years ago 2020-07-23 15:39:51
christopher.esterhuyse@gmail.com

tightened visibility. cleaned up and simplified UDP mediator components

1 file changed with 11 insertions and 11 deletions:

src/ffi/pseudo_socket_api.rs

0 comments (0 inline, 0 general)

src/ffi/pseudo_socket_api.rs

➞

Show inline comments

 use super::*;
 use libc::{sockaddr, socklen_t};
 use std::{
     collections::HashMap,
     ffi::c_void,
     net::SocketAddr,
     os::raw::c_int,
     sync::RwLock,
 };
 use std::{collections::HashMap, ffi::c_void, net::SocketAddr, os::raw::c_int, sync::RwLock};
 ///////////////////////////////////////////////////////////////////
 struct FdAllocator {
     next: Option<c_int>,
     freed: Vec<c_int>,
+}
 enum ConnectorComplex {
     Setup {
         local: Option<SocketAddr>,
         peer: Option<SocketAddr>,
     },
     Communication {
         // Invariant: connector in communication state; native has this putter and getter only.
         connector: Connector,
         putter: PortId,
         getter: PortId,
     },
+}
 #[derive(Default)]
 struct CcMap {
     fd_to_cc: HashMap<c_int, RwLock<ConnectorComplex>>,
     fd_allocator: FdAllocator,
+}
 ///////////////////////////////////////////////////////////////////
 unsafe fn payload_from_raw(bytes_ptr: *const c_void, bytes_len: usize) -> Payload {
@@ @@ -60,27 +55,32 @@ impl FdAllocator { @@
+    }
     fn free(&mut self, fd: c_int) {
         self.freed.push(fd);
+    }
+}
 lazy_static::lazy_static! {
     static ref CC_MAP: RwLock<CcMap> = Default::default();
+}
 impl ConnectorComplex {
     fn try_become_connected(&mut self) {
         match self {
             ConnectorComplex::Setup { local: Some(local), peer: Some(peer) } => {
                 // setup complete
                 let mut connector = Connector::new(Box::new(crate::DummyLogger), crate::TRIVIAL_PD.clone(), Connector::random_id());
                 // complete setup
                 let mut connector = Connector::new(
                     Box::new(crate::DummyLogger),
                     crate::TRIVIAL_PD.clone(),
                     Connector::random_id(),
                 );
                 let [putter, getter] = connector.new_udp_mediator_component(*local, *peer).unwrap();
                 connector.connect(None).unwrap();
                 *self = ConnectorComplex::Communication { connector, putter, getter }
+            }
             _ => {} // setup incomplete
+        }
+    }
+}
 /////////////////////////////////
 #[no_mangle]
 pub extern "C" fn rw_socket(_domain: c_int, _type: c_int) -> c_int {
     // ignoring domain and type
     // get writer lock
     let mut w = if let Ok(w) = CC_MAP.write() { w } else { return LOCK_POISONED };
 pub unsafe extern "C" fn rw_bind(fd: c_int, addr: *const sockaddr, addr_len: socklen_t) -> c_int {
     // assuming _domain is AF_INET and _type is SOCK_DGRAM
     let addr = match libc_to_std_sockaddr(addr, addr_len) {
         Some(addr) => addr,
         _ => return BAD_SOCKADDR,
     };
     // get outer reader, inner writer locks
     let r = if let Ok(r) = CC_MAP.read() { r } else { return LOCK_POISONED };
     let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return BAD_FD };
     let mut cc = if let Ok(cc) = cc.write() { cc } else { return LOCK_POISONED };
     let cc: &mut ConnectorComplex = &mut cc;
     match cc {
         ConnectorComplex::Communication { ..} => WRONG_STATE,
+        ConnectorComplex::Communication { .. } => WRONG_STATE,
         ConnectorComplex::Setup { local, .. } => {
             *local = Some(addr);
             cc.try_become_connected();
             ERR_OK
+        }
+    }
+}
 #[no_mangle]
 pub unsafe extern "C" fn rw_connect(
     fd: c_int,
     addr: *const sockaddr,
     addr_len: socklen_t,
@@ @@ -187,13 +187,13 @@ pub unsafe extern "C" fn rw_recv( @@
         ConnectorComplex::Setup { .. } => WRONG_STATE as isize,
         ConnectorComplex::Communication { connector, getter, .. } => {
             connector.get(*getter).unwrap();
             connector.sync(None).unwrap();
             let slice = connector.gotten(*getter).unwrap().as_slice();
             if !bytes_ptr.is_null() {
                 let cpy_msg_bytes = slice.len().min(bytes_len);
                 std::ptr::copy_nonoverlapping(slice.as_ptr(), bytes_ptr as *mut u8, cpy_msg_bytes);
+            }
             slice.len() as isize
+        }
+    }
+}
@@ \ No newline at end of file @@
+}

0 comments (0 inline, 0 general)