f tokio fixed bug?

Author: TheBlueMatt

lightning-net-tokio/src/lib.rs

@@ -235,7 +235,8 @@ fn wake_socket_waker_by_ref(orig_ptr: *const ()) {
 	// fully write, but we only need to provide a write_event() once. Otherwise, the sending thread
 	// may have already gone away due to a socket close, in which case there's nothing to wake up
 	// anyway.
-	let _ = unsafe { (*descriptor).write_avail.clone() }.try_send(());
+	let mut us = unsafe { (*descriptor).conn.lock() }.unwrap();
+	let _ = us.write_avail.try_send(());
 }
 fn drop_socket_waker(orig_ptr: *const ()) {
 	let _orig_box = unsafe { Box::from_raw(orig_ptr as *mut SocketDescriptor) };
@@ -249,19 +250,12 @@ fn descriptor_to_waker(descriptor: *const SocketDescriptor) -> task::RawWaker {
 
 pub struct SocketDescriptor {
 	conn: Arc<Mutex<Connection>>,
-	// Ideally we'd just lock conn and push to the write_avail there, but sadly tokio calls our
-	// waker irrespective of available space on the first poll_write call, which would result in a
-	// deadlock, so instead we keep a copy in each SocketDescriptor.
-	write_avail: mpsc::Sender<()>,
 	id: u64,
 }
 impl SocketDescriptor {
 	fn new(conn: Arc<Mutex<Connection>>) -> Self {
-		let (id, write_avail) = {
-			let us = conn.lock().unwrap();
-			(us.id, us.write_avail.clone())
-		};
-		Self { conn, write_avail, id }
+		let id = conn.lock().unwrap().id;
+		Self { conn, id }
 	}
 }
 impl peer_handler::SocketDescriptor for SocketDescriptor {
@@ -329,7 +323,6 @@ impl Clone for SocketDescriptor {
 	fn clone(&self) -> Self {
 		Self {
 			conn: Arc::clone(&self.conn),
-			write_avail: self.write_avail.clone(),
 			id: self.id,
 		}
 	}