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

Add log functions for srs-librtmp

Browse source
This commit is contained in:
winlin 2017-02-28 16:19:54 +08:00
parent ca43bfe6d9
commit af73e8ee65
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/.gitignore vendored
View file

@ -30,4 +30,5 @@
/research/snap/ /research/snap/
/research/speex/ /research/speex/
/test/ /test/
.DS_Store

29
trunk/src/libs/srs_librtmp.hpp
View file

@ -63,6 +63,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
void *iov_base; /* Starting address */ void *iov_base; /* Starting address */
size_t iov_len; /* Number of bytes to transfer */ size_t iov_len; /* Number of bytes to transfer */
}; };
// for pid.
typedef int pid_t;
pid_t getpid(void);
#endif #endif
#include <stdint.h> #include <stdint.h>
@ -1051,13 +1055,30 @@ extern const char* srs_human_format_time();
// for getpid. // for getpid.
#include <unistd.h> #include <unistd.h>
#endif #endif
// when disabled log, donot compile it. // The log function for librtmp.
// User can disable it by define macro SRS_DISABLE_LOG.
// Or user can directly use them, or define the alias by:
// #define trace(msg, ...) srs_human_trace(msg, ##__VA_ARGS__)
// #define warn(msg, ...) srs_human_warn(msg, ##__VA_ARGS__)
// #define error(msg, ...) srs_human_error(msg, ##__VA_ARGS__)
#ifdef SRS_DISABLE_LOG #ifdef SRS_DISABLE_LOG
#define srs_human_trace(msg, ...) (void)0 #define srs_human_trace(msg, ...) (void)0
#define srs_human_warn(msg, ...) (void)0
#define srs_human_error(msg, ...) (void)0
#define srs_human_verbose(msg, ...) (void)0 #define srs_human_verbose(msg, ...) (void)0
#define srs_human_raw(msg, ...) (void)0 #define srs_human_raw(msg, ...) (void)0
#else #else
#define srs_human_trace(msg, ...) printf("[%s][%d] ", srs_human_format_time(), getpid());printf(msg, ##__VA_ARGS__);printf("\n") #define srs_human_trace(msg, ...) \
fprintf(stdout, "[Trace][%d][%s][%d] ", getpid(), srs_human_format_time(), getpid());\
fprintf(stdout, msg, ##__VA_ARGS__); fprintf(stdout, "\n")
#define srs_human_warn(msg, ...) \
fprintf(stdout, "[Warn][%d][%s][%d] ", getpid(), srs_human_format_time(), getpid()); \
fprintf(stdout, msg, ##__VA_ARGS__); \
fprintf(stdout, "\n")
#define srs_human_error(msg, ...) \
fprintf(stderr, "[Error][%d][%s][%d] ", getpid(), srs_human_format_time(), getpid());\
fprintf(stderr, msg, ##__VA_ARGS__); \
fprintf(stderr, "\n")
#define srs_human_verbose(msg, ...) (void)0 #define srs_human_verbose(msg, ...) (void)0
#define srs_human_raw(msg, ...) printf(msg, ##__VA_ARGS__) #define srs_human_raw(msg, ...) printf(msg, ##__VA_ARGS__)
#endif #endif
@ -1203,10 +1224,6 @@ typedef void* srs_hijack_io_t;
#define write _write #define write _write
#define read _read #define read _read
// for pid.
typedef int pid_t;
pid_t getpid(void);
// for socket. // for socket.
ssize_t writev(int fd, const struct iovec *iov, int iovcnt); ssize_t writev(int fd, const struct iovec *iov, int iovcnt);
typedef int64_t useconds_t; typedef int64_t useconds_t;