Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

Commit 3a4fe24

Browse files
YorkShenYorkShen
committed
Redirect all invocation of Android C++ log to log_defines.h
1 parent ca886d2 commit 3a4fe24

File tree

9 files changed

+48
-126
lines changed

9 files changed

+48
-126
lines changed

‎ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -942,20 +942,20 @@ static void MergeBorderWidthValues(NSMutableDictionary* dict,
942942

943943
class LogBridgeIOS: public LogBridge {
944944
public:
945-
virtual void log(LogLevel level, const char* file, unsigned long line, const char* log) override {
945+
virtual void log(LogLevel level, const char* tag, const char* file, unsigned long line, const char* log) override {
946946
#ifdef DEBUG
947947
switch (level) {
948948
case LogLevel::Error:
949-
printf("<%s:Error|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
949+
printf("<%s:Error|%s:%lu> %s\n", tag, file, line, log);
950950
break;
951951
case LogLevel::Warn:
952-
printf("<%s:Warn|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
952+
printf("<%s:Warn|%s:%lu> %s\n", tag, file, line, log);
953953
break;
954954
case LogLevel::Info:
955-
printf("<%s:Info|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
955+
printf("<%s:Info|%s:%lu> %s\n", tag, file, line, log);
956956
break;
957957
case LogLevel::Debug:
958-
printf("<%s:Debug|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
958+
printf("<%s:Debug|%s:%lu> %s\n", tag, file, line, log);
959959
break;
960960
default:
961961
break;

‎weex_core/Source/android/jsengine/wson/wson_jsc.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@
3333
#include <wtf/HashMap.h>
3434

3535

36+
#define LOGE(format, ...) LOGE(format, ##__VA_ARGS__)
3637

3738
#ifdef __ANDROID__
3839
//#define WSON_JSC_DEBUG true;
39-
#include <android/log.h>
4040
#include <wtf/unicode/WTFUTF8.h>
41-
#define TAG "weex"
42-
#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
41+
#include "base/log_defines.h"
4342
#else
44-
#define LOGE(...) printf(__VA_ARGS__)
4543
#include <wtf/unicode/UTF8.h>
4644
#endif
4745

‎weex_core/Source/base/android/log_utils.h

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -18,56 +18,5 @@
1818
*/
1919
#ifndef _LOG_UTILS_H_
2020
#define _LOG_UTILS_H_
21-
22-
#if !defined(__APPLE__)
23-
#include <android/log.h>
24-
#endif
25-
26-
#define LOG_TAG "WeexCore"
27-
28-
#if defined(__APPLE__)
29-
30-
#define LOGE(...) printf(__VA_ARGS__);printf("\n")
31-
#define LOGA(...) printf(__VA_ARGS__);printf("\n")
32-
#define LOGD(...) printf(__VA_ARGS__);printf("\n")
33-
34-
#else
35-
36-
#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
37-
#define LOGA(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
38-
#define LOGD(...) ((void)0)//__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
39-
40-
#endif
41-
//#define DEBUG
42-
43-
#ifdef DEBUG
44-
45-
#if defined(__APPLE__)
46-
47-
#define LOGV(...) printf(__VA_ARGS__);printf("\n")
48-
#define LOGD(...) printf(__VA_ARGS__);printf("\n")
49-
#define LOGI(...) printf(__VA_ARGS__);printf("\n")
50-
#define LOGW(...) printf(__VA_ARGS__);printf("\n")
51-
#define LOG_LINE LOGV("%s, %d", __func__, __LINE__)
52-
53-
#else
54-
55-
#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
56-
#define LOGD(...) ((void)0)//__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
57-
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
58-
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
59-
#define LOG_LINE LOGV("%s, %d", __func__, __LINE__)
60-
61-
#endif
62-
63-
#else
64-
65-
#define LOGV(...) ((void) 0)
66-
#define LOGD(...) ((void) 0)
67-
#define LOGI(...) ((void) 0)
68-
#define LOGW(...) ((void) 0)
69-
#define LOG_LINE
70-
71-
#endif
72-
21+
#include "base/log_defines.h"
7322
#endif //_LOG_UTILS_H_

‎weex_core/Source/base/log_defines.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ namespace WeexCore {
7171
return *this;
7272
}
7373

74-
void PrintLog(LogLevel level, const char* file, unsigned long line, const char* fmt, ...) {
74+
void PrintLog(LogLevel level, const char* tag, const char* file, unsigned long line, const char* fmt, ...) {
7575
va_list args;
7676
va_start(args, fmt);
7777
LogFlattenHelper log(fmt, args);
@@ -87,33 +87,33 @@ namespace WeexCore {
8787
#ifdef __ANDROID__
8888
switch (level) {
8989
case LogLevel::Error:
90-
__android_log_print(ANDROID_LOG_ERROR, WEEX_CORE_LOG_TAG, "%s:%lu, %s", file, line, log.str());
90+
__android_log_print(ANDROID_LOG_ERROR, tag, "%s:%lu, %s", file, line, log.str());
9191
break;
9292
case LogLevel::Warn:
93-
__android_log_print(ANDROID_LOG_WARN, WEEX_CORE_LOG_TAG, "%s:%lu, %s", file, line, log.str());
93+
__android_log_print(ANDROID_LOG_WARN, tag, "%s:%lu, %s", file, line, log.str());
9494
break;
9595
case LogLevel::Info:
96-
__android_log_print(ANDROID_LOG_INFO, WEEX_CORE_LOG_TAG, "%s:%lu, %s", file, line, log.str());
96+
__android_log_print(ANDROID_LOG_INFO, tag, "%s:%lu, %s", file, line, log.str());
9797
break;
9898
case LogLevel::Debug:
99-
__android_log_print(ANDROID_LOG_DEBUG, WEEX_CORE_LOG_TAG, "%s:%lu, %s", file, line, log.str());
99+
__android_log_print(ANDROID_LOG_DEBUG, tag, "%s:%lu, %s", file, line, log.str());
100100
break;
101101
default:
102102
break;
103103
}
104104
#elif __APPLE__
105105
switch (level) {
106106
case LogLevel::Error:
107-
printf("<%s:Error|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
107+
printf("<%s:Error|%s:%lu> %s\n", tag, file, line, log.str());
108108
break;
109109
case LogLevel::Warn:
110-
printf("<%s:Warn|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
110+
printf("<%s:Warn|%s:%lu> %s\n", tag, file, line, log.str());
111111
break;
112112
case LogLevel::Info:
113-
printf("<%s:Info|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
113+
printf("<%s:Info|%s:%lu> %s\n", tag, file, line, log.str());
114114
break;
115115
case LogLevel::Debug:
116-
printf("<%s:Debug|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
116+
printf("<%s:Debug|%s:%lu> %s\n", tag, file, line, log.str());
117117
break;
118118
default:
119119
break;

‎weex_core/Source/base/log_defines.h

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#ifndef LogDefines_h
2121
#define LogDefines_h
22+
#include <cstring>
2223

2324
namespace WeexCore {
2425

@@ -29,7 +30,7 @@ namespace WeexCore {
2930
Error
3031
};
3132

32-
void PrintLog(LogLevel level, const char* file, unsigned long line, const char* format, ...);
33+
void PrintLog(LogLevel level, const char* tag, const char* file, unsigned long line, const char* format, ...);
3334

3435
}
3536

@@ -55,24 +56,36 @@ namespace WeexCore {
5556

5657
#define WEEX_CORE_LOG_TAG "WeexCore"
5758
#define WEEX_CORE_FILENAME (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
58-
#define WEEX_CORE_LOG(level, format, ...) WeexCore::PrintLog((level), WEEX_CORE_FILENAME, __LINE__, (format), ##__VA_ARGS__)
59+
#define WEEX_CORE_LOG(level, TAG, format, ...) WeexCore::PrintLog((level), TAG, WEEX_CORE_FILENAME, __LINE__, (format), ##__VA_ARGS__)
5960

60-
#define LOGE(format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Error, format, ##__VA_ARGS__)
61-
#define LOGW(format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Warn, format, ##__VA_ARGS__)
62-
#define LOGI(format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Info, format, ##__VA_ARGS__)
61+
#define LOGE(format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Debug, WEEX_CORE_LOG_TAG, format, ##__VA_ARGS__)
62+
#define LOGE_TAG(TAG, format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Error, TAG, format, ##__VA_ARGS__)
6363

6464
#ifdef DEBUG
6565

66-
#define LOGD(format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Debug, format, ##__VA_ARGS__)
66+
#define LOGD(format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Debug, WEEX_CORE_LOG_TAG, format, ##__VA_ARGS__)
67+
#define LOGW(format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Warn, WEEX_CORE_LOG_TAG, format, ##__VA_ARGS__)
68+
#define LOGI(format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Info, WEEX_CORE_LOG_TAG, format, ##__VA_ARGS__)
69+
70+
#define LOGD_TAG(TAG, format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Debug, TAG, format, ##__VA_ARGS__)
71+
#define LOGW_TAG(TAG, format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Warn, TAG, format, ##__VA_ARGS__)
72+
#define LOGI_TAG(TAG, format, ...) WEEX_CORE_LOG(WeexCore::LogLevel::Info, TAG, format, ##__VA_ARGS__)
6773

6874
#else
6975

7076
#define LOGD(format, ...) ((void) 0)
77+
#define LOGW(format, ...) ((void) 0)
78+
#define LOGD(format, ...) ((void) 0)
79+
80+
#define LOGD_TAG(TAG, format, ...) ((void) 0)
81+
#define LOGW_TAG(TAG, format, ...) ((void) 0)
82+
#define LOGI_TAG(TAG, format, ...) ((void) 0)
7183

7284
#endif
7385

7486
#define LOGV LOGD
7587
#define LOG_LINE ((void) 0)
88+
#define LOGV_TAG LOGD
7689

7790
#ifndef DISALLOW_COPY_AND_ASSIGN
7891
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \

‎weex_core/Source/base/utils/log_utils.cpp

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,23 @@ namespace Weex{
3737
// }
3838
switch(level) {
3939
case 1:
40-
if (mDebugMode) {
41-
__android_log_print(ANDROID_LOG_VERBOSE, tag,"%s", log);
42-
}
40+
LOGV_TAG("jsengine", "%s", log);
4341
break;
4442
case 2:
45-
__android_log_print(ANDROID_LOG_WARN, tag,"%s", log);
43+
LOGW_TAG("jsengine", "%s", log);
4644
break;
4745
case 3:
48-
__android_log_print(ANDROID_LOG_ERROR, tag,"%s", log);
46+
LOGE_TAG("jsengine", "%s", log);
4947
break;
5048
case 4:
51-
if (mDebugMode) {
52-
__android_log_print(ANDROID_LOG_DEBUG, tag,"%s", log);
53-
}
49+
LOGD_TAG("jsengine", "%s", log);
5450
break;
5551
case 5:
56-
if (mDebugMode) {
57-
__android_log_print(ANDROID_LOG_INFO, tag,"%s", log);
58-
}
52+
LOGI_TAG("jsengine", "%s", log);
5953
break;
6054
default:
61-
if (mDebugMode) {
62-
__android_log_print(ANDROID_LOG_VERBOSE, tag,"%s", log);
63-
}
55+
LOGV_TAG("jsengine", "%s", log);
56+
break;
6457
}
6558
}
6659

‎weex_core/Source/base/utils/log_utils.h

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,7 @@
1919
#ifndef _LOG_UTILS_H_
2020
#define _LOG_UTILS_H_
2121

22-
#include <android/log.h>
23-
24-
#define LOG_TAG "jsengine"
25-
26-
#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
27-
#define LOGA(...) ((void)0)//__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
28-
//#define DEBUG
29-
30-
#ifdef DEBUG
31-
32-
#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
33-
#define LOGD(...) ((void)0)//__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
34-
#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
35-
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
36-
#define LOG_LINE LOGV("%s, %d", __func__, __LINE__)
37-
38-
#else
39-
40-
#define LOGV(...) ((void) 0)
41-
#define LOGD(...) ((void) 0)
42-
#define LOGI(...) ((void) 0)
43-
#define LOGW(...) ((void) 0)
44-
//#define LOGE(...) ((void) 0)
45-
#define LOG_LINE
46-
47-
#endif
22+
#include "base/log_defines.h"
4823

4924
#ifndef DISALLOW_COPY_AND_ASSIGN
5025
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \

‎weex_core/Source/core/bridge/log_bridge.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace WeexCore {
2525
public:
2626
LogBridge() {}
2727

28-
virtual void log(LogLevel level, const char* file, unsigned long line, const char* log) {};
28+
virtual void log(LogLevel level, const char* tag, const char* file, unsigned long line, const char* log) {};
2929
};
3030

3131
}

‎weex_core/Source/third_party/IPC/IPCLog.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@
2424

2525
#ifndef IPCLOG_H
2626
#define IPCLOG_H
27-
#include <android/log.h>
28-
#define TAG "linzj_IPC"
29-
#define IPC_LOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
30-
31-
#if defined(ENABLE_IPC_DEBUG_LOG) && ENABLE_IPC_DEBUG_LOG
32-
#define IPC_LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
33-
#else
34-
#define IPC_LOGD(...)
35-
#endif
27+
#include "../../base/log_defines.h"
28+
#define IPC_LOGE(format, ...) LOGE(format, ##__VA_ARGS__)
29+
#define IPC_LOGD(format, ...) LOGD(format, ##__VA_ARGS__)
3630
#endif /* IPCLOG_H */

0 commit comments

Comments
 (0)