From fc21fcc92086a4b44e0e79e3b367d6408c855e71 Mon Sep 17 00:00:00 2001
From: pca006132 <john.lck40@gmail.com>
Date: Tue, 4 Aug 2020 14:30:40 +0800
Subject: [PATCH] runtime/comms: removed sync_channel hack.

Fixes #80
---
 src/runtime/src/comms.rs | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/runtime/src/comms.rs b/src/runtime/src/comms.rs
index 295ffb1..63b5a55 100644
--- a/src/runtime/src/comms.rs
+++ b/src/runtime/src/comms.rs
@@ -18,7 +18,7 @@ use libboard_zynq::{
     },
     timer::GlobalTimer,
 };
-use libcortex_a9::sync_channel;
+use libcortex_a9::semaphore::Semaphore;
 use futures::{select_biased, future::FutureExt};
 use libasync::{smoltcp::{Sockets, TcpStream}, task};
 
@@ -353,30 +353,25 @@ pub fn main(timer: GlobalTimer, cfg: &config::Config) {
     }
 
     task::spawn(async move {
-        let (tx, rx) = sync_channel!(u32, 1);
-        let tx = RefCell::new(tx);
-        let rx = Rc::new(RefCell::new(rx));
-        let has_connection = Rc::new(RefCell::new(false));
+        let connection = Rc::new(Semaphore::new(1, 1));
+        let terminate = Rc::new(Semaphore::new(0, 1));
         loop {
             let stream = TcpStream::accept(1381, 2048, 2048).await.unwrap();
-            let has_connection = has_connection.clone();
 
-            if *has_connection.borrow() {
-                let mut tx = tx.borrow_mut();
-                tx.async_send(42).await;
-                // the second send is used to block until another connection received the abort
-                // request.
-                tx.async_send(42).await;
+            if connection.try_wait().is_none() {
+                // there is an existing connection
+                terminate.signal();
+                connection.async_wait().await;
             }
 
-            *has_connection.borrow_mut() = true;
             let control = control.clone();
             let idle_kernel = idle_kernel.clone();
-            let _ = rx.borrow_mut().try_recv();
+            let connection = connection.clone();
+            let terminate = terminate.clone();
 
-            let new_rx = rx.clone();
+            // we make sure the value of terminate is 0 before we start
+            let _ = terminate.try_wait();
             task::spawn(async move {
-                let mut new_rx = new_rx.borrow_mut();
                 select_biased! {
                     _ = (async {
                         let _ = handle_connection(&stream, control.clone())
@@ -392,14 +387,9 @@ pub fn main(timer: GlobalTimer, cfg: &config::Config) {
                             info!("Idle kernel terminated");
                         }
                     }).fuse() => (),
-                    _ = new_rx.async_recv().fuse() => ()
+                    _ = terminate.async_wait().fuse() => ()
                 }
-                *has_connection.borrow_mut() = false;
-                // it is possible that when `handle_connection` is terminating,
-                // another connection sent an abort request and get blocked,
-                // so we try_recv here to unblock in that case.
-                let _ = new_rx.try_recv();
-                core::mem::drop(new_rx);
+                connection.signal();
                 let _ = stream.flush().await;
                 let _ = stream.abort().await;
             });