From 732f3ae10a95c98f5f29999caef454d294441912 Mon Sep 17 00:00:00 2001
From: Danil Platonov <platonov.danil.ivanovich@gmail.com>
Date: Tue, 2 Jun 2026 00:49:00 -0700
Subject: [PATCH] use Notify instead of Sender

---
 src/http.rs                 |  3 ++-
 src/machine/system_calls.rs | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/http.rs b/src/http.rs
index 939dbe7d..d9f669d7 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -1,11 +1,12 @@
 use bytes::{buf::Reader, Bytes};
 use std::sync::{Arc, Condvar, Mutex};
+use tokio::sync::Notify;
 
 use warp::http;
 
 pub struct HttpListener {
     pub incoming: std::sync::mpsc::Receiver<HttpRequest>,
-    pub warp_shutdown: tokio::sync::mpsc::Sender<()>,
+    pub warp_shutdown: Arc<Notify>,
 }
 
 pub struct HttpRequest {
diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs
index 3aba0c17..1201e369 100644
--- a/src/machine/system_calls.rs
+++ b/src/machine/system_calls.rs
@@ -61,6 +61,7 @@ use std::str::FromStr;
 use std::sync::LazyLock;
 #[cfg(feature = "http")]
 use std::sync::{Arc, Condvar, Mutex};
+use tokio::sync::Notify;
 
 use chrono::{offset::Local, DateTime};
 #[cfg(not(target_arch = "wasm32"))]
@@ -4594,7 +4595,7 @@ impl Machine {
             let (tx, rx) = std::sync::mpsc::sync_channel(1024);
 
             // warp shutdown channel
-            let (warp_shutdown_tx, mut warp_shutdown_rx) = tokio::sync::mpsc::channel(1);
+            let warp_shutdown = Arc::new(Notify::new());
 
             let runtime = tokio::runtime::Handle::current();
             let _guard = runtime.enter();
@@ -4657,6 +4658,7 @@ impl Machine {
                     },
                 );
 
+            let warp_shutdown_clone = warp_shutdown.clone();
             runtime.spawn(async move {
                 match ssl_server {
                     Some((key, cert)) => {
@@ -4665,7 +4667,7 @@ impl Machine {
                             .key(key)
                             .cert(cert)
                             .bind_with_graceful_shutdown(addr, async move {
-                                warp_shutdown_rx.recv().await;
+                                warp_shutdown_clone.notified().await;
                             });
 
                         tokio::task::spawn(server);
@@ -4673,7 +4675,7 @@ impl Machine {
                     None => {
                         let (_addr, server) =
                             warp::serve(serve).bind_with_graceful_shutdown(addr, async move {
-                                warp_shutdown_rx.recv().await;
+                                warp_shutdown_clone.notified().await;
                             });
 
                         tokio::task::spawn(server);
@@ -4683,7 +4685,7 @@ impl Machine {
 
             let http_listener = HttpListener {
                 incoming: rx,
-                warp_shutdown: warp_shutdown_tx,
+                warp_shutdown: warp_shutdown,
             };
             let http_listener: TypedArenaPtr<HttpListener> =
                 arena_alloc!(http_listener, &mut self.machine_st.arena);
@@ -4706,7 +4708,7 @@ impl Machine {
             (HeapCellValueTag::Cons, cons_ptr) => {
                 match_untyped_arena_ptr!(cons_ptr,
                     (ArenaHeaderTag::HttpListener, http_listener) => {
-                        let _ = futures::executor::block_on(http_listener.warp_shutdown.send(()));
+                        http_listener.warp_shutdown.notify_one();
                     }
                     _ => {
                             unreachable!();
-- 
2.54.0