Skip to content

Remove peers_needing_send set from peer_handling#456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jkczyz wants to merge 2 commits into from
Closed

Remove peers_needing_send set from peer_handling #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f875f4
Indicate outstanding writes to peers directly
jkczyz Jan 21, 2020
7a03fe0
Remove overloaded 'us' in lightning-net-tokio
jkczyz Feb 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions lightning-net-tokio/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,13 @@ pub struct Connection {
}
impl Connection {
fn schedule_read<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, us: Arc<Mutex<Self>>, reader: futures::stream::SplitStream<tokio_codec::Framed<TcpStream, tokio_codec::BytesCodec>>) {
let us_ref = us.clone();
let us_close_ref = us.clone();
let peer_manager_ref = peer_manager.clone();
let connection = us.clone();
let connection_close = us.clone();
let peer_manager_close = peer_manager.clone();
tokio::spawn(reader.for_each(move |b| {
let pending_read = b.to_vec();
{
let mut lock = us_ref.lock().unwrap();
let mut lock = connection.lock().unwrap();
assert!(lock.pending_read.is_empty());
if lock.read_paused {
lock.pending_read = pending_read;
Expand All@@ -60,31 +60,31 @@ impl Connection {
}
}
//TODO: There's a race where we don't meet the requirements of disconnect_socket if its
//called right here, after we release the us_ref lock in the scope above, but before we
//called right here, after we release the connection lock in the scope above, but before we
//call read_event!
match peer_manager.read_event(&mut SocketDescriptor::new(us_ref.clone(), peer_manager.clone()), pending_read) {
match peer_manager.read_event(&mut SocketDescriptor::new(connection.clone(), peer_manager.clone()), pending_read) {
Ok(pause_read) => {
if pause_read {
let mut lock = us_ref.lock().unwrap();
let mut lock = connection.lock().unwrap();
lock.read_paused = true;
}
},
Err(e) => {
us_ref.lock().unwrap().need_disconnect = false;
connection.lock().unwrap().need_disconnect = false;
return future::Either::B(future::result(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))));
}
}

if let Err(e) = us_ref.lock().unwrap().event_notify.try_send(()) {
if let Err(e) = connection.lock().unwrap().event_notify.try_send(()) {
// Ignore full errors as we just need them to poll after this point, so if the user
// hasn't received the last send yet, it doesn't matter.
assert!(e.is_full());
}

future::Either::B(future::result(Ok(())))
}).then(move |_| {
if us_close_ref.lock().unwrap().need_disconnect {
peer_manager_ref.disconnect_event(&SocketDescriptor::new(us_close_ref, peer_manager_ref.clone()));
if connection_close.lock().unwrap().need_disconnect {
peer_manager_close.disconnect_event(&SocketDescriptor::new(connection_close, peer_manager_close.clone()));
println!("Peer disconnected!");
} else {
println!("We disconnected peer!");
Expand All@@ -101,9 +101,9 @@ impl Connection {
})).then(|_| {
future::result(Ok(()))
}));
let us = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));
let connection = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));

(reader, us)
(reader, connection)
}

/// Process incoming messages and feed outgoing messages on the provided socket generated by
Expand All@@ -112,10 +112,10 @@ impl Connection {
/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
/// ChannelManager and ChannelMonitor objects.
pub fn setup_inbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, stream: TcpStream) {
let (reader, us) = Self::new(event_notify, stream);
let (reader, connection) = Self::new(event_notify, stream);

if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone(), peer_manager.clone())) {
Self::schedule_read(peer_manager, us, reader);
if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
Self::schedule_read(peer_manager, connection, reader);
}
}

