From fe813ee247b01a5b1d509a2d533ce4fbd84d9227 Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <valenok@gmail.com>
Date: Wed, 19 Jan 2022 09:25:01 +0000
Subject: [PATCH] Add buf,len params to mg_mgr_wakeup()

---
 docs/README.md                 |  7 +++++--
 examples/multi-threaded/main.c |  7 ++++---
 mongoose.c                     | 10 +++++++---
 mongoose.h                     | 10 +++++-----
 src/fs.h                       |  8 ++++----
 src/net.h                      |  2 +-
 src/sock.c                     | 10 +++++++---
 test/mongoose_custom.c         |  4 ++--
 test/unit_test.c               |  2 +-
 9 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index ac46ff80..fe8de018 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -687,14 +687,17 @@ Usage example: see [examples/multi-threaded](https://github.com/cesanta/mongoose
 ### mg\_mgr\_wakeup()
 
 ```c
-void mg_mgr_wakeup(struct mg_connection *pipe);
+void mg_mgr_wakeup(struct mg_connection *pipe, const void *buf, size_len len);
 ```
 
 Wake up an event manager that sleeps in `mg_mgr_poll()` call. This function
-must be called from a separate task/thread. Parameters:
+must be called from a separate task/thread. A calling thread can pass
+some specific data to the IO thread via `buf`, `len`. Parameters:
 
 Parameters:
 - `pipe` - a special connection created by the `mg_mkpipe()` call
+- `buf` - a data to send to the pipe connection. Use `""` if there is no data 
+- `len` - a data length
 
 Return value: None
 
diff --git a/examples/multi-threaded/main.c b/examples/multi-threaded/main.c
index 02aa020e..d81faa9a 100644
--- a/examples/multi-threaded/main.c
+++ b/examples/multi-threaded/main.c
@@ -37,7 +37,7 @@ static void start_thread(void (*f)(void *), void *p) {
 static void thread_function(void *param) {
   struct mg_connection *c = param;  // Pipe connection
   sleep(2);                         // Simulate long execution
-  mg_mgr_wakeup(c);                 // Wakeup event manager
+  mg_mgr_wakeup(c, "hi", 2);        // Wakeup event manager
 }
 
 // HTTP request callback
@@ -62,8 +62,9 @@ static void pcb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     struct mg_connection *t;
     for (t = c->mgr->conns; t != NULL; t = t->next) {
       if (t->label[0] != 'W') continue;  // Ignore un-marked connections
-      mg_http_reply(t, 200, "Host: foo.com\r\n", "hi\n");  // Respond!
-      t->label[0] = 0;                                     // Clear mark
+      mg_http_reply(t, 200, "Host: foo.com\r\n", "%.*s\n", c->recv.len,
+                    c->recv.buf);  // Respond!
+      t->label[0] = 0;             // Clear mark
     }
   }
 }
diff --git a/mongoose.c b/mongoose.c
index 6c1b2950..64f50aec 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -3510,13 +3510,17 @@ static bool mg_socketpair(SOCKET sp[2], union usa usa[2]) {
   return result;
 }
 
