external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity

RTC: Cover connection manager coroutine switch when dispoing conn

Browse source
This commit is contained in:
winlin 2020-09-17 11:44:16 +08:00
parent 27b85c7390
commit f7faa13dc5
3 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
trunk/src/utest/srs_utest_rtc.cpp
View file

@ -41,6 +41,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest)
{
srs_error_t err = srs_success;
// Normal scenario, free object by manager.
if (true) {
SrsConnectionManager manager;
HELPER_EXPECT_SUCCESS(manager.start());
@ -54,6 +55,38 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest)
srs_usleep(0); // Switch context for manager to dispose connections.
EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty());
}
// Coroutine switch context, signal is lost.
if (true) {
SrsConnectionManager manager;
HELPER_EXPECT_SUCCESS(manager.start());
EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty());
if (true) { // First connection, which will switch context when deleting.
MockSrsConnection* conn = new MockSrsConnection();
conn->do_switch = true;
manager.add(conn);
EXPECT_EQ(1, manager.size()); EXPECT_EQ(0, manager.zombies_.size());
manager.remove(conn); // Remove conn to zombies.
EXPECT_EQ(1, manager.size()); EXPECT_EQ(1, manager.zombies_.size());
srs_usleep(0); // Switch to manager coroutine to try to free zombies.
EXPECT_EQ(0, manager.size()); EXPECT_EQ(0, manager.zombies_.size());
}
if (true) { // Now the previous conn switch back to here, and lost the signal.
MockSrsConnection* conn = new MockSrsConnection();
manager.add(conn);
EXPECT_EQ(1, manager.size()); EXPECT_EQ(0, manager.zombies_.size());
manager.remove(conn); // Remove conn to zombies, signal is lost.
EXPECT_EQ(1, manager.size()); EXPECT_EQ(1, manager.zombies_.size());
srs_usleep(0); // Switch to manager, but no signal is triggered before, so conn will be freed by loop.
EXPECT_EQ(0, manager.size()); EXPECT_EQ(0, manager.zombies_.size());
}
}
}
VOID TEST(KernelRTCTest, StringDumpHexTest)

4
trunk/src/utest/srs_utest_service.cpp
View file

@ -44,10 +44,14 @@ using namespace std;
MockSrsConnection::MockSrsConnection()
{
do_switch = false;
}
MockSrsConnection::~MockSrsConnection()
{
if (do_switch) {
srs_usleep(0);
}
}
std::string MockSrsConnection::remote_ip()

3
trunk/src/utest/srs_utest_service.hpp
View file

@ -34,6 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class MockSrsConnection : public ISrsConnection
{
public:
// Whether switch the coroutine context when free the object, for special case test.
bool do_switch;
public:
MockSrsConnection();
virtual ~MockSrsConnection();