Expand All@@ -126,11 +126,11 @@ impl Connection {
/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
/// ChannelManager and ChannelMonitor objects.
pub fn setup_outbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, their_node_id: PublicKey, stream: TcpStream) {
let (reader, us) = Self::new(event_notify, stream);
let (reader, connection) = Self::new(event_notify, stream);

if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone(), peer_manager.clone())) {
if SocketDescriptor::new(us.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
Self::schedule_read(peer_manager, us, reader);
if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
if SocketDescriptor::new(connection.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
Self::schedule_read(peer_manager, connection, reader);
} else {
println!("Failed to write first full message to socket!");
}
Expand DownExpand Up@@ -172,16 +172,16 @@ impl<CMH: ChannelMessageHandler> SocketDescriptor<CMH> {
impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescriptor<CMH> {
fn send_data(&mut self, data: &[u8], resume_read: bool) -> usize {
macro_rules! schedule_read {
($us_ref: expr) => {
($descriptor: expr) => {
tokio::spawn(future::lazy(move || -> Result<(), ()> {
let mut read_data = Vec::new();
{
let mut us = $us_ref.conn.lock().unwrap();
mem::swap(&mut read_data, &mut us.pending_read);
let mut connection = $descriptor.conn.lock().unwrap();
mem::swap(&mut read_data, &mut connection.pending_read);
}
if !read_data.is_empty() {
let mut us_clone = $us_ref.clone();
match $us_ref.peer_manager.read_event(&mut us_clone, read_data) {
//let mut us_clone = $descriptor.clone();
match $descriptor.peer_manager.read_event(&mut $descriptor.clone(), read_data) {
Ok(pause_read) => {
if pause_read { return Ok(()); }
},
Expand All@@ -191,12 +191,12 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
}
}
}
let mut us = $us_ref.conn.lock().unwrap();
if let Some(sender) = us.read_blocker.take() {
let mut connection = $descriptor.conn.lock().unwrap();
if let Some(sender) = connection.read_blocker.take() {
sender.send(Ok(())).unwrap();
}
us.read_paused = false;
if let Err(e) = us.event_notify.try_send(()) {
connection.read_paused = false;
if let Err(e) = connection.event_notify.try_send(()) {
// Ignore full errors as we just need them to poll after this point, so if the user
// hasn't received the last send yet, it doesn't matter.
assert!(e.is_full());
Expand All@@ -206,36 +206,36 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
}
}

let mut us = self.conn.lock().unwrap();
let mut connection = self.conn.lock().unwrap();
if resume_read {
let us_ref = self.clone();
schedule_read!(us_ref);
let descriptor = self.clone();
schedule_read!(descriptor);
}
if data.is_empty() { return 0; }
if us.writer.is_none() {
us.read_paused = true;
if connection.writer.is_none() {
connection.read_paused = true;
return 0;
}

let mut bytes = bytes::BytesMut::with_capacity(data.len());
bytes.put(data);
let write_res = us.writer.as_mut().unwrap().start_send(bytes.freeze());
let write_res = connection.writer.as_mut().unwrap().start_send(bytes.freeze());
match write_res {
Ok(res) => {
match res {
AsyncSink::Ready => {
data.len()
},
AsyncSink::NotReady(_) => {
us.read_paused = true;
let us_ref = self.clone();
tokio::spawn(us.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
connection.read_paused = true;
let descriptor = self.clone();
tokio::spawn(connection.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
if let Ok(writer) = writer_res {
{
let mut us = us_ref.conn.lock().unwrap();
us.writer = Some(writer);
let mut connection = descriptor.conn.lock().unwrap();
connection.writer = Some(writer);
}
schedule_read!(us_ref);
schedule_read!(descriptor);
} // we'll fire the disconnect event on the socket reader end
Ok(())
}));
Expand All@@ -251,9 +251,9 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
}

fn disconnect_socket(&mut self) {
let mut us = self.conn.lock().unwrap();
us.need_disconnect = true;
us.read_paused = true;
let mut connection = self.conn.lock().unwrap();
connection.need_disconnect = true;
connection.read_paused = true;
}
}
impl<CMH: ChannelMessageHandler> Clone for SocketDescriptor<CMH> {
Expand Down
32 changes: 14 additions & 18 deletions lightning/src/ln/peer_handler.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ use util::byte_utils;
use util::events::{MessageSendEvent, MessageSendEventsProvider};
use util::logger::Logger;

use std::collections::{HashMap,hash_map,HashSet,LinkedList};
use std::collections::{HashMap,hash_map,LinkedList};
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::{cmp,error,hash,fmt};
Expand DownExpand Up@@ -120,6 +120,10 @@ struct Peer {
sync_status: InitSyncTracker,

awaiting_pong: bool,

/// Indicates do_read_event() pushed a message into pending_outbound_buffer but didn't call
/// do_attempt_write_data() to avoid reentrancy. Cleared in process_events().
needing_send: bool,
}

impl Peer {
Expand All@@ -140,9 +144,6 @@ impl Peer {

struct PeerHolder<Descriptor: SocketDescriptor> {
peers: HashMap<Descriptor, Peer>,
/// Added to by do_read_event for cases where we pushed a message onto the send buffer but
/// didn't call do_attempt_write_data to avoid reentrancy. Cleared in process_events()
peers_needing_send: HashSet<Descriptor>,
/// Only add to this set when noise completes:
node_id_to_descriptor: HashMap<PublicKey, Descriptor>,
}
Expand DownExpand Up@@ -228,7 +229,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
message_handler: message_handler,
peers: Mutex::new(PeerHolder {
peers: HashMap::new(),
peers_needing_send: HashSet::new(),
node_id_to_descriptor: HashMap::new()
}),
our_node_secret: our_node_secret,
Expand DownExpand Up@@ -299,6 +299,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
sync_status: InitSyncTracker::NoSyncRequested,

awaiting_pong: false,
needing_send: false,
}).is_some() {
panic!("PeerManager driver duplicated descriptors!");
};
Expand DownExpand Up@@ -336,6 +337,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
sync_status: InitSyncTracker::NoSyncRequested,

awaiting_pong: false,
needing_send: false,
}).is_some() {
panic!("PeerManager driver duplicated descriptors!");
};
Expand DownExpand Up@@ -485,7 +487,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
{
log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!($msg, $msg_code)[..]));
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
}
}
}
Expand DownExpand Up@@ -644,7 +646,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

if msg.features.initial_routing_sync() {
peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
Comment on lines +647 to +649

@jkczyzjkczyzJan 22, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheBlueMatt Could you explain why this needs to be set here?

@TheBlueMattTheBlueMattJan 22, 2020

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to stream out our routing db, we (obviously) dont copy the whole thing into our outbound send buff (otherwise we'd just OOM ourselves...), so the logic in do_attempt_write_data has to be hit to add messages to the send buffer if the buffer is empty.

}

if !peer.outbound {
Expand DownExpand Up@@ -1029,7 +1031,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
match *action {
msgs::ErrorAction::DisconnectPeer { ref msg } => {
if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
peers.peers_needing_send.remove(&descriptor);
if let Some(mut peer) = peers.peers.remove(&descriptor) {
if let Some(ref msg) = *msg {
log_trace!(self, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
Expand DownExpand Up@@ -1063,11 +1064,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
}
}

for mut descriptor in peers.peers_needing_send.drain() {
match peers.peers.get_mut(&descriptor) {
Some(peer) => self.do_attempt_write_data(&mut descriptor, peer),
None => panic!("Inconsistent peers set state!"),
}
let peers_needing_send = peers.peers.iter_mut().filter(|(_, peer)| peer.needing_send);
for (descriptor, peer) in peers_needing_send {
peer.needing_send = false;
self.do_attempt_write_data(&mut descriptor.clone(), peer)
}
}
}
Expand All@@ -1084,9 +1084,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

fn disconnect_event_internal(&self, descriptor: &Descriptor, no_connection_possible: bool) {
let mut peers = self.peers.lock().unwrap();
peers.peers_needing_send.remove(descriptor);
let peer_option = peers.peers.remove(descriptor);
match peer_option {
match peers.peers.remove(descriptor) {
None => panic!("Descriptor for disconnect_event is not already known to PeerManager"),
Some(peer) => {
match peer.their_node_id {
Expand All@@ -1108,13 +1106,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
let mut peers_lock = self.peers.lock().unwrap();
{
let peers = &mut *peers_lock;
let peers_needing_send = &mut peers.peers_needing_send;
let node_id_to_descriptor = &mut peers.node_id_to_descriptor;
let peers = &mut peers.peers;

peers.retain(|descriptor, peer| {
if peer.awaiting_pong == true {
peers_needing_send.remove(descriptor);
match peer.their_node_id {
Some(node_id) => {
node_id_to_descriptor.remove(&node_id);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Remove peers_needing_send set from peer_handling by jkczyz · Pull Request #456 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove peers_needing_send set from peer_handling#456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkczyz
wants to merge
2
commits into

from

 Closed


Remove peers_needing_send set from peer_handling
#456
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f875f4

Indicate outstanding writes to peers directly


jkczyz Jan 21, 2020
7a03fe0

Remove overloaded 'us' in lightning-net-tokio


jkczyz Feb 2, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 44 additions & 44 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,13 @@ pub struct Connection {
}
impl Connection {
	fn schedule_read<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, us: Arc<Mutex<Self>>, reader: futures::stream::SplitStream<tokio_codec::Framed<TcpStream, tokio_codec::BytesCodec>>) {
 let us_ref = us.clone();
 let us_close_ref = us.clone();
 let peer_manager_ref = peer_manager.clone();
 let connection = us.clone();
 let connection_close = us.clone();
 let peer_manager_close = peer_manager.clone();
 tokio::spawn(reader.for_each(move |b| {
 let pending_read = b.to_vec();
 {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 assert!(lock.pending_read.is_empty());
 if lock.read_paused {
 lock.pending_read = pending_read;
Expand All@@ -60,31 +60,31 @@ impl Connection {
 }
 }
 //TODO: There's a race where we don't meet the requirements of disconnect_socket if its
 //called right here, after we release the us_ref lock in the scope above, but before we
 //called right here, after we release the connection lock in the scope above, but before we
 //call read_event!
 match peer_manager.read_event(&mut SocketDescriptor::new(us_ref.clone(), peer_manager.clone()), pending_read) {
 match peer_manager.read_event(&mut SocketDescriptor::new(connection.clone(), peer_manager.clone()), pending_read) {
 Ok(pause_read) => {
 if pause_read {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 lock.read_paused = true;
 }
 },
 Err(e) => {
us_ref.lock().unwrap().need_disconnect = false;
connection.lock().unwrap().need_disconnect = false;
 return future::Either::B(future::result(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))));
 }
 }

 if let Err(e) = us_ref.lock().unwrap().event_notify.try_send(()) {
 if let Err(e) = connection.lock().unwrap().event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
 }

 future::Either::B(future::result(Ok(())))
 }).then(move |_| {
 if us_close_ref.lock().unwrap().need_disconnect {
peer_manager_ref.disconnect_event(&SocketDescriptor::new(us_close_ref, peer_manager_ref.clone()));
 if connection_close.lock().unwrap().need_disconnect {
peer_manager_close.disconnect_event(&SocketDescriptor::new(connection_close, peer_manager_close.clone()));
 println!("Peer disconnected!");
 } else {
 println!("We disconnected peer!");
Expand All@@ -101,9 +101,9 @@ impl Connection {
 })).then(|_| {
 future::result(Ok(()))
 }));
 let us = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));
 let connection = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));

 (reader, us)
 (reader, connection)
	}

	/// Process incoming messages and feed outgoing messages on the provided socket generated by
Expand All@@ -112,10 +112,10 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_inbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, connection, reader);
 }
	}

Expand All@@ -126,11 +126,11 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_outbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, their_node_id: PublicKey, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(us.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(connection.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, connection, reader);
 } else {
 println!("Failed to write first full message to socket!");
 }
Expand DownExpand Up@@ -172,16 +172,16 @@ impl<CMH: ChannelMessageHandler> SocketDescriptor<CMH> {
impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescriptor<CMH> {
	fn send_data(&mut self, data: &[u8], resume_read: bool) -> usize {
 macro_rules! schedule_read {
 ($us_ref: expr) => {
 ($descriptor: expr) => {
 tokio::spawn(future::lazy(move || -> Result<(), ()> {
 let mut read_data = Vec::new();
 {
 let mut us = $us_ref.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut us.pending_read);
 let mut connection = $descriptor.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut connection.pending_read);
 }
 if !read_data.is_empty() {
 let mut us_clone = $us_ref.clone();
 match $us_ref.peer_manager.read_event(&mut us_clone, read_data) {
//let mut us_clone = $descriptor.clone();
 match $descriptor.peer_manager.read_event(&mut $descriptor.clone(), read_data) {
 Ok(pause_read) => {
 if pause_read { return Ok(()); }
 },
Expand All@@ -191,12 +191,12 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }
 }
 let mut us = $us_ref.conn.lock().unwrap();
 if let Some(sender) = us.read_blocker.take() {
 let mut connection = $descriptor.conn.lock().unwrap();
 if let Some(sender) = connection.read_blocker.take() {
 sender.send(Ok(())).unwrap();
 }
us.read_paused = false;
 if let Err(e) = us.event_notify.try_send(()) {
connection.read_paused = false;
 if let Err(e) = connection.event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
Expand All@@ -206,36 +206,36 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }

 let mut us = self.conn.lock().unwrap();
 let mut connection = self.conn.lock().unwrap();
 if resume_read {
 let us_ref = self.clone();
 schedule_read!(us_ref);
 let descriptor = self.clone();
 schedule_read!(descriptor);
 }
 if data.is_empty() { return 0; }
 if us.writer.is_none() {
us.read_paused = true;
 if connection.writer.is_none() {
connection.read_paused = true;
 return 0;
 }

 let mut bytes = bytes::BytesMut::with_capacity(data.len());
 bytes.put(data);
 let write_res = us.writer.as_mut().unwrap().start_send(bytes.freeze());
 let write_res = connection.writer.as_mut().unwrap().start_send(bytes.freeze());
 match write_res {
 Ok(res) => {
 match res {
 AsyncSink::Ready => {
 data.len()
 },
 AsyncSink::NotReady(_) => {
us.read_paused = true;
 let us_ref = self.clone();
 tokio::spawn(us.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
connection.read_paused = true;
 let descriptor = self.clone();
 tokio::spawn(connection.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
 if let Ok(writer) = writer_res {
 {
 let mut us = us_ref.conn.lock().unwrap();
us.writer = Some(writer);
 let mut connection = descriptor.conn.lock().unwrap();
connection.writer = Some(writer);
 }
 schedule_read!(us_ref);
 schedule_read!(descriptor);
 } // we'll fire the disconnect event on the socket reader end
 Ok(())
 }));
Expand All@@ -251,9 +251,9 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
	}

	fn disconnect_socket(&mut self) {
 let mut us = self.conn.lock().unwrap();
us.need_disconnect = true;
us.read_paused = true;
 let mut connection = self.conn.lock().unwrap();
connection.need_disconnect = true;
connection.read_paused = true;
	}
}
impl<CMH: ChannelMessageHandler> Clone for SocketDescriptor<CMH> {
Expand Down

32 changes: 14 additions & 18 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ use util::byte_utils;
use util::events::{MessageSendEvent, MessageSendEventsProvider};
use util::logger::Logger;

use std::collections::{HashMap,hash_map,HashSet,LinkedList};
use std::collections::{HashMap,hash_map,LinkedList};
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::{cmp,error,hash,fmt};
Expand DownExpand Up@@ -120,6 +120,10 @@ struct Peer {
	sync_status: InitSyncTracker,

	awaiting_pong: bool,

	/// Indicates do_read_event() pushed a message into pending_outbound_buffer but didn't call
	/// do_attempt_write_data() to avoid reentrancy. Cleared in process_events().
	needing_send: bool,
}

impl Peer {
Expand All@@ -140,9 +144,6 @@ impl Peer {

struct PeerHolder<Descriptor: SocketDescriptor> {
	peers: HashMap<Descriptor, Peer>,
	/// Added to by do_read_event for cases where we pushed a message onto the send buffer but
	/// didn't call do_attempt_write_data to avoid reentrancy. Cleared in process_events()
	peers_needing_send: HashSet<Descriptor>,
	/// Only add to this set when noise completes:
	node_id_to_descriptor: HashMap<PublicKey, Descriptor>,
}
Expand DownExpand Up@@ -228,7 +229,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 message_handler: message_handler,
 peers: Mutex::new(PeerHolder {
 peers: HashMap::new(),
 peers_needing_send: HashSet::new(),
 node_id_to_descriptor: HashMap::new()
 }),
 our_node_secret: our_node_secret,
Expand DownExpand Up@@ -299,6 +299,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -336,6 +337,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -485,7 +487,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 {
 log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!($msg, $msg_code)[..]));
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
 }
 }
 }
Expand DownExpand Up@@ -644,7 +646,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

 if msg.features.initial_routing_sync() {
 peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;

Comment on lines

+647
 to 
+649

@jkczyzjkczyzJan 22, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheBlueMatt Could you explain why this needs to be set here?
@TheBlueMattTheBlueMattJan 22, 2020

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to stream out our routing db, we (obviously) dont copy the whole thing into our outbound send buff (otherwise we'd just OOM ourselves...), so the logic in do_attempt_write_data has to be hit to add messages to the send buffer if the buffer is empty.
 }

 if !peer.outbound {
Expand DownExpand Up@@ -1029,7 +1031,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 match *action {
 msgs::ErrorAction::DisconnectPeer { ref msg } => {
 if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
 peers.peers_needing_send.remove(&descriptor);
 if let Some(mut peer) = peers.peers.remove(&descriptor) {
 if let Some(ref msg) = *msg {
 log_trace!(self, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
Expand DownExpand Up@@ -1063,11 +1064,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 }
 }

 for mut descriptor in peers.peers_needing_send.drain() {
 match peers.peers.get_mut(&descriptor) {
 Some(peer) => self.do_attempt_write_data(&mut descriptor, peer),
 None => panic!("Inconsistent peers set state!"),
 }
 let peers_needing_send = peers.peers.iter_mut().filter(|(_, peer)| peer.needing_send);
 for (descriptor, peer) in peers_needing_send {
 peer.needing_send = false;
 self.do_attempt_write_data(&mut descriptor.clone(), peer)
 }
 }
	}
Expand All@@ -1084,9 +1084,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

	fn disconnect_event_internal(&self, descriptor: &Descriptor, no_connection_possible: bool) {
 let mut peers = self.peers.lock().unwrap();
 peers.peers_needing_send.remove(descriptor);
 let peer_option = peers.peers.remove(descriptor);
 match peer_option {
 match peers.peers.remove(descriptor) {
 None => panic!("Descriptor for disconnect_event is not already known to PeerManager"),
 Some(peer) => {
 match peer.their_node_id {
Expand All@@ -1108,13 +1106,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 let mut peers_lock = self.peers.lock().unwrap();
 {
 let peers = &mut *peers_lock;
 let peers_needing_send = &mut peers.peers_needing_send;
 let node_id_to_descriptor = &mut peers.node_id_to_descriptor;
 let peers = &mut peers.peers;

 peers.retain(|descriptor, peer| {
 if peer.awaiting_pong == true {
 peers_needing_send.remove(descriptor);
 match peer.their_node_id {
 Some(node_id) => {
 node_id_to_descriptor.remove(&node_id);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove peers_needing_send set from peer_handling by jkczyz · Pull Request #456 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove peers_needing_send set from peer_handling#456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkczyz
wants to merge
2
commits into

from

 Closed


Remove peers_needing_send set from peer_handling
#456
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f875f4

Indicate outstanding writes to peers directly


jkczyz Jan 21, 2020
7a03fe0

Remove overloaded 'us' in lightning-net-tokio


jkczyz Feb 2, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 44 additions & 44 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,13 @@ pub struct Connection {
}
impl Connection {
	fn schedule_read<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, us: Arc<Mutex<Self>>, reader: futures::stream::SplitStream<tokio_codec::Framed<TcpStream, tokio_codec::BytesCodec>>) {
 let us_ref = us.clone();
 let us_close_ref = us.clone();
 let peer_manager_ref = peer_manager.clone();
 let connection = us.clone();
 let connection_close = us.clone();
 let peer_manager_close = peer_manager.clone();
 tokio::spawn(reader.for_each(move |b| {
 let pending_read = b.to_vec();
 {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 assert!(lock.pending_read.is_empty());
 if lock.read_paused {
 lock.pending_read = pending_read;
Expand All@@ -60,31 +60,31 @@ impl Connection {
 }
 }
 //TODO: There's a race where we don't meet the requirements of disconnect_socket if its
 //called right here, after we release the us_ref lock in the scope above, but before we
 //called right here, after we release the connection lock in the scope above, but before we
 //call read_event!
 match peer_manager.read_event(&mut SocketDescriptor::new(us_ref.clone(), peer_manager.clone()), pending_read) {
 match peer_manager.read_event(&mut SocketDescriptor::new(connection.clone(), peer_manager.clone()), pending_read) {
 Ok(pause_read) => {
 if pause_read {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 lock.read_paused = true;
 }
 },
 Err(e) => {
us_ref.lock().unwrap().need_disconnect = false;
connection.lock().unwrap().need_disconnect = false;
 return future::Either::B(future::result(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))));
 }
 }

 if let Err(e) = us_ref.lock().unwrap().event_notify.try_send(()) {
 if let Err(e) = connection.lock().unwrap().event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
 }

 future::Either::B(future::result(Ok(())))
 }).then(move |_| {
 if us_close_ref.lock().unwrap().need_disconnect {
peer_manager_ref.disconnect_event(&SocketDescriptor::new(us_close_ref, peer_manager_ref.clone()));
 if connection_close.lock().unwrap().need_disconnect {
peer_manager_close.disconnect_event(&SocketDescriptor::new(connection_close, peer_manager_close.clone()));
 println!("Peer disconnected!");
 } else {
 println!("We disconnected peer!");
Expand All@@ -101,9 +101,9 @@ impl Connection {
 })).then(|_| {
 future::result(Ok(()))
 }));
 let us = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));
 let connection = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));

 (reader, us)
 (reader, connection)
	}

	/// Process incoming messages and feed outgoing messages on the provided socket generated by
Expand All@@ -112,10 +112,10 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_inbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, connection, reader);
 }
	}

Expand All@@ -126,11 +126,11 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_outbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, their_node_id: PublicKey, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(us.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(connection.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, connection, reader);
 } else {
 println!("Failed to write first full message to socket!");
 }
Expand DownExpand Up@@ -172,16 +172,16 @@ impl<CMH: ChannelMessageHandler> SocketDescriptor<CMH> {
impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescriptor<CMH> {
	fn send_data(&mut self, data: &[u8], resume_read: bool) -> usize {
 macro_rules! schedule_read {
 ($us_ref: expr) => {
 ($descriptor: expr) => {
 tokio::spawn(future::lazy(move || -> Result<(), ()> {
 let mut read_data = Vec::new();
 {
 let mut us = $us_ref.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut us.pending_read);
 let mut connection = $descriptor.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut connection.pending_read);
 }
 if !read_data.is_empty() {
 let mut us_clone = $us_ref.clone();
 match $us_ref.peer_manager.read_event(&mut us_clone, read_data) {
//let mut us_clone = $descriptor.clone();
 match $descriptor.peer_manager.read_event(&mut $descriptor.clone(), read_data) {
 Ok(pause_read) => {
 if pause_read { return Ok(()); }
 },
Expand All@@ -191,12 +191,12 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }
 }
 let mut us = $us_ref.conn.lock().unwrap();
 if let Some(sender) = us.read_blocker.take() {
 let mut connection = $descriptor.conn.lock().unwrap();
 if let Some(sender) = connection.read_blocker.take() {
 sender.send(Ok(())).unwrap();
 }
us.read_paused = false;
 if let Err(e) = us.event_notify.try_send(()) {
connection.read_paused = false;
 if let Err(e) = connection.event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
Expand All@@ -206,36 +206,36 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }

 let mut us = self.conn.lock().unwrap();
 let mut connection = self.conn.lock().unwrap();
 if resume_read {
 let us_ref = self.clone();
 schedule_read!(us_ref);
 let descriptor = self.clone();
 schedule_read!(descriptor);
 }
 if data.is_empty() { return 0; }
 if us.writer.is_none() {
us.read_paused = true;
 if connection.writer.is_none() {
connection.read_paused = true;
 return 0;
 }

 let mut bytes = bytes::BytesMut::with_capacity(data.len());
 bytes.put(data);
 let write_res = us.writer.as_mut().unwrap().start_send(bytes.freeze());
 let write_res = connection.writer.as_mut().unwrap().start_send(bytes.freeze());
 match write_res {
 Ok(res) => {
 match res {
 AsyncSink::Ready => {
 data.len()
 },
 AsyncSink::NotReady(_) => {
us.read_paused = true;
 let us_ref = self.clone();
 tokio::spawn(us.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
connection.read_paused = true;
 let descriptor = self.clone();
 tokio::spawn(connection.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
 if let Ok(writer) = writer_res {
 {
 let mut us = us_ref.conn.lock().unwrap();
us.writer = Some(writer);
 let mut connection = descriptor.conn.lock().unwrap();
connection.writer = Some(writer);
 }
 schedule_read!(us_ref);
 schedule_read!(descriptor);
 } // we'll fire the disconnect event on the socket reader end
 Ok(())
 }));
Expand All@@ -251,9 +251,9 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
	}

	fn disconnect_socket(&mut self) {
 let mut us = self.conn.lock().unwrap();
us.need_disconnect = true;
us.read_paused = true;
 let mut connection = self.conn.lock().unwrap();
connection.need_disconnect = true;
connection.read_paused = true;
	}
}
impl<CMH: ChannelMessageHandler> Clone for SocketDescriptor<CMH> {
Expand Down

32 changes: 14 additions & 18 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ use util::byte_utils;
use util::events::{MessageSendEvent, MessageSendEventsProvider};
use util::logger::Logger;

use std::collections::{HashMap,hash_map,HashSet,LinkedList};
use std::collections::{HashMap,hash_map,LinkedList};
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::{cmp,error,hash,fmt};
Expand DownExpand Up@@ -120,6 +120,10 @@ struct Peer {
	sync_status: InitSyncTracker,

	awaiting_pong: bool,

	/// Indicates do_read_event() pushed a message into pending_outbound_buffer but didn't call
	/// do_attempt_write_data() to avoid reentrancy. Cleared in process_events().
	needing_send: bool,
}

impl Peer {
Expand All@@ -140,9 +144,6 @@ impl Peer {

struct PeerHolder<Descriptor: SocketDescriptor> {
	peers: HashMap<Descriptor, Peer>,
	/// Added to by do_read_event for cases where we pushed a message onto the send buffer but
	/// didn't call do_attempt_write_data to avoid reentrancy. Cleared in process_events()
	peers_needing_send: HashSet<Descriptor>,
	/// Only add to this set when noise completes:
	node_id_to_descriptor: HashMap<PublicKey, Descriptor>,
}
Expand DownExpand Up@@ -228,7 +229,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 message_handler: message_handler,
 peers: Mutex::new(PeerHolder {
 peers: HashMap::new(),
 peers_needing_send: HashSet::new(),
 node_id_to_descriptor: HashMap::new()
 }),
 our_node_secret: our_node_secret,
Expand DownExpand Up@@ -299,6 +299,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -336,6 +337,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -485,7 +487,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 {
 log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!($msg, $msg_code)[..]));
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
 }
 }
 }
Expand DownExpand Up@@ -644,7 +646,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

 if msg.features.initial_routing_sync() {
 peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;

Comment on lines

+647
 to 
+649

@jkczyzjkczyzJan 22, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheBlueMatt Could you explain why this needs to be set here?
@TheBlueMattTheBlueMattJan 22, 2020

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to stream out our routing db, we (obviously) dont copy the whole thing into our outbound send buff (otherwise we'd just OOM ourselves...), so the logic in do_attempt_write_data has to be hit to add messages to the send buffer if the buffer is empty.
 }

 if !peer.outbound {
Expand DownExpand Up@@ -1029,7 +1031,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 match *action {
 msgs::ErrorAction::DisconnectPeer { ref msg } => {
 if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
 peers.peers_needing_send.remove(&descriptor);
 if let Some(mut peer) = peers.peers.remove(&descriptor) {
 if let Some(ref msg) = *msg {
 log_trace!(self, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
Expand DownExpand Up@@ -1063,11 +1064,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 }
 }

 for mut descriptor in peers.peers_needing_send.drain() {
 match peers.peers.get_mut(&descriptor) {
 Some(peer) => self.do_attempt_write_data(&mut descriptor, peer),
 None => panic!("Inconsistent peers set state!"),
 }
 let peers_needing_send = peers.peers.iter_mut().filter(|(_, peer)| peer.needing_send);
 for (descriptor, peer) in peers_needing_send {
 peer.needing_send = false;
 self.do_attempt_write_data(&mut descriptor.clone(), peer)
 }
 }
	}
Expand All@@ -1084,9 +1084,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

	fn disconnect_event_internal(&self, descriptor: &Descriptor, no_connection_possible: bool) {
 let mut peers = self.peers.lock().unwrap();
 peers.peers_needing_send.remove(descriptor);
 let peer_option = peers.peers.remove(descriptor);
 match peer_option {
 match peers.peers.remove(descriptor) {
 None => panic!("Descriptor for disconnect_event is not already known to PeerManager"),
 Some(peer) => {
 match peer.their_node_id {
Expand All@@ -1108,13 +1106,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 let mut peers_lock = self.peers.lock().unwrap();
 {
 let peers = &mut *peers_lock;
 let peers_needing_send = &mut peers.peers_needing_send;
 let node_id_to_descriptor = &mut peers.node_id_to_descriptor;
 let peers = &mut peers.peers;

 peers.retain(|descriptor, peer| {
 if peer.awaiting_pong == true {
 peers_needing_send.remove(descriptor);
 match peer.their_node_id {
 Some(node_id) => {
 node_id_to_descriptor.remove(&node_id);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove peers_needing_send set from peer_handling by jkczyz · Pull Request #456 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove peers_needing_send set from peer_handling#456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkczyz
wants to merge
2
commits into

from

 Closed


Remove peers_needing_send set from peer_handling
#456
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f875f4

Indicate outstanding writes to peers directly


jkczyz Jan 21, 2020
7a03fe0

Remove overloaded 'us' in lightning-net-tokio


jkczyz Feb 2, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 44 additions & 44 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,13 @@ pub struct Connection {
}
impl Connection {
	fn schedule_read<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, us: Arc<Mutex<Self>>, reader: futures::stream::SplitStream<tokio_codec::Framed<TcpStream, tokio_codec::BytesCodec>>) {
 let us_ref = us.clone();
 let us_close_ref = us.clone();
 let peer_manager_ref = peer_manager.clone();
 let connection = us.clone();
 let connection_close = us.clone();
 let peer_manager_close = peer_manager.clone();
 tokio::spawn(reader.for_each(move |b| {
 let pending_read = b.to_vec();
 {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 assert!(lock.pending_read.is_empty());
 if lock.read_paused {
 lock.pending_read = pending_read;
Expand All@@ -60,31 +60,31 @@ impl Connection {
 }
 }
 //TODO: There's a race where we don't meet the requirements of disconnect_socket if its
 //called right here, after we release the us_ref lock in the scope above, but before we
 //called right here, after we release the connection lock in the scope above, but before we
 //call read_event!
 match peer_manager.read_event(&mut SocketDescriptor::new(us_ref.clone(), peer_manager.clone()), pending_read) {
 match peer_manager.read_event(&mut SocketDescriptor::new(connection.clone(), peer_manager.clone()), pending_read) {
 Ok(pause_read) => {
 if pause_read {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 lock.read_paused = true;
 }
 },
 Err(e) => {
us_ref.lock().unwrap().need_disconnect = false;
connection.lock().unwrap().need_disconnect = false;
 return future::Either::B(future::result(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))));
 }
 }

 if let Err(e) = us_ref.lock().unwrap().event_notify.try_send(()) {
 if let Err(e) = connection.lock().unwrap().event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
 }

 future::Either::B(future::result(Ok(())))
 }).then(move |_| {
 if us_close_ref.lock().unwrap().need_disconnect {
peer_manager_ref.disconnect_event(&SocketDescriptor::new(us_close_ref, peer_manager_ref.clone()));
 if connection_close.lock().unwrap().need_disconnect {
peer_manager_close.disconnect_event(&SocketDescriptor::new(connection_close, peer_manager_close.clone()));
 println!("Peer disconnected!");
 } else {
 println!("We disconnected peer!");
Expand All@@ -101,9 +101,9 @@ impl Connection {
 })).then(|_| {
 future::result(Ok(()))
 }));
 let us = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));
 let connection = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));

 (reader, us)
 (reader, connection)
	}

	/// Process incoming messages and feed outgoing messages on the provided socket generated by
Expand All@@ -112,10 +112,10 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_inbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, connection, reader);
 }
	}

Expand All@@ -126,11 +126,11 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_outbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, their_node_id: PublicKey, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(us.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(connection.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, connection, reader);
 } else {
 println!("Failed to write first full message to socket!");
 }
Expand DownExpand Up@@ -172,16 +172,16 @@ impl<CMH: ChannelMessageHandler> SocketDescriptor<CMH> {
impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescriptor<CMH> {
	fn send_data(&mut self, data: &[u8], resume_read: bool) -> usize {
 macro_rules! schedule_read {
 ($us_ref: expr) => {
 ($descriptor: expr) => {
 tokio::spawn(future::lazy(move || -> Result<(), ()> {
 let mut read_data = Vec::new();
 {
 let mut us = $us_ref.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut us.pending_read);
 let mut connection = $descriptor.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut connection.pending_read);
 }
 if !read_data.is_empty() {
 let mut us_clone = $us_ref.clone();
 match $us_ref.peer_manager.read_event(&mut us_clone, read_data) {
//let mut us_clone = $descriptor.clone();
 match $descriptor.peer_manager.read_event(&mut $descriptor.clone(), read_data) {
 Ok(pause_read) => {
 if pause_read { return Ok(()); }
 },
Expand All@@ -191,12 +191,12 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }
 }
 let mut us = $us_ref.conn.lock().unwrap();
 if let Some(sender) = us.read_blocker.take() {
 let mut connection = $descriptor.conn.lock().unwrap();
 if let Some(sender) = connection.read_blocker.take() {
 sender.send(Ok(())).unwrap();
 }
us.read_paused = false;
 if let Err(e) = us.event_notify.try_send(()) {
connection.read_paused = false;
 if let Err(e) = connection.event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
Expand All@@ -206,36 +206,36 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }

 let mut us = self.conn.lock().unwrap();
 let mut connection = self.conn.lock().unwrap();
 if resume_read {
 let us_ref = self.clone();
 schedule_read!(us_ref);
 let descriptor = self.clone();
 schedule_read!(descriptor);
 }
 if data.is_empty() { return 0; }
 if us.writer.is_none() {
us.read_paused = true;
 if connection.writer.is_none() {
connection.read_paused = true;
 return 0;
 }

 let mut bytes = bytes::BytesMut::with_capacity(data.len());
 bytes.put(data);
 let write_res = us.writer.as_mut().unwrap().start_send(bytes.freeze());
 let write_res = connection.writer.as_mut().unwrap().start_send(bytes.freeze());
 match write_res {
 Ok(res) => {
 match res {
 AsyncSink::Ready => {
 data.len()
 },
 AsyncSink::NotReady(_) => {
us.read_paused = true;
 let us_ref = self.clone();
 tokio::spawn(us.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
connection.read_paused = true;
 let descriptor = self.clone();
 tokio::spawn(connection.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
 if let Ok(writer) = writer_res {
 {
 let mut us = us_ref.conn.lock().unwrap();
us.writer = Some(writer);
 let mut connection = descriptor.conn.lock().unwrap();
connection.writer = Some(writer);
 }
 schedule_read!(us_ref);
 schedule_read!(descriptor);
 } // we'll fire the disconnect event on the socket reader end
 Ok(())
 }));
Expand All@@ -251,9 +251,9 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
	}

	fn disconnect_socket(&mut self) {
 let mut us = self.conn.lock().unwrap();
us.need_disconnect = true;
us.read_paused = true;
 let mut connection = self.conn.lock().unwrap();
connection.need_disconnect = true;
connection.read_paused = true;
	}
}
impl<CMH: ChannelMessageHandler> Clone for SocketDescriptor<CMH> {
Expand Down

32 changes: 14 additions & 18 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ use util::byte_utils;
use util::events::{MessageSendEvent, MessageSendEventsProvider};
use util::logger::Logger;

use std::collections::{HashMap,hash_map,HashSet,LinkedList};
use std::collections::{HashMap,hash_map,LinkedList};
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::{cmp,error,hash,fmt};
Expand DownExpand Up@@ -120,6 +120,10 @@ struct Peer {
	sync_status: InitSyncTracker,

	awaiting_pong: bool,

	/// Indicates do_read_event() pushed a message into pending_outbound_buffer but didn't call
	/// do_attempt_write_data() to avoid reentrancy. Cleared in process_events().
	needing_send: bool,
}

impl Peer {
Expand All@@ -140,9 +144,6 @@ impl Peer {

struct PeerHolder<Descriptor: SocketDescriptor> {
	peers: HashMap<Descriptor, Peer>,
	/// Added to by do_read_event for cases where we pushed a message onto the send buffer but
	/// didn't call do_attempt_write_data to avoid reentrancy. Cleared in process_events()
	peers_needing_send: HashSet<Descriptor>,
	/// Only add to this set when noise completes:
	node_id_to_descriptor: HashMap<PublicKey, Descriptor>,
}
Expand DownExpand Up@@ -228,7 +229,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 message_handler: message_handler,
 peers: Mutex::new(PeerHolder {
 peers: HashMap::new(),
 peers_needing_send: HashSet::new(),
 node_id_to_descriptor: HashMap::new()
 }),
 our_node_secret: our_node_secret,
Expand DownExpand Up@@ -299,6 +299,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -336,6 +337,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -485,7 +487,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 {
 log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!($msg, $msg_code)[..]));
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
 }
 }
 }
Expand DownExpand Up@@ -644,7 +646,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

 if msg.features.initial_routing_sync() {
 peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;

Comment on lines

+647
 to 
+649

@jkczyzjkczyzJan 22, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheBlueMatt Could you explain why this needs to be set here?
@TheBlueMattTheBlueMattJan 22, 2020

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to stream out our routing db, we (obviously) dont copy the whole thing into our outbound send buff (otherwise we'd just OOM ourselves...), so the logic in do_attempt_write_data has to be hit to add messages to the send buffer if the buffer is empty.
 }

 if !peer.outbound {
Expand DownExpand Up@@ -1029,7 +1031,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 match *action {
 msgs::ErrorAction::DisconnectPeer { ref msg } => {
 if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
 peers.peers_needing_send.remove(&descriptor);
 if let Some(mut peer) = peers.peers.remove(&descriptor) {
 if let Some(ref msg) = *msg {
 log_trace!(self, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
Expand DownExpand Up@@ -1063,11 +1064,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 }
 }

 for mut descriptor in peers.peers_needing_send.drain() {
 match peers.peers.get_mut(&descriptor) {
 Some(peer) => self.do_attempt_write_data(&mut descriptor, peer),
 None => panic!("Inconsistent peers set state!"),
 }
 let peers_needing_send = peers.peers.iter_mut().filter(|(_, peer)| peer.needing_send);
 for (descriptor, peer) in peers_needing_send {
 peer.needing_send = false;
 self.do_attempt_write_data(&mut descriptor.clone(), peer)
 }
 }
	}
Expand All@@ -1084,9 +1084,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

	fn disconnect_event_internal(&self, descriptor: &Descriptor, no_connection_possible: bool) {
 let mut peers = self.peers.lock().unwrap();
 peers.peers_needing_send.remove(descriptor);
 let peer_option = peers.peers.remove(descriptor);
 match peer_option {
 match peers.peers.remove(descriptor) {
 None => panic!("Descriptor for disconnect_event is not already known to PeerManager"),
 Some(peer) => {
 match peer.their_node_id {
Expand All@@ -1108,13 +1106,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 let mut peers_lock = self.peers.lock().unwrap();
 {
 let peers = &mut *peers_lock;
 let peers_needing_send = &mut peers.peers_needing_send;
 let node_id_to_descriptor = &mut peers.node_id_to_descriptor;
 let peers = &mut peers.peers;

 peers.retain(|descriptor, peer| {
 if peer.awaiting_pong == true {
 peers_needing_send.remove(descriptor);
 match peer.their_node_id {
 Some(node_id) => {
 node_id_to_descriptor.remove(&node_id);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Remove peers_needing_send set from peer_handling by jkczyz · Pull Request #456 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove peers_needing_send set from peer_handling#456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkczyz
wants to merge
2
commits into

from

 Closed


Remove peers_needing_send set from peer_handling
#456
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f875f4

Indicate outstanding writes to peers directly


jkczyz Jan 21, 2020
7a03fe0

Remove overloaded 'us' in lightning-net-tokio


jkczyz Feb 2, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 44 additions & 44 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,13 @@ pub struct Connection {
}
impl Connection {
	fn schedule_read<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, us: Arc<Mutex<Self>>, reader: futures::stream::SplitStream<tokio_codec::Framed<TcpStream, tokio_codec::BytesCodec>>) {
 let us_ref = us.clone();
 let us_close_ref = us.clone();
 let peer_manager_ref = peer_manager.clone();
 let connection = us.clone();
 let connection_close = us.clone();
 let peer_manager_close = peer_manager.clone();
 tokio::spawn(reader.for_each(move |b| {
 let pending_read = b.to_vec();
 {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 assert!(lock.pending_read.is_empty());
 if lock.read_paused {
 lock.pending_read = pending_read;
Expand All@@ -60,31 +60,31 @@ impl Connection {
 }
 }
 //TODO: There's a race where we don't meet the requirements of disconnect_socket if its
 //called right here, after we release the us_ref lock in the scope above, but before we
 //called right here, after we release the connection lock in the scope above, but before we
 //call read_event!
 match peer_manager.read_event(&mut SocketDescriptor::new(us_ref.clone(), peer_manager.clone()), pending_read) {
 match peer_manager.read_event(&mut SocketDescriptor::new(connection.clone(), peer_manager.clone()), pending_read) {
 Ok(pause_read) => {
 if pause_read {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 lock.read_paused = true;
 }
 },
 Err(e) => {
us_ref.lock().unwrap().need_disconnect = false;
connection.lock().unwrap().need_disconnect = false;
 return future::Either::B(future::result(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))));
 }
 }

 if let Err(e) = us_ref.lock().unwrap().event_notify.try_send(()) {
 if let Err(e) = connection.lock().unwrap().event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
 }

 future::Either::B(future::result(Ok(())))
 }).then(move |_| {
 if us_close_ref.lock().unwrap().need_disconnect {
peer_manager_ref.disconnect_event(&SocketDescriptor::new(us_close_ref, peer_manager_ref.clone()));
 if connection_close.lock().unwrap().need_disconnect {
peer_manager_close.disconnect_event(&SocketDescriptor::new(connection_close, peer_manager_close.clone()));
 println!("Peer disconnected!");
 } else {
 println!("We disconnected peer!");
Expand All@@ -101,9 +101,9 @@ impl Connection {
 })).then(|_| {
 future::result(Ok(()))
 }));
 let us = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));
 let connection = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));

 (reader, us)
 (reader, connection)
	}

	/// Process incoming messages and feed outgoing messages on the provided socket generated by
Expand All@@ -112,10 +112,10 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_inbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, connection, reader);
 }
	}

Expand All@@ -126,11 +126,11 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_outbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, their_node_id: PublicKey, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(us.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(connection.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, connection, reader);
 } else {
 println!("Failed to write first full message to socket!");
 }
Expand DownExpand Up@@ -172,16 +172,16 @@ impl<CMH: ChannelMessageHandler> SocketDescriptor<CMH> {
impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescriptor<CMH> {
	fn send_data(&mut self, data: &[u8], resume_read: bool) -> usize {
 macro_rules! schedule_read {
 ($us_ref: expr) => {
 ($descriptor: expr) => {
 tokio::spawn(future::lazy(move || -> Result<(), ()> {
 let mut read_data = Vec::new();
 {
 let mut us = $us_ref.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut us.pending_read);
 let mut connection = $descriptor.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut connection.pending_read);
 }
 if !read_data.is_empty() {
 let mut us_clone = $us_ref.clone();
 match $us_ref.peer_manager.read_event(&mut us_clone, read_data) {
//let mut us_clone = $descriptor.clone();
 match $descriptor.peer_manager.read_event(&mut $descriptor.clone(), read_data) {
 Ok(pause_read) => {
 if pause_read { return Ok(()); }
 },
Expand All@@ -191,12 +191,12 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }
 }
 let mut us = $us_ref.conn.lock().unwrap();
 if let Some(sender) = us.read_blocker.take() {
 let mut connection = $descriptor.conn.lock().unwrap();
 if let Some(sender) = connection.read_blocker.take() {
 sender.send(Ok(())).unwrap();
 }
us.read_paused = false;
 if let Err(e) = us.event_notify.try_send(()) {
connection.read_paused = false;
 if let Err(e) = connection.event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
Expand All@@ -206,36 +206,36 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }

 let mut us = self.conn.lock().unwrap();
 let mut connection = self.conn.lock().unwrap();
 if resume_read {
 let us_ref = self.clone();
 schedule_read!(us_ref);
 let descriptor = self.clone();
 schedule_read!(descriptor);
 }
 if data.is_empty() { return 0; }
 if us.writer.is_none() {
us.read_paused = true;
 if connection.writer.is_none() {
connection.read_paused = true;
 return 0;
 }

 let mut bytes = bytes::BytesMut::with_capacity(data.len());
 bytes.put(data);
 let write_res = us.writer.as_mut().unwrap().start_send(bytes.freeze());
 let write_res = connection.writer.as_mut().unwrap().start_send(bytes.freeze());
 match write_res {
 Ok(res) => {
 match res {
 AsyncSink::Ready => {
 data.len()
 },
 AsyncSink::NotReady(_) => {
us.read_paused = true;
 let us_ref = self.clone();
 tokio::spawn(us.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
connection.read_paused = true;
 let descriptor = self.clone();
 tokio::spawn(connection.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
 if let Ok(writer) = writer_res {
 {
 let mut us = us_ref.conn.lock().unwrap();
us.writer = Some(writer);
 let mut connection = descriptor.conn.lock().unwrap();
connection.writer = Some(writer);
 }
 schedule_read!(us_ref);
 schedule_read!(descriptor);
 } // we'll fire the disconnect event on the socket reader end
 Ok(())
 }));
Expand All@@ -251,9 +251,9 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
	}

	fn disconnect_socket(&mut self) {
 let mut us = self.conn.lock().unwrap();
us.need_disconnect = true;
us.read_paused = true;
 let mut connection = self.conn.lock().unwrap();
connection.need_disconnect = true;
connection.read_paused = true;
	}
}
impl<CMH: ChannelMessageHandler> Clone for SocketDescriptor<CMH> {
Expand Down

32 changes: 14 additions & 18 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ use util::byte_utils;
use util::events::{MessageSendEvent, MessageSendEventsProvider};
use util::logger::Logger;

use std::collections::{HashMap,hash_map,HashSet,LinkedList};
use std::collections::{HashMap,hash_map,LinkedList};
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::{cmp,error,hash,fmt};
Expand DownExpand Up@@ -120,6 +120,10 @@ struct Peer {
	sync_status: InitSyncTracker,

	awaiting_pong: bool,

	/// Indicates do_read_event() pushed a message into pending_outbound_buffer but didn't call
	/// do_attempt_write_data() to avoid reentrancy. Cleared in process_events().
	needing_send: bool,
}

impl Peer {
Expand All@@ -140,9 +144,6 @@ impl Peer {

struct PeerHolder<Descriptor: SocketDescriptor> {
	peers: HashMap<Descriptor, Peer>,
	/// Added to by do_read_event for cases where we pushed a message onto the send buffer but
	/// didn't call do_attempt_write_data to avoid reentrancy. Cleared in process_events()
	peers_needing_send: HashSet<Descriptor>,
	/// Only add to this set when noise completes:
	node_id_to_descriptor: HashMap<PublicKey, Descriptor>,
}
Expand DownExpand Up@@ -228,7 +229,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 message_handler: message_handler,
 peers: Mutex::new(PeerHolder {
 peers: HashMap::new(),
 peers_needing_send: HashSet::new(),
 node_id_to_descriptor: HashMap::new()
 }),
 our_node_secret: our_node_secret,
Expand DownExpand Up@@ -299,6 +299,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -336,6 +337,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -485,7 +487,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 {
 log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!($msg, $msg_code)[..]));
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
 }
 }
 }
Expand DownExpand Up@@ -644,7 +646,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

 if msg.features.initial_routing_sync() {
 peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;

Comment on lines

+647
 to 
+649

@jkczyzjkczyzJan 22, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheBlueMatt Could you explain why this needs to be set here?
@TheBlueMattTheBlueMattJan 22, 2020

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to stream out our routing db, we (obviously) dont copy the whole thing into our outbound send buff (otherwise we'd just OOM ourselves...), so the logic in do_attempt_write_data has to be hit to add messages to the send buffer if the buffer is empty.
 }

 if !peer.outbound {
Expand DownExpand Up@@ -1029,7 +1031,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 match *action {
 msgs::ErrorAction::DisconnectPeer { ref msg } => {
 if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
 peers.peers_needing_send.remove(&descriptor);
 if let Some(mut peer) = peers.peers.remove(&descriptor) {
 if let Some(ref msg) = *msg {
 log_trace!(self, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
Expand DownExpand Up@@ -1063,11 +1064,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 }
 }

 for mut descriptor in peers.peers_needing_send.drain() {
 match peers.peers.get_mut(&descriptor) {
 Some(peer) => self.do_attempt_write_data(&mut descriptor, peer),
 None => panic!("Inconsistent peers set state!"),
 }
 let peers_needing_send = peers.peers.iter_mut().filter(|(_, peer)| peer.needing_send);
 for (descriptor, peer) in peers_needing_send {
 peer.needing_send = false;
 self.do_attempt_write_data(&mut descriptor.clone(), peer)
 }
 }
	}
Expand All@@ -1084,9 +1084,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

	fn disconnect_event_internal(&self, descriptor: &Descriptor, no_connection_possible: bool) {
 let mut peers = self.peers.lock().unwrap();
 peers.peers_needing_send.remove(descriptor);
 let peer_option = peers.peers.remove(descriptor);
 match peer_option {
 match peers.peers.remove(descriptor) {
 None => panic!("Descriptor for disconnect_event is not already known to PeerManager"),
 Some(peer) => {
 match peer.their_node_id {
Expand All@@ -1108,13 +1106,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 let mut peers_lock = self.peers.lock().unwrap();
 {
 let peers = &mut *peers_lock;
 let peers_needing_send = &mut peers.peers_needing_send;
 let node_id_to_descriptor = &mut peers.node_id_to_descriptor;
 let peers = &mut peers.peers;

 peers.retain(|descriptor, peer| {
 if peer.awaiting_pong == true {
 peers_needing_send.remove(descriptor);
 match peer.their_node_id {
 Some(node_id) => {
 node_id_to_descriptor.remove(&node_id);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove peers_needing_send set from peer_handling by jkczyz · Pull Request #456 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove peers_needing_send set from peer_handling#456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkczyz
wants to merge
2
commits into

from

 Closed


Remove peers_needing_send set from peer_handling
#456
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f875f4

Indicate outstanding writes to peers directly


jkczyz Jan 21, 2020
7a03fe0

Remove overloaded 'us' in lightning-net-tokio


jkczyz Feb 2, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 44 additions & 44 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,13 @@ pub struct Connection {
}
impl Connection {
	fn schedule_read<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, us: Arc<Mutex<Self>>, reader: futures::stream::SplitStream<tokio_codec::Framed<TcpStream, tokio_codec::BytesCodec>>) {
 let us_ref = us.clone();
 let us_close_ref = us.clone();
 let peer_manager_ref = peer_manager.clone();
 let connection = us.clone();
 let connection_close = us.clone();
 let peer_manager_close = peer_manager.clone();
 tokio::spawn(reader.for_each(move |b| {
 let pending_read = b.to_vec();
 {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 assert!(lock.pending_read.is_empty());
 if lock.read_paused {
 lock.pending_read = pending_read;
Expand All@@ -60,31 +60,31 @@ impl Connection {
 }
 }
 //TODO: There's a race where we don't meet the requirements of disconnect_socket if its
 //called right here, after we release the us_ref lock in the scope above, but before we
 //called right here, after we release the connection lock in the scope above, but before we
 //call read_event!
 match peer_manager.read_event(&mut SocketDescriptor::new(us_ref.clone(), peer_manager.clone()), pending_read) {
 match peer_manager.read_event(&mut SocketDescriptor::new(connection.clone(), peer_manager.clone()), pending_read) {
 Ok(pause_read) => {
 if pause_read {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 lock.read_paused = true;
 }
 },
 Err(e) => {
us_ref.lock().unwrap().need_disconnect = false;
connection.lock().unwrap().need_disconnect = false;
 return future::Either::B(future::result(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))));
 }
 }

 if let Err(e) = us_ref.lock().unwrap().event_notify.try_send(()) {
 if let Err(e) = connection.lock().unwrap().event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
 }

 future::Either::B(future::result(Ok(())))
 }).then(move |_| {
 if us_close_ref.lock().unwrap().need_disconnect {
peer_manager_ref.disconnect_event(&SocketDescriptor::new(us_close_ref, peer_manager_ref.clone()));
 if connection_close.lock().unwrap().need_disconnect {
peer_manager_close.disconnect_event(&SocketDescriptor::new(connection_close, peer_manager_close.clone()));
 println!("Peer disconnected!");
 } else {
 println!("We disconnected peer!");
Expand All@@ -101,9 +101,9 @@ impl Connection {
 })).then(|_| {
 future::result(Ok(()))
 }));
 let us = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));
 let connection = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));

 (reader, us)
 (reader, connection)
	}

	/// Process incoming messages and feed outgoing messages on the provided socket generated by
Expand All@@ -112,10 +112,10 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_inbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, connection, reader);
 }
	}

Expand All@@ -126,11 +126,11 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_outbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, their_node_id: PublicKey, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(us.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(connection.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, connection, reader);
 } else {
 println!("Failed to write first full message to socket!");
 }
Expand DownExpand Up@@ -172,16 +172,16 @@ impl<CMH: ChannelMessageHandler> SocketDescriptor<CMH> {
impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescriptor<CMH> {
	fn send_data(&mut self, data: &[u8], resume_read: bool) -> usize {
 macro_rules! schedule_read {
 ($us_ref: expr) => {
 ($descriptor: expr) => {
 tokio::spawn(future::lazy(move || -> Result<(), ()> {
 let mut read_data = Vec::new();
 {
 let mut us = $us_ref.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut us.pending_read);
 let mut connection = $descriptor.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut connection.pending_read);
 }
 if !read_data.is_empty() {
 let mut us_clone = $us_ref.clone();
 match $us_ref.peer_manager.read_event(&mut us_clone, read_data) {
//let mut us_clone = $descriptor.clone();
 match $descriptor.peer_manager.read_event(&mut $descriptor.clone(), read_data) {
 Ok(pause_read) => {
 if pause_read { return Ok(()); }
 },
Expand All@@ -191,12 +191,12 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }
 }
 let mut us = $us_ref.conn.lock().unwrap();
 if let Some(sender) = us.read_blocker.take() {
 let mut connection = $descriptor.conn.lock().unwrap();
 if let Some(sender) = connection.read_blocker.take() {
 sender.send(Ok(())).unwrap();
 }
us.read_paused = false;
 if let Err(e) = us.event_notify.try_send(()) {
connection.read_paused = false;
 if let Err(e) = connection.event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
Expand All@@ -206,36 +206,36 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }

 let mut us = self.conn.lock().unwrap();
 let mut connection = self.conn.lock().unwrap();
 if resume_read {
 let us_ref = self.clone();
 schedule_read!(us_ref);
 let descriptor = self.clone();
 schedule_read!(descriptor);
 }
 if data.is_empty() { return 0; }
 if us.writer.is_none() {
us.read_paused = true;
 if connection.writer.is_none() {
connection.read_paused = true;
 return 0;
 }

 let mut bytes = bytes::BytesMut::with_capacity(data.len());
 bytes.put(data);
 let write_res = us.writer.as_mut().unwrap().start_send(bytes.freeze());
 let write_res = connection.writer.as_mut().unwrap().start_send(bytes.freeze());
 match write_res {
 Ok(res) => {
 match res {
 AsyncSink::Ready => {
 data.len()
 },
 AsyncSink::NotReady(_) => {
us.read_paused = true;
 let us_ref = self.clone();
 tokio::spawn(us.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
connection.read_paused = true;
 let descriptor = self.clone();
 tokio::spawn(connection.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
 if let Ok(writer) = writer_res {
 {
 let mut us = us_ref.conn.lock().unwrap();
us.writer = Some(writer);
 let mut connection = descriptor.conn.lock().unwrap();
connection.writer = Some(writer);
 }
 schedule_read!(us_ref);
 schedule_read!(descriptor);
 } // we'll fire the disconnect event on the socket reader end
 Ok(())
 }));
Expand All@@ -251,9 +251,9 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
	}

	fn disconnect_socket(&mut self) {
 let mut us = self.conn.lock().unwrap();
us.need_disconnect = true;
us.read_paused = true;
 let mut connection = self.conn.lock().unwrap();
connection.need_disconnect = true;
connection.read_paused = true;
	}
}
impl<CMH: ChannelMessageHandler> Clone for SocketDescriptor<CMH> {
Expand Down

32 changes: 14 additions & 18 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ use util::byte_utils;
use util::events::{MessageSendEvent, MessageSendEventsProvider};
use util::logger::Logger;

use std::collections::{HashMap,hash_map,HashSet,LinkedList};
use std::collections::{HashMap,hash_map,LinkedList};
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::{cmp,error,hash,fmt};
Expand DownExpand Up@@ -120,6 +120,10 @@ struct Peer {
	sync_status: InitSyncTracker,

	awaiting_pong: bool,

	/// Indicates do_read_event() pushed a message into pending_outbound_buffer but didn't call
	/// do_attempt_write_data() to avoid reentrancy. Cleared in process_events().
	needing_send: bool,
}

impl Peer {
Expand All@@ -140,9 +144,6 @@ impl Peer {

struct PeerHolder<Descriptor: SocketDescriptor> {
	peers: HashMap<Descriptor, Peer>,
	/// Added to by do_read_event for cases where we pushed a message onto the send buffer but
	/// didn't call do_attempt_write_data to avoid reentrancy. Cleared in process_events()
	peers_needing_send: HashSet<Descriptor>,
	/// Only add to this set when noise completes:
	node_id_to_descriptor: HashMap<PublicKey, Descriptor>,
}
Expand DownExpand Up@@ -228,7 +229,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 message_handler: message_handler,
 peers: Mutex::new(PeerHolder {
 peers: HashMap::new(),
 peers_needing_send: HashSet::new(),
 node_id_to_descriptor: HashMap::new()
 }),
 our_node_secret: our_node_secret,
Expand DownExpand Up@@ -299,6 +299,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -336,6 +337,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -485,7 +487,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 {
 log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!($msg, $msg_code)[..]));
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
 }
 }
 }
Expand DownExpand Up@@ -644,7 +646,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

 if msg.features.initial_routing_sync() {
 peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;

Comment on lines

+647
 to 
+649

@jkczyzjkczyzJan 22, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheBlueMatt Could you explain why this needs to be set here?
@TheBlueMattTheBlueMattJan 22, 2020

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to stream out our routing db, we (obviously) dont copy the whole thing into our outbound send buff (otherwise we'd just OOM ourselves...), so the logic in do_attempt_write_data has to be hit to add messages to the send buffer if the buffer is empty.
 }

 if !peer.outbound {
Expand DownExpand Up@@ -1029,7 +1031,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 match *action {
 msgs::ErrorAction::DisconnectPeer { ref msg } => {
 if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
 peers.peers_needing_send.remove(&descriptor);
 if let Some(mut peer) = peers.peers.remove(&descriptor) {
 if let Some(ref msg) = *msg {
 log_trace!(self, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
Expand DownExpand Up@@ -1063,11 +1064,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 }
 }

 for mut descriptor in peers.peers_needing_send.drain() {
 match peers.peers.get_mut(&descriptor) {
 Some(peer) => self.do_attempt_write_data(&mut descriptor, peer),
 None => panic!("Inconsistent peers set state!"),
 }
 let peers_needing_send = peers.peers.iter_mut().filter(|(_, peer)| peer.needing_send);
 for (descriptor, peer) in peers_needing_send {
 peer.needing_send = false;
 self.do_attempt_write_data(&mut descriptor.clone(), peer)
 }
 }
	}
Expand All@@ -1084,9 +1084,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

	fn disconnect_event_internal(&self, descriptor: &Descriptor, no_connection_possible: bool) {
 let mut peers = self.peers.lock().unwrap();
 peers.peers_needing_send.remove(descriptor);
 let peer_option = peers.peers.remove(descriptor);
 match peer_option {
 match peers.peers.remove(descriptor) {
 None => panic!("Descriptor for disconnect_event is not already known to PeerManager"),
 Some(peer) => {
 match peer.their_node_id {
Expand All@@ -1108,13 +1106,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 let mut peers_lock = self.peers.lock().unwrap();
 {
 let peers = &mut *peers_lock;
 let peers_needing_send = &mut peers.peers_needing_send;
 let node_id_to_descriptor = &mut peers.node_id_to_descriptor;
 let peers = &mut peers.peers;

 peers.retain(|descriptor, peer| {
 if peer.awaiting_pong == true {
 peers_needing_send.remove(descriptor);
 match peer.their_node_id {
 Some(node_id) => {
 node_id_to_descriptor.remove(&node_id);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove peers_needing_send set from peer_handling by jkczyz · Pull Request #456 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove peers_needing_send set from peer_handling#456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkczyz
wants to merge
2
commits into

from

 Closed


Remove peers_needing_send set from peer_handling
#456
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f875f4

Indicate outstanding writes to peers directly


jkczyz Jan 21, 2020
7a03fe0

Remove overloaded 'us' in lightning-net-tokio


jkczyz Feb 2, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 44 additions & 44 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,13 @@ pub struct Connection {
}
impl Connection {
	fn schedule_read<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, us: Arc<Mutex<Self>>, reader: futures::stream::SplitStream<tokio_codec::Framed<TcpStream, tokio_codec::BytesCodec>>) {
 let us_ref = us.clone();
 let us_close_ref = us.clone();
 let peer_manager_ref = peer_manager.clone();
 let connection = us.clone();
 let connection_close = us.clone();
 let peer_manager_close = peer_manager.clone();
 tokio::spawn(reader.for_each(move |b| {
 let pending_read = b.to_vec();
 {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 assert!(lock.pending_read.is_empty());
 if lock.read_paused {
 lock.pending_read = pending_read;
Expand All@@ -60,31 +60,31 @@ impl Connection {
 }
 }
 //TODO: There's a race where we don't meet the requirements of disconnect_socket if its
 //called right here, after we release the us_ref lock in the scope above, but before we
 //called right here, after we release the connection lock in the scope above, but before we
 //call read_event!
 match peer_manager.read_event(&mut SocketDescriptor::new(us_ref.clone(), peer_manager.clone()), pending_read) {
 match peer_manager.read_event(&mut SocketDescriptor::new(connection.clone(), peer_manager.clone()), pending_read) {
 Ok(pause_read) => {
 if pause_read {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 lock.read_paused = true;
 }
 },
 Err(e) => {
us_ref.lock().unwrap().need_disconnect = false;
connection.lock().unwrap().need_disconnect = false;
 return future::Either::B(future::result(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))));
 }
 }

 if let Err(e) = us_ref.lock().unwrap().event_notify.try_send(()) {
 if let Err(e) = connection.lock().unwrap().event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
 }

 future::Either::B(future::result(Ok(())))
 }).then(move |_| {
 if us_close_ref.lock().unwrap().need_disconnect {
peer_manager_ref.disconnect_event(&SocketDescriptor::new(us_close_ref, peer_manager_ref.clone()));
 if connection_close.lock().unwrap().need_disconnect {
peer_manager_close.disconnect_event(&SocketDescriptor::new(connection_close, peer_manager_close.clone()));
 println!("Peer disconnected!");
 } else {
 println!("We disconnected peer!");
Expand All@@ -101,9 +101,9 @@ impl Connection {
 })).then(|_| {
 future::result(Ok(()))
 }));
 let us = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));
 let connection = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));

 (reader, us)
 (reader, connection)
	}

	/// Process incoming messages and feed outgoing messages on the provided socket generated by
Expand All@@ -112,10 +112,10 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_inbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, connection, reader);
 }
	}

Expand All@@ -126,11 +126,11 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_outbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, their_node_id: PublicKey, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(us.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(connection.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, connection, reader);
 } else {
 println!("Failed to write first full message to socket!");
 }
Expand DownExpand Up@@ -172,16 +172,16 @@ impl<CMH: ChannelMessageHandler> SocketDescriptor<CMH> {
impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescriptor<CMH> {
	fn send_data(&mut self, data: &[u8], resume_read: bool) -> usize {
 macro_rules! schedule_read {
 ($us_ref: expr) => {
 ($descriptor: expr) => {
 tokio::spawn(future::lazy(move || -> Result<(), ()> {
 let mut read_data = Vec::new();
 {
 let mut us = $us_ref.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut us.pending_read);
 let mut connection = $descriptor.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut connection.pending_read);
 }
 if !read_data.is_empty() {
 let mut us_clone = $us_ref.clone();
 match $us_ref.peer_manager.read_event(&mut us_clone, read_data) {
//let mut us_clone = $descriptor.clone();
 match $descriptor.peer_manager.read_event(&mut $descriptor.clone(), read_data) {
 Ok(pause_read) => {
 if pause_read { return Ok(()); }
 },
Expand All@@ -191,12 +191,12 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }
 }
 let mut us = $us_ref.conn.lock().unwrap();
 if let Some(sender) = us.read_blocker.take() {
 let mut connection = $descriptor.conn.lock().unwrap();
 if let Some(sender) = connection.read_blocker.take() {
 sender.send(Ok(())).unwrap();
 }
us.read_paused = false;
 if let Err(e) = us.event_notify.try_send(()) {
connection.read_paused = false;
 if let Err(e) = connection.event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
Expand All@@ -206,36 +206,36 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }

 let mut us = self.conn.lock().unwrap();
 let mut connection = self.conn.lock().unwrap();
 if resume_read {
 let us_ref = self.clone();
 schedule_read!(us_ref);
 let descriptor = self.clone();
 schedule_read!(descriptor);
 }
 if data.is_empty() { return 0; }
 if us.writer.is_none() {
us.read_paused = true;
 if connection.writer.is_none() {
connection.read_paused = true;
 return 0;
 }

 let mut bytes = bytes::BytesMut::with_capacity(data.len());
 bytes.put(data);
 let write_res = us.writer.as_mut().unwrap().start_send(bytes.freeze());
 let write_res = connection.writer.as_mut().unwrap().start_send(bytes.freeze());
 match write_res {
 Ok(res) => {
 match res {
 AsyncSink::Ready => {
 data.len()
 },
 AsyncSink::NotReady(_) => {
us.read_paused = true;
 let us_ref = self.clone();
 tokio::spawn(us.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
connection.read_paused = true;
 let descriptor = self.clone();
 tokio::spawn(connection.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
 if let Ok(writer) = writer_res {
 {
 let mut us = us_ref.conn.lock().unwrap();
us.writer = Some(writer);
 let mut connection = descriptor.conn.lock().unwrap();
connection.writer = Some(writer);
 }
 schedule_read!(us_ref);
 schedule_read!(descriptor);
 } // we'll fire the disconnect event on the socket reader end
 Ok(())
 }));
Expand All@@ -251,9 +251,9 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
	}

	fn disconnect_socket(&mut self) {
 let mut us = self.conn.lock().unwrap();
us.need_disconnect = true;
us.read_paused = true;
 let mut connection = self.conn.lock().unwrap();
connection.need_disconnect = true;
connection.read_paused = true;
	}
}
impl<CMH: ChannelMessageHandler> Clone for SocketDescriptor<CMH> {
Expand Down

32 changes: 14 additions & 18 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ use util::byte_utils;
use util::events::{MessageSendEvent, MessageSendEventsProvider};
use util::logger::Logger;

use std::collections::{HashMap,hash_map,HashSet,LinkedList};
use std::collections::{HashMap,hash_map,LinkedList};
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::{cmp,error,hash,fmt};
Expand DownExpand Up@@ -120,6 +120,10 @@ struct Peer {
	sync_status: InitSyncTracker,

	awaiting_pong: bool,

	/// Indicates do_read_event() pushed a message into pending_outbound_buffer but didn't call
	/// do_attempt_write_data() to avoid reentrancy. Cleared in process_events().
	needing_send: bool,
}

impl Peer {
Expand All@@ -140,9 +144,6 @@ impl Peer {

struct PeerHolder<Descriptor: SocketDescriptor> {
	peers: HashMap<Descriptor, Peer>,
	/// Added to by do_read_event for cases where we pushed a message onto the send buffer but
	/// didn't call do_attempt_write_data to avoid reentrancy. Cleared in process_events()
	peers_needing_send: HashSet<Descriptor>,
	/// Only add to this set when noise completes:
	node_id_to_descriptor: HashMap<PublicKey, Descriptor>,
}
Expand DownExpand Up@@ -228,7 +229,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 message_handler: message_handler,
 peers: Mutex::new(PeerHolder {
 peers: HashMap::new(),
 peers_needing_send: HashSet::new(),
 node_id_to_descriptor: HashMap::new()
 }),
 our_node_secret: our_node_secret,
Expand DownExpand Up@@ -299,6 +299,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -336,6 +337,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -485,7 +487,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 {
 log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!($msg, $msg_code)[..]));
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
 }
 }
 }
Expand DownExpand Up@@ -644,7 +646,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

 if msg.features.initial_routing_sync() {
 peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;

Comment on lines

+647
 to 
+649

@jkczyzjkczyzJan 22, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheBlueMatt Could you explain why this needs to be set here?
@TheBlueMattTheBlueMattJan 22, 2020

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to stream out our routing db, we (obviously) dont copy the whole thing into our outbound send buff (otherwise we'd just OOM ourselves...), so the logic in do_attempt_write_data has to be hit to add messages to the send buffer if the buffer is empty.
 }

 if !peer.outbound {
Expand DownExpand Up@@ -1029,7 +1031,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 match *action {
 msgs::ErrorAction::DisconnectPeer { ref msg } => {
 if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
 peers.peers_needing_send.remove(&descriptor);
 if let Some(mut peer) = peers.peers.remove(&descriptor) {
 if let Some(ref msg) = *msg {
 log_trace!(self, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
Expand DownExpand Up@@ -1063,11 +1064,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 }
 }

 for mut descriptor in peers.peers_needing_send.drain() {
 match peers.peers.get_mut(&descriptor) {
 Some(peer) => self.do_attempt_write_data(&mut descriptor, peer),
 None => panic!("Inconsistent peers set state!"),
 }
 let peers_needing_send = peers.peers.iter_mut().filter(|(_, peer)| peer.needing_send);
 for (descriptor, peer) in peers_needing_send {
 peer.needing_send = false;
 self.do_attempt_write_data(&mut descriptor.clone(), peer)
 }
 }
	}
Expand All@@ -1084,9 +1084,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

	fn disconnect_event_internal(&self, descriptor: &Descriptor, no_connection_possible: bool) {
 let mut peers = self.peers.lock().unwrap();
 peers.peers_needing_send.remove(descriptor);
 let peer_option = peers.peers.remove(descriptor);
 match peer_option {
 match peers.peers.remove(descriptor) {
 None => panic!("Descriptor for disconnect_event is not already known to PeerManager"),
 Some(peer) => {
 match peer.their_node_id {
Expand All@@ -1108,13 +1106,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 let mut peers_lock = self.peers.lock().unwrap();
 {
 let peers = &mut *peers_lock;
 let peers_needing_send = &mut peers.peers_needing_send;
 let node_id_to_descriptor = &mut peers.node_id_to_descriptor;
 let peers = &mut peers.peers;

 peers.retain(|descriptor, peer| {
 if peer.awaiting_pong == true {
 peers_needing_send.remove(descriptor);
 match peer.their_node_id {
 Some(node_id) => {
 node_id_to_descriptor.remove(&node_id);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Remove peers_needing_send set from peer_handling by jkczyz · Pull Request #456 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove peers_needing_send set from peer_handling#456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jkczyz
wants to merge
2
commits into

from

 Closed


Remove peers_needing_send set from peer_handling
#456
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9f875f4

Indicate outstanding writes to peers directly


jkczyz Jan 21, 2020
7a03fe0

Remove overloaded 'us' in lightning-net-tokio


jkczyz Feb 2, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


88 changes: 44 additions & 44 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,13 @@ pub struct Connection {
}
impl Connection {
	fn schedule_read<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, us: Arc<Mutex<Self>>, reader: futures::stream::SplitStream<tokio_codec::Framed<TcpStream, tokio_codec::BytesCodec>>) {
 let us_ref = us.clone();
 let us_close_ref = us.clone();
 let peer_manager_ref = peer_manager.clone();
 let connection = us.clone();
 let connection_close = us.clone();
 let peer_manager_close = peer_manager.clone();
 tokio::spawn(reader.for_each(move |b| {
 let pending_read = b.to_vec();
 {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 assert!(lock.pending_read.is_empty());
 if lock.read_paused {
 lock.pending_read = pending_read;
Expand All@@ -60,31 +60,31 @@ impl Connection {
 }
 }
 //TODO: There's a race where we don't meet the requirements of disconnect_socket if its
 //called right here, after we release the us_ref lock in the scope above, but before we
 //called right here, after we release the connection lock in the scope above, but before we
 //call read_event!
 match peer_manager.read_event(&mut SocketDescriptor::new(us_ref.clone(), peer_manager.clone()), pending_read) {
 match peer_manager.read_event(&mut SocketDescriptor::new(connection.clone(), peer_manager.clone()), pending_read) {
 Ok(pause_read) => {
 if pause_read {
 let mut lock = us_ref.lock().unwrap();
 let mut lock = connection.lock().unwrap();
 lock.read_paused = true;
 }
 },
 Err(e) => {
us_ref.lock().unwrap().need_disconnect = false;
connection.lock().unwrap().need_disconnect = false;
 return future::Either::B(future::result(Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))));
 }
 }

 if let Err(e) = us_ref.lock().unwrap().event_notify.try_send(()) {
 if let Err(e) = connection.lock().unwrap().event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
 }

 future::Either::B(future::result(Ok(())))
 }).then(move |_| {
 if us_close_ref.lock().unwrap().need_disconnect {
peer_manager_ref.disconnect_event(&SocketDescriptor::new(us_close_ref, peer_manager_ref.clone()));
 if connection_close.lock().unwrap().need_disconnect {
peer_manager_close.disconnect_event(&SocketDescriptor::new(connection_close, peer_manager_close.clone()));
 println!("Peer disconnected!");
 } else {
 println!("We disconnected peer!");
Expand All@@ -101,9 +101,9 @@ impl Connection {
 })).then(|_| {
 future::result(Ok(()))
 }));
 let us = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));
 let connection = Arc::new(Mutex::new(Self { writer: Some(send_sink), event_notify, pending_read: Vec::new(), read_blocker: None, read_paused: false, need_disconnect: true, id: ID_COUNTER.fetch_add(1, Ordering::AcqRel) }));

 (reader, us)
 (reader, connection)
	}

	/// Process incoming messages and feed outgoing messages on the provided socket generated by
Expand All@@ -112,10 +112,10 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_inbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 Self::schedule_read(peer_manager, connection, reader);
 }
	}

Expand All@@ -126,11 +126,11 @@ impl Connection {
	/// You should poll the Receive end of event_notify and call get_and_clear_pending_events() on
	/// ChannelManager and ChannelMonitor objects.
	pub fn setup_outbound<CMH: ChannelMessageHandler + 'static>(peer_manager: Arc<peer_handler::PeerManager<SocketDescriptor<CMH>, Arc<CMH>>>, event_notify: mpsc::Sender<()>, their_node_id: PublicKey, stream: TcpStream) {
 let (reader, us) = Self::new(event_notify, stream);
 let (reader, connection) = Self::new(event_notify, stream);

 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(us.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, us, reader);
 if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(connection.clone(), peer_manager.clone())) {
 if SocketDescriptor::new(connection.clone(), peer_manager.clone()).send_data(&initial_send, true) == initial_send.len() {
 Self::schedule_read(peer_manager, connection, reader);
 } else {
 println!("Failed to write first full message to socket!");
 }
Expand DownExpand Up@@ -172,16 +172,16 @@ impl<CMH: ChannelMessageHandler> SocketDescriptor<CMH> {
impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescriptor<CMH> {
	fn send_data(&mut self, data: &[u8], resume_read: bool) -> usize {
 macro_rules! schedule_read {
 ($us_ref: expr) => {
 ($descriptor: expr) => {
 tokio::spawn(future::lazy(move || -> Result<(), ()> {
 let mut read_data = Vec::new();
 {
 let mut us = $us_ref.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut us.pending_read);
 let mut connection = $descriptor.conn.lock().unwrap();
 mem::swap(&mut read_data, &mut connection.pending_read);
 }
 if !read_data.is_empty() {
 let mut us_clone = $us_ref.clone();
 match $us_ref.peer_manager.read_event(&mut us_clone, read_data) {
//let mut us_clone = $descriptor.clone();
 match $descriptor.peer_manager.read_event(&mut $descriptor.clone(), read_data) {
 Ok(pause_read) => {
 if pause_read { return Ok(()); }
 },
Expand All@@ -191,12 +191,12 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }
 }
 let mut us = $us_ref.conn.lock().unwrap();
 if let Some(sender) = us.read_blocker.take() {
 let mut connection = $descriptor.conn.lock().unwrap();
 if let Some(sender) = connection.read_blocker.take() {
 sender.send(Ok(())).unwrap();
 }
us.read_paused = false;
 if let Err(e) = us.event_notify.try_send(()) {
connection.read_paused = false;
 if let Err(e) = connection.event_notify.try_send(()) {
 // Ignore full errors as we just need them to poll after this point, so if the user
 // hasn't received the last send yet, it doesn't matter.
 assert!(e.is_full());
Expand All@@ -206,36 +206,36 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
 }
 }

 let mut us = self.conn.lock().unwrap();
 let mut connection = self.conn.lock().unwrap();
 if resume_read {
 let us_ref = self.clone();
 schedule_read!(us_ref);
 let descriptor = self.clone();
 schedule_read!(descriptor);
 }
 if data.is_empty() { return 0; }
 if us.writer.is_none() {
us.read_paused = true;
 if connection.writer.is_none() {
connection.read_paused = true;
 return 0;
 }

 let mut bytes = bytes::BytesMut::with_capacity(data.len());
 bytes.put(data);
 let write_res = us.writer.as_mut().unwrap().start_send(bytes.freeze());
 let write_res = connection.writer.as_mut().unwrap().start_send(bytes.freeze());
 match write_res {
 Ok(res) => {
 match res {
 AsyncSink::Ready => {
 data.len()
 },
 AsyncSink::NotReady(_) => {
us.read_paused = true;
 let us_ref = self.clone();
 tokio::spawn(us.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
connection.read_paused = true;
 let descriptor = self.clone();
 tokio::spawn(connection.writer.take().unwrap().flush().then(move |writer_res| -> Result<(), ()> {
 if let Ok(writer) = writer_res {
 {
 let mut us = us_ref.conn.lock().unwrap();
us.writer = Some(writer);
 let mut connection = descriptor.conn.lock().unwrap();
connection.writer = Some(writer);
 }
 schedule_read!(us_ref);
 schedule_read!(descriptor);
 } // we'll fire the disconnect event on the socket reader end
 Ok(())
 }));
Expand All@@ -251,9 +251,9 @@ impl<CMH: ChannelMessageHandler> peer_handler::SocketDescriptor for SocketDescri
	}

	fn disconnect_socket(&mut self) {
 let mut us = self.conn.lock().unwrap();
us.need_disconnect = true;
us.read_paused = true;
 let mut connection = self.conn.lock().unwrap();
connection.need_disconnect = true;
connection.read_paused = true;
	}
}
impl<CMH: ChannelMessageHandler> Clone for SocketDescriptor<CMH> {
Expand Down

32 changes: 14 additions & 18 deletions
lightning/src/ln/peer_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ use util::byte_utils;
use util::events::{MessageSendEvent, MessageSendEventsProvider};
use util::logger::Logger;

use std::collections::{HashMap,hash_map,HashSet,LinkedList};
use std::collections::{HashMap,hash_map,LinkedList};
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::{cmp,error,hash,fmt};
Expand DownExpand Up@@ -120,6 +120,10 @@ struct Peer {
	sync_status: InitSyncTracker,

	awaiting_pong: bool,

	/// Indicates do_read_event() pushed a message into pending_outbound_buffer but didn't call
	/// do_attempt_write_data() to avoid reentrancy. Cleared in process_events().
	needing_send: bool,
}

impl Peer {
Expand All@@ -140,9 +144,6 @@ impl Peer {

struct PeerHolder<Descriptor: SocketDescriptor> {
	peers: HashMap<Descriptor, Peer>,
	/// Added to by do_read_event for cases where we pushed a message onto the send buffer but
	/// didn't call do_attempt_write_data to avoid reentrancy. Cleared in process_events()
	peers_needing_send: HashSet<Descriptor>,
	/// Only add to this set when noise completes:
	node_id_to_descriptor: HashMap<PublicKey, Descriptor>,
}
Expand DownExpand Up@@ -228,7 +229,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 message_handler: message_handler,
 peers: Mutex::new(PeerHolder {
 peers: HashMap::new(),
 peers_needing_send: HashSet::new(),
 node_id_to_descriptor: HashMap::new()
 }),
 our_node_secret: our_node_secret,
Expand DownExpand Up@@ -299,6 +299,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -336,6 +337,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 sync_status: InitSyncTracker::NoSyncRequested,

 awaiting_pong: false,
 needing_send: false,
 }).is_some() {
 panic!("PeerManager driver duplicated descriptors!");
 };
Expand DownExpand Up@@ -485,7 +487,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 {
 log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
 peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!($msg, $msg_code)[..]));
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;
 }
 }
 }
Expand DownExpand Up@@ -644,7 +646,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

 if msg.features.initial_routing_sync() {
 peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
peers.peers_needing_send.insert(peer_descriptor.clone());
peer.needing_send = true;

Comment on lines

+647
 to 
+649

@jkczyzjkczyzJan 22, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheBlueMatt Could you explain why this needs to be set here?
@TheBlueMattTheBlueMattJan 22, 2020

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to stream out our routing db, we (obviously) dont copy the whole thing into our outbound send buff (otherwise we'd just OOM ourselves...), so the logic in do_attempt_write_data has to be hit to add messages to the send buffer if the buffer is empty.
 }

 if !peer.outbound {
Expand DownExpand Up@@ -1029,7 +1031,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 match *action {
 msgs::ErrorAction::DisconnectPeer { ref msg } => {
 if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
 peers.peers_needing_send.remove(&descriptor);
 if let Some(mut peer) = peers.peers.remove(&descriptor) {
 if let Some(ref msg) = *msg {
 log_trace!(self, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
Expand DownExpand Up@@ -1063,11 +1064,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 }
 }

 for mut descriptor in peers.peers_needing_send.drain() {
 match peers.peers.get_mut(&descriptor) {
 Some(peer) => self.do_attempt_write_data(&mut descriptor, peer),
 None => panic!("Inconsistent peers set state!"),
 }
 let peers_needing_send = peers.peers.iter_mut().filter(|(_, peer)| peer.needing_send);
 for (descriptor, peer) in peers_needing_send {
 peer.needing_send = false;
 self.do_attempt_write_data(&mut descriptor.clone(), peer)
 }
 }
	}
Expand All@@ -1084,9 +1084,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where

	fn disconnect_event_internal(&self, descriptor: &Descriptor, no_connection_possible: bool) {
 let mut peers = self.peers.lock().unwrap();
 peers.peers_needing_send.remove(descriptor);
 let peer_option = peers.peers.remove(descriptor);
 match peer_option {
 match peers.peers.remove(descriptor) {
 None => panic!("Descriptor for disconnect_event is not already known to PeerManager"),
 Some(peer) => {
 match peer.their_node_id {
Expand All@@ -1108,13 +1106,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 let mut peers_lock = self.peers.lock().unwrap();
 {
 let peers = &mut *peers_lock;
 let peers_needing_send = &mut peers.peers_needing_send;
 let node_id_to_descriptor = &mut peers.node_id_to_descriptor;
 let peers = &mut peers.peers;

 peers.retain(|descriptor, peer| {
 if peer.awaiting_pong == true {
 peers_needing_send.remove(descriptor);
 match peer.their_node_id {
 Some(node_id) => {
 node_id_to_descriptor.remove(&node_id);
Expand Down