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

Fix context string ID bug

Browse source
This commit is contained in:
winlin 2020-06-19 08:57:18 +08:00
parent 83ce78a015
commit 7627c290c9
4 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/utest/srs_utest.cpp
View file

@ -129,3 +129,11 @@ VOID TEST(SampleTest, FastSampleMacrosTest)
EXPECT_NEAR(10, 15, 5); EXPECT_NEAR(10, 15, 5);
} }
VOID TEST(SampleTest, StringEQTest)
{
string str = "100";
EXPECT_TRUE("100" == str);
EXPECT_EQ("100", str);
EXPECT_STREQ("100", str.c_str());
}

24
trunk/src/utest/srs_utest_app.cpp
View file

@ -36,7 +36,7 @@ VOID TEST(AppCoroutineTest, Dummy)
SrsDummyCoroutine dc; SrsDummyCoroutine dc;
if (true) { if (true) {
EXPECT_EQ(0, dc.cid()); EXPECT_EQ("", dc.cid());
srs_error_t err = dc.pull(); srs_error_t err = dc.pull();
EXPECT_TRUE(err != srs_success); EXPECT_TRUE(err != srs_success);
@ -52,7 +52,7 @@ VOID TEST(AppCoroutineTest, Dummy)
if (true) { if (true) {
dc.stop(); dc.stop();
EXPECT_EQ(0, dc.cid()); EXPECT_EQ("", dc.cid());
srs_error_t err = dc.pull(); srs_error_t err = dc.pull();
EXPECT_TRUE(err != srs_success); EXPECT_TRUE(err != srs_success);
@ -68,7 +68,7 @@ VOID TEST(AppCoroutineTest, Dummy)
if (true) { if (true) {
dc.interrupt(); dc.interrupt();
EXPECT_EQ(0, dc.cid()); EXPECT_EQ("", dc.cid());
srs_error_t err = dc.pull(); srs_error_t err = dc.pull();
EXPECT_TRUE(err != srs_success); EXPECT_TRUE(err != srs_success);
@ -92,7 +92,7 @@ public:
// Quit without error. // Quit without error.
bool quit; bool quit;
public: public:
MockCoroutineHandler() : trd(NULL), err(srs_success), cid(0), quit(false) { MockCoroutineHandler() : trd(NULL), err(srs_success), cid("0"), quit(false) {
running = srs_cond_new(); running = srs_cond_new();
exited = srs_cond_new(); exited = srs_cond_new();
} }
@ -128,12 +128,12 @@ VOID TEST(AppCoroutineTest, StartStop)
MockCoroutineHandler ch; MockCoroutineHandler ch;
SrsSTCoroutine sc("test", &ch); SrsSTCoroutine sc("test", &ch);
ch.trd = ≻ ch.trd = ≻
EXPECT_EQ(0, sc.cid()); EXPECT_EQ("", sc.cid());
// Thread stop after created. // Thread stop after created.
sc.stop(); sc.stop();
EXPECT_EQ(0, sc.cid()); EXPECT_EQ("", sc.cid());
srs_error_t err = sc.pull(); srs_error_t err = sc.pull();
EXPECT_TRUE(srs_success != err); EXPECT_TRUE(srs_success != err);
@ -151,13 +151,13 @@ VOID TEST(AppCoroutineTest, StartStop)
MockCoroutineHandler ch; MockCoroutineHandler ch;
SrsSTCoroutine sc("test", &ch); SrsSTCoroutine sc("test", &ch);
ch.trd = ≻ ch.trd = ≻
EXPECT_EQ(0, sc.cid()); EXPECT_EQ("", sc.cid());
EXPECT_TRUE(srs_success == sc.start()); EXPECT_TRUE(srs_success == sc.start());
EXPECT_TRUE(srs_success == sc.pull()); EXPECT_TRUE(srs_success == sc.pull());
srs_cond_timedwait(ch.running, 100 * SRS_UTIME_MILLISECONDS); srs_cond_timedwait(ch.running, 100 * SRS_UTIME_MILLISECONDS);
EXPECT_TRUE(sc.cid() > 0); EXPECT_TRUE(!sc.cid().empty());
// Thread stop after started. // Thread stop after started.
sc.stop(); sc.stop();
@ -178,7 +178,7 @@ VOID TEST(AppCoroutineTest, StartStop)
MockCoroutineHandler ch; MockCoroutineHandler ch;
SrsSTCoroutine sc("test", &ch); SrsSTCoroutine sc("test", &ch);
ch.trd = ≻ ch.trd = ≻
EXPECT_EQ(0, sc.cid()); EXPECT_EQ("", sc.cid());
EXPECT_TRUE(srs_success == sc.start()); EXPECT_TRUE(srs_success == sc.start());
EXPECT_TRUE(srs_success == sc.pull()); EXPECT_TRUE(srs_success == sc.pull());
@ -220,16 +220,16 @@ VOID TEST(AppCoroutineTest, Cycle)
if (true) { if (true) {
MockCoroutineHandler ch; MockCoroutineHandler ch;
SrsSTCoroutine sc("test", &ch, 250); SrsSTCoroutine sc("test", &ch, "250");
ch.trd = ≻ ch.trd = ≻
EXPECT_EQ(250, sc.cid()); EXPECT_TRUE("250" == sc.cid());
EXPECT_TRUE(srs_success == sc.start()); EXPECT_TRUE(srs_success == sc.start());
EXPECT_TRUE(srs_success == sc.pull()); EXPECT_TRUE(srs_success == sc.pull());
// After running, the cid in cycle should equal to the thread. // After running, the cid in cycle should equal to the thread.
srs_cond_timedwait(ch.running, 100 * SRS_UTIME_MILLISECONDS); srs_cond_timedwait(ch.running, 100 * SRS_UTIME_MILLISECONDS);
EXPECT_EQ(250, ch.cid); EXPECT_TRUE("250" == ch.cid);
} }
if (true) { if (true) {

6
trunk/src/utest/srs_utest_kernel.cpp
View file

@ -4106,9 +4106,9 @@ VOID TEST(KernelLogTest, CoverAll)
l.error("TAG", "0", "log"); l.error("TAG", "0", "log");
ISrsThreadContext ctx; ISrsThreadContext ctx;
ctx.set_id(10); ctx.set_id("10");
EXPECT_EQ("0", ctx.get_id()); EXPECT_EQ("", ctx.get_id());
EXPECT_EQ("0", ctx.generate_id()); EXPECT_EQ("", ctx.generate_id());
} }
} }

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

@ -782,7 +782,7 @@ class MockOnCycleThread : public ISrsCoroutineHandler
public: public:
SrsSTCoroutine trd; SrsSTCoroutine trd;
srs_cond_t cond; srs_cond_t cond;
MockOnCycleThread() : trd("mock", this, 0) { MockOnCycleThread() : trd("mock", this, "0") {
cond = srs_cond_new(); cond = srs_cond_new();
}; };
virtual ~MockOnCycleThread() { virtual ~MockOnCycleThread() {
@ -822,7 +822,7 @@ class MockOnCycleThread2 : public ISrsCoroutineHandler
public: public:
SrsSTCoroutine trd; SrsSTCoroutine trd;
srs_mutex_t lock; srs_mutex_t lock;
MockOnCycleThread2() : trd("mock", this, 0) { MockOnCycleThread2() : trd("mock", this, "0") {
lock = srs_mutex_new(); lock = srs_mutex_new();
}; };
virtual ~MockOnCycleThread2() { virtual ~MockOnCycleThread2() {
@ -863,7 +863,7 @@ class MockOnCycleThread3 : public ISrsCoroutineHandler
public: public:
SrsSTCoroutine trd; SrsSTCoroutine trd;
srs_netfd_t fd; srs_netfd_t fd;
MockOnCycleThread3() : trd("mock", this, 0) { MockOnCycleThread3() : trd("mock", this, "0") {
fd = NULL; fd = NULL;
}; };
virtual ~MockOnCycleThread3() { virtual ~MockOnCycleThread3() {
@ -1116,7 +1116,7 @@ class MockOnCycleThread4 : public ISrsCoroutineHandler
public: public:
SrsSTCoroutine trd; SrsSTCoroutine trd;
srs_netfd_t fd; srs_netfd_t fd;
MockOnCycleThread4() : trd("mock", this, 0) { MockOnCycleThread4() : trd("mock", this, "0") {
fd = NULL; fd = NULL;
}; };
virtual ~MockOnCycleThread4() { virtual ~MockOnCycleThread4() {
@ -1268,18 +1268,18 @@ VOID TEST(TCPServerTest, ContextUtility)
if (true) { if (true) {
SrsThreadContext ctx; SrsThreadContext ctx;
EXPECT_EQ("0", ctx.set_id("100")); EXPECT_TRUE("" == ctx.set_id("100"));
EXPECT_EQ("100", ctx.set_id("1000")); EXPECT_TRUE("100" == ctx.set_id("1000"));
EXPECT_EQ("1000", ctx.get_id()); EXPECT_TRUE("1000" == ctx.get_id());
ctx.clear_cid(); ctx.clear_cid();
EXPECT_EQ("0", ctx.set_id("100")); EXPECT_TRUE("" == ctx.set_id("100"));
} }
int base_size = 0; int base_size = 0;
if (true) { if (true) {
int size = 0; char buf[1024]; HELPER_ARRAY_INIT(buf, 1024, 0); int size = 0; char buf[1024]; HELPER_ARRAY_INIT(buf, 1024, 0);
ASSERT_TRUE(srs_log_header(buf, 1024, true, true, "SRS", 100, "Trace", &size)); ASSERT_TRUE(srs_log_header(buf, 1024, true, true, "SRS", "100", "Trace", &size));
base_size = size; base_size = size;
EXPECT_TRUE(base_size > 0); EXPECT_TRUE(base_size > 0);
} }