external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

RTC: Refine resouce management

Browse source
This commit is contained in:
winlin 2020-09-19 10:30:05 +08:00
parent 1173d35e33
commit 64705d1cc8
29 changed files with 364 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest)
// Normal scenario, free object by manager.
if (true) {
SrsConnectionManager manager;
SrsResourceManager manager;
HELPER_EXPECT_SUCCESS(manager.start());
EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty());
@ -58,7 +58,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest)
// Coroutine switch context, signal is lost.
if (true) {
SrsConnectionManager manager;
SrsResourceManager manager;
HELPER_EXPECT_SUCCESS(manager.start());
EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty());

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

@ -54,6 +54,16 @@ MockSrsConnection::~MockSrsConnection()
}
}
const SrsContextId& MockSrsConnection::get_id()
{
return _srs_context->get_id();
}
std::string MockSrsConnection::desc()
{
return "Mock";
}
std::string MockSrsConnection::remote_ip()
{
return "127.0.0.1";
@ -1371,7 +1381,7 @@ VOID TEST(HTTPClientTest, HTTPClientUtility)
}
}
class MockConnectionManager : public IConnectionManager
class MockConnectionManager : public ISrsResourceManager
{
public:
MockConnectionManager() {
@ -1379,7 +1389,7 @@ public:
virtual ~MockConnectionManager() {
}
public:
virtual void remove(ISrsConnection* /*c*/) {
virtual void remove(ISrsResource* /*c*/) {
}
};

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

@ -40,6 +40,8 @@ public:
public:
MockSrsConnection();
virtual ~MockSrsConnection();
virtual const SrsContextId& get_id();
virtual std::string desc();
virtual std::string remote_ip();
};