From 1a5fd824dd79da189af7c70b36faf400937b689a Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Mon, 18 Oct 2021 16:02:41 +0800 Subject: [PATCH] =?UTF-8?q?mediasoup=E7=A7=BB=E6=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webrtc/logger.h | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/webrtc/logger.h b/webrtc/logger.h index c708d425..788e857f 100644 --- a/webrtc/logger.h +++ b/webrtc/logger.h @@ -1,29 +1,15 @@ #pragma once -#include -#include +#include "Util/logger.h" +using namespace toolkit; -#if 0 #define MS_TRACE() -#define MS_ERROR(fmt, ...) printf("error:" fmt "\n", ##__VA_ARGS__) -#define MS_THROW_ERROR(fmt, ...) do{ printf("throw:" fmt "\n", ##__VA_ARGS__); throw std::runtime_error("error"); } while(false); -#define MS_DUMP(fmt, ...) printf("dump:" fmt "\n", ##__VA_ARGS__) -#define MS_DEBUG_2TAGS(tag1, tag2,fmt, ...) printf("debug:" fmt "\n", ##__VA_ARGS__) -#define MS_WARN_2TAGS(tag1, tag2,fmt, ...) printf("warn:" fmt "\n", ##__VA_ARGS__) -#define MS_DEBUG_TAG(tag,fmt, ...) printf("debug:" fmt "\n", ##__VA_ARGS__) -#define MS_ASSERT(con, fmt, ...) do{if(!(con)) { printf("assert failed:%s" fmt "\n", #con, ##__VA_ARGS__);} assert(con); } while(false); -#define MS_ABORT(fmt, ...) do{ printf("abort:" fmt "\n", ##__VA_ARGS__); abort(); } while(false); -#define MS_WARN_TAG(tag,fmt, ...) printf("warn:" fmt "\n", ##__VA_ARGS__) -#define MS_DEBUG_DEV(fmt, ...) printf("debug:" fmt "\n", ##__VA_ARGS__) -#else -#define MS_TRACE() -#define MS_ERROR(fmt, ...) -#define MS_THROW_ERROR(fmt, ...) -#define MS_DUMP(fmt, ...) -#define MS_DEBUG_2TAGS(tag1, tag2,fmt, ...) -#define MS_WARN_2TAGS(tag1, tag2,fmt, ...) -#define MS_DEBUG_TAG(tag,fmt, ...) -#define MS_ASSERT(con, fmt, ...) -#define MS_ABORT(fmt, ...) -#define MS_WARN_TAG(tag,fmt, ...) -#define MS_DEBUG_DEV(fmt, ...) -#endif \ No newline at end of file +#define MS_ERROR PrintE +#define MS_THROW_ERROR(...) do { PrintE(##__VA_ARGS__); throw std::runtime_error("error"); } while(false) +#define MS_DUMP PrintT +#define MS_DEBUG_2TAGS(tag1, tag2, ...) PrintD(##__VA_ARGS__) +#define MS_WARN_2TAGS(tag1, tag2, ...) PrintW(##__VA_ARGS__) +#define MS_DEBUG_TAG(tag, ...) PrintD(##__VA_ARGS__) +#define MS_ASSERT(con, ...) do { if(!(con)) { PrintE(##__VA_ARGS__); abort(); } } while(false) +#define MS_ABORT(...) do { PrintE(##__VA_ARGS__); abort(); } while(false) +#define MS_WARN_TAG(tag, ...) PrintW(##__VA_ARGS__) +#define MS_DEBUG_DEV PrintD \ No newline at end of file