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

Remove some global elements for debugging. 3.0.152

Browse source
This commit is contained in:
winlin 2020-10-31 18:01:16 +08:00
parent b348539687
commit 86f8cbb5eb
5 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/kernel/srs_kernel_file.cpp
View file

@ -37,11 +37,11 @@ using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
// For utest to mock it. // For utest to mock it.
_srs_open_t _srs_open_fn = ::open; srs_open_t _srs_open_fn = ::open;
_srs_write_t _srs_write_fn = ::write; srs_write_t _srs_write_fn = ::write;
_srs_read_t _srs_read_fn = ::read; srs_read_t _srs_read_fn = ::read;
_srs_lseek_t _srs_lseek_fn = ::lseek; srs_lseek_t _srs_lseek_fn = ::lseek;
_srs_close_t _srs_close_fn = ::close; srs_close_t _srs_close_fn = ::close;
SrsFileWriter::SrsFileWriter() SrsFileWriter::SrsFileWriter()
{ {

10
trunk/src/kernel/srs_kernel_file.hpp
View file

@ -121,11 +121,11 @@ public:
}; };
// For utest to mock it. // For utest to mock it.
typedef int (*_srs_open_t)(const char* path, int oflag, ...); typedef int (*srs_open_t)(const char* path, int oflag, ...);
typedef ssize_t (*_srs_write_t)(int fildes, const void* buf, size_t nbyte); typedef ssize_t (*srs_write_t)(int fildes, const void* buf, size_t nbyte);
typedef ssize_t (*_srs_read_t)(int fildes, void* buf, size_t nbyte); typedef ssize_t (*srs_read_t)(int fildes, void* buf, size_t nbyte);
typedef off_t (*_srs_lseek_t)(int fildes, off_t offset, int whence); typedef off_t (*srs_lseek_t)(int fildes, off_t offset, int whence);
typedef int (*_srs_close_t)(int fildes); typedef int (*srs_close_t)(int fildes);
#endif #endif

2
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -125,7 +125,7 @@ srs_utime_t srs_get_system_startup_time()
// For utest to mock it. // For utest to mock it.
#ifndef SRS_AUTO_OSX #ifndef SRS_AUTO_OSX
_srs_gettimeofday_t _srs_gettimeofday = (_srs_gettimeofday_t)::gettimeofday; srs_gettimeofday_t _srs_gettimeofday = (srs_gettimeofday_t)::gettimeofday;
#endif #endif
srs_utime_t srs_update_system_time() srs_utime_t srs_update_system_time()

2
trunk/src/kernel/srs_kernel_utility.hpp
View file

@ -169,7 +169,7 @@ extern int srs_chunk_header_c3(int perfer_cid, uint32_t timestamp, char* cache,
#ifdef SRS_AUTO_OSX #ifdef SRS_AUTO_OSX
#define _srs_gettimeofday gettimeofday #define _srs_gettimeofday gettimeofday
#else #else
typedef int (*_srs_gettimeofday_t) (struct timeval* tv, struct timezone* tz); typedef int (*srs_gettimeofday_t) (struct timeval* tv, struct timezone* tz);
#endif #endif
#endif #endif

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

@ -3713,11 +3713,11 @@ VOID TEST(KernelFileTest, FileWriteReader)
} }
// Mock the system call hooks. // Mock the system call hooks.
extern _srs_open_t _srs_open_fn; extern srs_open_t _srs_open_fn;
extern _srs_write_t _srs_write_fn; extern srs_write_t _srs_write_fn;
extern _srs_read_t _srs_read_fn; extern srs_read_t _srs_read_fn;
extern _srs_lseek_t _srs_lseek_fn; extern srs_lseek_t _srs_lseek_fn;
extern _srs_close_t _srs_close_fn; extern srs_close_t _srs_close_fn;
int mock_open(const char* /*path*/, int /*oflag*/, ...) { int mock_open(const char* /*path*/, int /*oflag*/, ...) {
return -1; return -1;
@ -3742,13 +3742,13 @@ int mock_close(int /*fildes*/) {
class MockSystemIO class MockSystemIO
{ {
private: private:
_srs_open_t oo; srs_open_t oo;
_srs_write_t ow; srs_write_t ow;
_srs_read_t _or; srs_read_t _or;
_srs_lseek_t os; srs_lseek_t os;
_srs_close_t oc; srs_close_t oc;
public: public:
MockSystemIO(_srs_open_t o = NULL, _srs_write_t w = NULL, _srs_read_t r = NULL, _srs_lseek_t s = NULL, _srs_close_t c = NULL) { MockSystemIO(srs_open_t o = NULL, srs_write_t w = NULL, srs_read_t r = NULL, srs_lseek_t s = NULL, srs_close_t c = NULL) {
oo = _srs_open_fn; oo = _srs_open_fn;
ow = _srs_write_fn; ow = _srs_write_fn;
os = _srs_lseek_fn; os = _srs_lseek_fn;
@ -4209,7 +4209,7 @@ VOID TEST(KernelUtilityTest, CoverBitsBufferAll)
} }
#ifndef SRS_AUTO_OSX #ifndef SRS_AUTO_OSX
extern _srs_gettimeofday_t _srs_gettimeofday; extern srs_gettimeofday_t _srs_gettimeofday;
int mock_gettimeofday(struct timeval* /*tp*/, struct timezone* /*tzp*/) { int mock_gettimeofday(struct timeval* /*tp*/, struct timezone* /*tzp*/) {
return -1; return -1;
} }
@ -4217,9 +4217,9 @@ int mock_gettimeofday(struct timeval* /*tp*/, struct timezone* /*tzp*/) {
class MockTime class MockTime
{ {
private: private:
_srs_gettimeofday_t ot; srs_gettimeofday_t ot;
public: public:
MockTime(_srs_gettimeofday_t t = NULL) { MockTime(srs_gettimeofday_t t = NULL) {
ot = _srs_gettimeofday; ot = _srs_gettimeofday;
if (t) { if (t) {
_srs_gettimeofday = t; _srs_gettimeofday = t;