external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Log: Refine log context, use const

Browse source
This commit is contained in:
winlin 2020-07-13 11:19:34 +08:00
parent 254529d946
commit 0a057a0427
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/kernel/srs_kernel_log.hpp
View file

@ -93,10 +93,10 @@ public:
// @remark We do not set to current thread, user should do this. // @remark We do not set to current thread, user should do this.
virtual SrsContextId generate_id() = 0; virtual SrsContextId generate_id() = 0;
// Get the context id of current thread. // Get the context id of current thread.
virtual SrsContextId get_id() = 0; virtual const SrsContextId& get_id() = 0;
// Set the context id of current thread. // Set the context id of current thread.
// @return the previous context id. // @return the current context id.
virtual SrsContextId set_id(SrsContextId v) = 0; virtual const SrsContextId& set_id(const SrsContextId& v) = 0;
}; };
// @global User must provides a log object // @global User must provides a log object

12
trunk/src/protocol/srs_service_log.cpp
View file

@ -49,22 +49,22 @@ SrsContextId SrsThreadContext::generate_id()
return cid; return cid;
} }
SrsContextId SrsThreadContext::get_id() const SrsContextId& SrsThreadContext::get_id()
{ {
return cache[srs_thread_self()]; return cache[srs_thread_self()];
} }
SrsContextId SrsThreadContext::set_id(SrsContextId v) const SrsContextId& SrsThreadContext::set_id(const SrsContextId& v)
{ {
srs_thread_t self = srs_thread_self(); srs_thread_t self = srs_thread_self();
SrsContextId ov; if (cache.find(self) == cache.end()) {
if (cache.find(self) != cache.end()) { cache[self] = v;
ov = cache[self]; return v;
} }
const SrsContextId& ov = cache[self];
cache[self] = v; cache[self] = v;
return ov; return ov;
} }

4
trunk/src/protocol/srs_service_log.hpp
View file

@ -43,8 +43,8 @@ public:
virtual ~SrsThreadContext(); virtual ~SrsThreadContext();
public: public:
virtual SrsContextId generate_id(); virtual SrsContextId generate_id();
virtual SrsContextId get_id(); virtual const SrsContextId& get_id();
virtual SrsContextId set_id(SrsContextId v); virtual const SrsContextId& set_id(const SrsContextId& v);
public: public:
virtual void clear_cid(); virtual void clear_cid();
}; };

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

@ -1382,12 +1382,12 @@ VOID TEST(TCPServerTest, ContextUtility)
if (true) { if (true) {
SrsThreadContext ctx; SrsThreadContext ctx;
EXPECT_TRUE(ctx.set_id(SrsContextId("100")).empty()); EXPECT_TRUE(!ctx.set_id(SrsContextId("100")).compare(SrsContextId("100")));
EXPECT_TRUE(!ctx.set_id(SrsContextId("1000")).compare(SrsContextId("100"))); EXPECT_TRUE(!ctx.set_id(SrsContextId("1000")).compare(SrsContextId("1000")));
EXPECT_TRUE(!ctx.get_id().compare(SrsContextId("1000"))); EXPECT_TRUE(!ctx.get_id().compare(SrsContextId("1000")));
ctx.clear_cid(); ctx.clear_cid();
EXPECT_TRUE(ctx.set_id(SrsContextId("100")).empty()); EXPECT_TRUE(!ctx.set_id(SrsContextId("100")).compare(SrsContextId("100")));
} }
int base_size = 0; int base_size = 0;