From 3d18008ce439969e810572ade671c07663b49fe1 Mon Sep 17 00:00:00 2001
From: youngwolf
Date: Wed, 3 Feb 2021 15:59:40 +0800
Subject: [PATCH] Avoid accessing the send queue concurrently for demo
file_server.
---
asio | 2 +-
examples/file_server/file_socket.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/asio b/asio
index 77ed338..0355fc5 160000
--- a/asio
+++ b/asio
@@ -1 +1 @@
-Subproject commit 77ed33821d6473d6904ef3171e318181c015003a
+Subproject commit 0355fc59807198034780c814c799ed353ffe960f
diff --git a/examples/file_server/file_socket.cpp b/examples/file_server/file_socket.cpp
index fa440d9..8f9e148 100644
--- a/examples/file_server/file_socket.cpp
+++ b/examples/file_server/file_socket.cpp
@@ -57,7 +57,7 @@ void file_socket::handle_msg(out_msg_ctype& msg)
switch (*msg.data())
{
case 0:
- if (TRANS_IDLE == state)
+ if (TRANS_IDLE == state && !is_sending()) //avoid accessing the send queue concurrently, because we used non_lock_queue
{
trans_end();
--
GitLab