CSY/reowolf Changeset - 70e2e44574a6 · Centrum Wiskunde & Informatica (CWI)

Changeset - 70e2e44574a6

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Christopher Esterhuyse - 5 years ago 2020-07-24 09:11:36
christopher.esterhuyse@gmail.com

added minor util + doc comments to connector API

3 files changed with 18 insertions and 7 deletions:

Cargo.toml

src/ffi/pseudo_socket_api.rs

src/runtime/mod.rs

0 comments (0 inline, 0 general)

Cargo.toml

➞

Show inline comments

@@ @@ -41,7 +41,7 @@ lazy_static = "1.4.0" @@
 crate-type = ["cdylib"]
 [features]
-default = ["ffi", "session_optimization", "ffi_pseudo_socket_api"]
 default = ["ffi", "session_optimization"]
 ffi = [] # see src/ffi/mod.rs
 ffi_pseudo_socket_api = ["ffi", "libc", "os_socketaddr"]# see src/ffi/pseudo_socket_api.rs
 endpoint_logging = [] # see src/macros.rs

src/ffi/pseudo_socket_api.rs

➞

Show inline comments

 use super::*;
 use libc::{sockaddr, socklen_t};
 use core::ops::DerefMut;
 use libc::{sockaddr, socklen_t};
 use std::{collections::HashMap, ffi::c_void, net::SocketAddr, os::raw::c_int, sync::RwLock};
 ///////////////////////////////////////////////////////////////////
@@ @@ -14,6 +14,7 @@ enum ConnectorComplexPhased { @@
     Communication { putter: PortId, getter: PortId },
+}
 struct ConnectorComplex {
     // invariant: .connector.phased and .phased are variants Setup/Communication in lockstep.
     connector: Connector,
     phased: ConnectorComplexPhased,
+}
+}
 impl Default for FdAllocator {
     fn default() -> Self {
         Self {
             next: Some(0), // positive values used only
             freed: vec![],
+        }
         // negative FDs aren't used s.t. they are available for error signalling
         Self { next: Some(0), freed: vec![] }
+    }
+}
 impl FdAllocator {
@@ @@ -62,7 +61,8 @@ impl ConnectorComplex { @@
         match self.phased {
             ConnectorComplexPhased::Setup { local: Some(local), peer: Some(peer) } => {
                 // complete setup
                 let [putter, getter] = self.connector.new_udp_mediator_component(local, peer).unwrap();
                 let [putter, getter] =
                     self.connector.new_udp_mediator_component(local, peer).unwrap();
                 self.connector.connect(None).unwrap();
                 self.phased = ConnectorComplexPhased::Communication { putter, getter }
+            }

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -379,6 +379,17 @@ impl Drop for Connector { @@
+    }
+}
 impl Connector {
     pub fn is_connected(&self) -> bool {
         // If designed for Rust usage, connectors would be exposed as an enum type from the start.
         // consequently, this "phased" business would also include connector variants and this would
         // get a lot closer to the connector impl. itself.
         // Instead, the C-oriented implementation doesn't distinguish connector states as types,
         // and distinguish them as enum variants instead
         match self.phased {
             ConnectorPhased::Setup(..) => false,
             ConnectorPhased::Communication(..) => true,
+        }
+    }
     pub(crate) fn random_id() -> ConnectorId {
         type Bytes8 = [u8; std::mem::size_of::<ConnectorId>()];
         unsafe {

0 comments (0 inline, 0 general)