feedc0de/boost_beast
1
0 Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Fix soft-mutex assert in websocket stream:

Browse Source 
Fix #1000

This resolves the assert 'ws_.wr_block_ == tok_'.
This commit is contained in:
Vinnie Falco committed 2018-02-16 10:51:28 -08:00
1 parent 9f3c981d6a
commit ab32400d00
12 files changed
+173 -162
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/beast/websocket/read2.cpp
+8 -8
View File
@@ -43,7 +43,7 @@ public:
system_error{ec});
BEAST_EXPECT(++count == 1);
});
while(! ws.rd_block_)
while(! ws.rd_block_.is_locked())
ioc.run_one();
multi_buffer b;
ws.async_read(b,
@@ -78,7 +78,7 @@ public:
system_error{ec});
BEAST_EXPECT(++count == 2);
});
BOOST_ASSERT(ws.rd_block_);
BOOST_ASSERT(ws.rd_block_.is_locked());
ws.async_close({},
[&](error_code ec)
{
@@ -115,7 +115,7 @@ public:
BEAST_EXPECT(to_string(b.data()) == s);
++count;
});
BEAST_EXPECT(ws.rd_block_);
BEAST_EXPECT(ws.rd_block_.is_locked());
ws.async_write(buffer(s),
[&](error_code ec, std::size_t n)
{
@@ -125,7 +125,7 @@ public:
BEAST_EXPECT(n == s.size());
++count;
});
BEAST_EXPECT(ws.wr_block_);
BEAST_EXPECT(ws.wr_block_.is_locked());
ioc.run();
BEAST_EXPECT(count == 2);
});
@@ -164,7 +164,7 @@ public:
BEAST_EXPECT(++count == 3);
});
});
BEAST_EXPECT(ws.rd_block_);
BEAST_EXPECT(ws.rd_block_.is_locked());
ws.async_close({},
[&](error_code ec)
{
@@ -173,7 +173,7 @@ public:
system_error{ec});
BEAST_EXPECT(++count == 2);
});
BEAST_EXPECT(ws.wr_block_);
BEAST_EXPECT(ws.wr_block_.is_locked());
ioc.run();
BEAST_EXPECT(count == 3);
});
@@ -202,7 +202,7 @@ public:
system_error{ec});
BEAST_EXPECT(++count == 2);
});
BEAST_EXPECT(ws.rd_block_);
BEAST_EXPECT(ws.rd_block_.is_locked());
ws.async_close({},
[&](error_code ec)
{
@@ -211,7 +211,7 @@ public:
system_error{ec});
BEAST_EXPECT(++count == 1);
});
BEAST_EXPECT(ws.wr_block_);
BEAST_EXPECT(ws.wr_block_.is_locked());
ioc.run();
BEAST_EXPECT(count == 2);
});