Files
@ 44a98be4e4b4
Branch filter:
Location: CSY/reowolf/src/runtime/setup2.rs
44a98be4e4b4
11.2 KiB
application/rls-services+xml
beginning large overhaul: moving to globally-unique ports & port -> endpoint route mappings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | use crate::common::*;
use crate::runtime::*;
impl Connector {
pub fn new_simple(
proto_description: Arc<ProtocolDescription>,
controller_id: ControllerId,
) -> Self {
let logger = Box::new(StringLogger::new(controller_id));
let surplus_sockets = 8;
Self::new(logger, proto_description, controller_id, surplus_sockets)
}
pub fn new(
logger: Box<dyn Logger>,
proto_description: Arc<ProtocolDescription>,
controller_id: ControllerId,
surplus_sockets: u16,
) -> Self {
Self {
logger,
proto_description,
id_manager: IdManager::new(controller_id),
native_ports: Default::default(),
proto_components: Default::default(),
outp_to_inp: Default::default(),
inp_to_route: Default::default(),
phased: ConnectorPhased::Setup { endpoint_setups: Default::default(), surplus_sockets },
}
}
pub fn add_port_pair(&mut self) -> [PortId; 2] {
let o = self.id_manager.next_port();
let i = self.id_manager.next_port();
self.outp_to_inp.insert(o, i);
self.inp_to_route.insert(i, InpRoute::NativeComponent);
self.native_ports.insert(o);
self.native_ports.insert(i);
log!(self.logger, "Added port pair (out->in) {:?} -> {:?}", o, i);
[o, i]
}
pub fn add_net_port(&mut self, endpoint_setup: EndpointSetup) -> Result<PortId, ()> {
match &mut self.phased {
ConnectorPhased::Setup { endpoint_setups, .. } => {
let p = self.id_manager.next_port();
self.native_ports.insert(p);
log!(self.logger, "Added net port {:?} with info {:?} ", p, &endpoint_setup);
endpoint_setups.push((p, endpoint_setup));
Ok(p)
}
ConnectorPhased::Communication { .. } => Err(()),
}
}
fn check_polarity(&self, port: &PortId) -> Polarity {
if let ConnectorPhased::Setup { endpoint_setups, .. } = &self.phased {
for (setup_port, EndpointSetup { polarity, .. }) in endpoint_setups.iter() {
if setup_port == port {
// special case. this port's polarity isn't reflected by
// self.inp_to_route or self.outp_to_inp, because its still not paired to a peer
return *polarity;
}
}
}
if self.outp_to_inp.contains_key(port) {
Polarity::Putter
} else {
assert!(self.inp_to_route.contains_key(port));
Polarity::Getter
}
}
pub fn add_component(
&mut self,
identifier: &[u8],
ports: &[PortId],
) -> Result<(), AddComponentError> {
use AddComponentError::*;
let polarities = self.proto_description.component_polarities(identifier)?;
if polarities.len() != ports.len() {
return Err(WrongNumberOfParamaters { expected: polarities.len() });
}
for (&expected_polarity, port) in polarities.iter().zip(ports.iter()) {
if !self.native_ports.contains(port) {
return Err(UnknownPort(*port));
}
if expected_polarity != self.check_polarity(port) {
return Err(WrongPortPolarity { port: *port, expected_polarity });
}
}
// ok!
let state = self.proto_description.new_main_component(identifier, ports);
let proto_component = ProtoComponent { ports: ports.iter().copied().collect(), state };
let proto_component_index = self.proto_components.len();
self.proto_components.push(proto_component);
for port in ports.iter() {
if let Polarity::Getter = self.check_polarity(port) {
self.inp_to_route
.insert(*port, InpRoute::ProtoComponent { index: proto_component_index });
}
}
Ok(())
}
pub fn connect(&mut self, timeout: Duration) -> Result<(), ()> {
match &mut self.phased {
ConnectorPhased::Communication { .. } => {
log!(self.logger, "Call to connecting in connected state");
Err(())
}
ConnectorPhased::Setup { endpoint_setups, .. } => {
log!(self.logger, "Call to connecting in setup state. Timeout {:?}", timeout);
let deadline = Instant::now() + timeout;
// connect all endpoints in parallel; send and receive peer ids through ports
let (mut endpoint_exts, mut endpoint_poller) = init_endpoints(
&mut *self.logger,
endpoint_setups,
&mut self.inp_to_route,
deadline,
)?;
log!(self.logger, "Successfully connected {} endpoints", endpoint_exts.len());
// leader election and tree construction
let neighborhood =
init_neighborhood(&mut *self.logger, &mut endpoint_exts, &mut endpoint_poller)?;
log!(self.logger, "Successfully created neighborhood {:?}", &neighborhood);
// TODO session optimization goes here
self.phased = ConnectorPhased::Communication {
endpoint_poller,
endpoint_exts,
neighborhood,
mem_inbox: Default::default(),
};
Ok(())
}
}
}
}
fn init_endpoints(
logger: &mut dyn Logger,
endpoint_setups: &[(PortId, EndpointSetup)],
inp_to_route: &mut HashMap<PortId, InpRoute>,
deadline: Instant,
) -> Result<(Vec<EndpointExt>, EndpointPoller), ()> {
use mio07::{
net::{TcpListener, TcpStream},
Events, Interest, Poll, Token,
};
const BOTH: Interest = Interest::READABLE.add(Interest::WRITABLE);
struct Todo {
todo_endpoint: TodoEndpoint,
endpoint_setup: EndpointSetup,
local_port: PortId,
sent_local_port: bool, // true <-> I've sent my local port
recv_peer_port: Option<PortId>, // Some(..) <-> I've received my peer's port
}
enum TodoEndpoint {
Listener(TcpListener),
Endpoint(Endpoint),
}
fn init(
token: Token,
local_port: PortId,
endpoint_setup: &EndpointSetup,
poll: &mut Poll,
) -> Result<Todo, ()> {
let todo_endpoint = if endpoint_setup.is_active {
let mut stream = TcpStream::connect(endpoint_setup.sock_addr).map_err(drop)?;
poll.registry().register(&mut stream, token, BOTH).unwrap();
TodoEndpoint::Endpoint(Endpoint { stream, inbox: vec![] })
} else {
let mut listener = TcpListener::bind(endpoint_setup.sock_addr).map_err(drop)?;
poll.registry().register(&mut listener, token, BOTH).unwrap();
TodoEndpoint::Listener(listener)
};
Ok(Todo {
todo_endpoint,
endpoint_setup: endpoint_setup.clone(),
local_port,
sent_local_port: false,
recv_peer_port: None,
})
};
////////////////////////
let mut ep = EndpointPoller {
poll: Poll::new().map_err(drop)?,
events: Events::with_capacity(64),
undrained_endpoints: Default::default(),
delayed_inp_messages: Default::default(),
};
let mut todos = endpoint_setups
.iter()
.enumerate()
.map(|(index, (local_port, endpoint_setup))| {
init(Token(index), *local_port, endpoint_setup, &mut ep.poll)
})
.collect::<Result<Vec<Todo>, _>>()?;
let mut unfinished: HashSet<usize> = (0..todos.len()).collect();
while !unfinished.is_empty() {
let remaining = deadline.checked_duration_since(Instant::now()).ok_or(())?;
ep.poll.poll(&mut ep.events, Some(remaining)).map_err(drop)?;
for event in ep.events.iter() {
let token = event.token();
let Token(index) = token;
let todo: &mut Todo = &mut todos[index];
if let TodoEndpoint::Listener(listener) = &mut todo.todo_endpoint {
let (mut stream, peer_addr) = listener.accept().map_err(drop)?;
ep.poll.registry().deregister(listener).unwrap();
ep.poll.registry().register(&mut stream, token, BOTH).unwrap();
log!(logger, "Endpoint({}) accepted a connection from {:?}", index, peer_addr);
let endpoint = Endpoint { stream, inbox: vec![] };
todo.todo_endpoint = TodoEndpoint::Endpoint(endpoint);
}
match todo {
Todo {
todo_endpoint: TodoEndpoint::Endpoint(endpoint),
local_port,
endpoint_setup,
sent_local_port,
recv_peer_port,
} => {
if !unfinished.contains(&index) {
continue;
}
if event.is_writable() && !*sent_local_port {
let msg =
MyPortInfo { polarity: endpoint_setup.polarity, port: *local_port };
endpoint.send(&msg)?;
log!(logger, "endpoint[{}] sent peer info {:?}", index, &msg);
*sent_local_port = true;
}
if event.is_readable() && recv_peer_port.is_none() {
ep.undrained_endpoints.insert(index);
if let Some(peer_port_info) =
endpoint.try_recv::<MyPortInfo>().map_err(drop)?
{
log!(logger, "endpoint[{}] got peer info {:?}", index, peer_port_info);
assert!(peer_port_info.polarity != endpoint_setup.polarity);
if let Putter = endpoint_setup.polarity {
inp_to_route.insert(*local_port, InpRoute::Endpoint { index });
}
*recv_peer_port = Some(peer_port_info.port);
}
}
if *sent_local_port && recv_peer_port.is_some() {
unfinished.remove(&index);
log!(logger, "endpoint[{}] is finished!", index);
}
}
Todo { todo_endpoint: TodoEndpoint::Listener(_), .. } => unreachable!(),
}
}
ep.events.clear();
}
let endpoint_exts = todos
.into_iter()
.map(|Todo { todo_endpoint, recv_peer_port, .. }| EndpointExt {
endpoint: match todo_endpoint {
TodoEndpoint::Endpoint(endpoint) => endpoint,
TodoEndpoint::Listener(..) => unreachable!(),
},
inp_for_emerging_msgs: recv_peer_port.unwrap(),
})
.collect();
Ok((endpoint_exts, ep))
}
fn init_neighborhood(
logger: &mut dyn Logger,
endpoint_exts: &mut [EndpointExt],
endpoint_poller: &mut EndpointPoller,
) -> Result<Neighborhood, ()> {
log!(logger, "Time to construct my neighborhood");
let parent = None;
let children = Default::default();
Ok(Neighborhood { parent, children })
}
|