-void mg_mgr_wakeup(struct mg_connection *c) {
+void mg_mgr_wakeup(struct mg_connection *c, const void *buf, size_t len) {
   LOG(LL_INFO, ("skt: %p", c->pfn_data));
-  send((SOCKET) (size_t) c->pfn_data, "\x01", 1, MSG_NONBLOCKING);
+  send((SOCKET) (size_t) c->pfn_data, (const char *) buf, len, MSG_NONBLOCKING);
 }
 
 static void pf1(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
-  if (ev == MG_EV_READ) mg_iobuf_free(&c->recv);
+  if (ev == MG_EV_READ) {
+    mg_iobuf_free(&c->recv);
+  } else if (ev == MG_EV_CLOSE) {
+    closesocket((SOCKET) (size_t) c->pfn_data);
+  }
   (void) ev_data, (void) fn_data;
 }
 
diff --git a/mongoose.h b/mongoose.h
index b8650524..f0abf996 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -637,6 +637,10 @@ struct mg_fs {
   bool (*mkd)(const char *path);                           // Create directory
 };
 
+extern struct mg_fs mg_fs_posix;   // POSIX open/close/read/write/seek
+extern struct mg_fs mg_fs_packed;  // Packed FS, see examples/complete
+extern struct mg_fs mg_fs_fat;     // FAT FS
+
 // File descriptor
 struct mg_fd {
   void *fd;
@@ -649,10 +653,6 @@ char *mg_file_read(struct mg_fs *fs, const char *path, size_t *size);
 bool mg_file_write(struct mg_fs *fs, const char *path, const void *, size_t);
 bool mg_file_printf(struct mg_fs *fs, const char *path, const char *fmt, ...);
 
-extern struct mg_fs mg_fs_posix;   // POSIX open/close/read/write/seek
-extern struct mg_fs mg_fs_packed;  // Packed FS, see examples/complete
-extern struct mg_fs mg_fs_fat;     // FAT FS
-
 
 
 
@@ -882,7 +882,7 @@ bool mg_aton(struct mg_str str, struct mg_addr *addr);
 char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len);
 
 struct mg_connection *mg_mkpipe(struct mg_mgr *, mg_event_handler_t, void *);
-void mg_mgr_wakeup(struct mg_connection *pipe);
+void mg_mgr_wakeup(struct mg_connection *pipe, const void *buf, size_t len);
 
 
 
diff --git a/src/fs.h b/src/fs.h
index c84c4ee5..39e62b0f 100644
--- a/src/fs.h
+++ b/src/fs.h
@@ -21,6 +21,10 @@ struct mg_fs {
   bool (*mkd)(const char *path);                           // Create directory
 };
 
+extern struct mg_fs mg_fs_posix;   // POSIX open/close/read/write/seek
+extern struct mg_fs mg_fs_packed;  // Packed FS, see examples/complete
+extern struct mg_fs mg_fs_fat;     // FAT FS
+
 // File descriptor
 struct mg_fd {
   void *fd;
@@ -32,7 +36,3 @@ void mg_fs_close(struct mg_fd *fd);
 char *mg_file_read(struct mg_fs *fs, const char *path, size_t *size);
 bool mg_file_write(struct mg_fs *fs, const char *path, const void *, size_t);
 bool mg_file_printf(struct mg_fs *fs, const char *path, const char *fmt, ...);
-
-extern struct mg_fs mg_fs_posix;   // POSIX open/close/read/write/seek
-extern struct mg_fs mg_fs_packed;  // Packed FS, see examples/complete
-extern struct mg_fs mg_fs_fat;     // FAT FS
diff --git a/src/net.h b/src/net.h
index 55d582f2..41f50956 100644
--- a/src/net.h
+++ b/src/net.h
@@ -76,4 +76,4 @@ bool mg_aton(struct mg_str str, struct mg_addr *addr);
 char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len);
 
 struct mg_connection *mg_mkpipe(struct mg_mgr *, mg_event_handler_t, void *);
-void mg_mgr_wakeup(struct mg_connection *pipe);
+void mg_mgr_wakeup(struct mg_connection *pipe, const void *buf, size_t len);
diff --git a/src/sock.c b/src/sock.c
index 43ef27a5..b9dca1b0 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -444,13 +444,17 @@ static bool mg_socketpair(SOCKET sp[2], union usa usa[2]) {
   return result;
 }
 
-void mg_mgr_wakeup(struct mg_connection *c) {
+void mg_mgr_wakeup(struct mg_connection *c, const void *buf, size_t len) {
   LOG(LL_INFO, ("skt: %p", c->pfn_data));
-  send((SOCKET) (size_t) c->pfn_data, "\x01", 1, MSG_NONBLOCKING);
+  send((SOCKET) (size_t) c->pfn_data, (const char *) buf, len, MSG_NONBLOCKING);
 }
 
 static void pf1(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
-  if (ev == MG_EV_READ) mg_iobuf_free(&c->recv);
+  if (ev == MG_EV_READ) {
+    mg_iobuf_free(&c->recv);
+  } else if (ev == MG_EV_CLOSE) {
+    closesocket((SOCKET) (size_t) c->pfn_data);
+  }
   (void) ev_data, (void) fn_data;
 }
 
diff --git a/test/mongoose_custom.c b/test/mongoose_custom.c
index eac99850..86bf988c 100644
--- a/test/mongoose_custom.c
+++ b/test/mongoose_custom.c
@@ -31,8 +31,8 @@ bool mg_send(struct mg_connection *c, const void *buf, size_t len) {
   return 0;
 }
 
-void mg_mgr_wakeup(struct mg_connection *c) {
-  (void) c;
+void mg_mgr_wakeup(struct mg_connection *c, const void *buf, size_t len) {
+  (void) c, (void) buf, (void) len;
 }
 
 struct mg_connection *mg_mkpipe(struct mg_mgr *mgr, mg_event_handler_t fn,
diff --git a/test/unit_test.c b/test/unit_test.c
index cd8db87d..3c5a9f68 100644
--- a/test/unit_test.c
+++ b/test/unit_test.c
@@ -1504,7 +1504,7 @@ static void test_pipe(void) {
   int i, done = 0;
   mg_mgr_init(&mgr);
   ASSERT((c = mg_mkpipe(&mgr, eh6, (void *) &done)) != NULL);
-  mg_mgr_wakeup(c);
+  mg_mgr_wakeup(c, "", 1);
   for (i = 0; i < 10 && done == 0; i++) mg_mgr_poll(&mgr, 1);
   ASSERT(done == 1);
   mg_mgr_free(&mgr);