TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-17 21:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revise logging code

Browse Source
This commit is contained in:
topjohnwu
2021-08-12 03:26:54 -07:00
parent 20860da4b4
commit 0d977b54f7
6 changed files with 185 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
native/jni/utils/logging.cpp
View File

@@ -1,9 +1,10 @@
#include <cstdio>
#include <cstdlib>
#include "logging.hpp"
#include <flags.hpp>
#include "logging.hpp"
using namespace std;
int nop_log(const char *, va_list) { return 0; }
@@ -38,30 +39,19 @@ void cmdline_logging() {
log_cb.ex = exit;
}
template <int type>
void log_handler(const char *fmt, ...) {
va_list argv;
va_start(argv, fmt);
if constexpr (type == L_DEBUG) {
log_cb.d(fmt, argv);
} else if constexpr (type == L_INFO) {
log_cb.i(fmt, argv);
} else if constexpr (type == L_WARN) {
log_cb.w(fmt, argv);
} else if constexpr (type == L_ERR) {
log_cb.e(fmt, argv);
log_cb.ex(1);
}
va_end(argv);
#define LOG_BODY(prio) { \
va_list argv; \
va_start(argv, fmt); \
log_cb.prio(fmt, argv); \
va_end(argv); \
}
template void log_handler<L_INFO>(const char *fmt, ...);
template void log_handler<L_WARN>(const char *fmt, ...);
template void log_handler<L_ERR>(const char *fmt, ...);
// LTO will optimize out the NOP function
#ifdef MAGISK_DEBUG
template void log_handler<L_DEBUG>(const char *fmt, ...);
void LOGD(const char *fmt, ...) { LOG_BODY(d) }
#else
// Strip debug logging for release builds
template <> void log_handler<L_DEBUG>(const char *fmt, ...) {}
void LOGD(const char *fmt, ...) {}
#endif
void LOGI(const char *fmt, ...) { LOG_BODY(i) }
void LOGW(const char *fmt, ...) { LOG_BODY(w) }
void LOGE(const char *fmt, ...) { LOG_BODY(e); log_cb.ex(1); }

19
native/jni/utils/logging.hpp
View File

@@ -2,14 +2,6 @@
#include <cerrno>
#include <cstdarg>
#include <cstring>
enum {
L_DEBUG,
L_INFO,
L_WARN,
L_ERR
};
struct log_callback {
int (*d)(const char* fmt, va_list ap);
@@ -21,10 +13,10 @@ struct log_callback {
extern log_callback log_cb;
#define LOGD(...) log_handler<L_DEBUG>(__VA_ARGS__)
#define LOGI(...) log_handler<L_INFO>(__VA_ARGS__)
#define LOGW(...) log_handler<L_WARN>(__VA_ARGS__)
#define LOGE(...) log_handler<L_ERR>(__VA_ARGS__)
void LOGD(const char *fmt, ...) __printflike(1, 2);
void LOGI(const char *fmt, ...) __printflike(1, 2);
void LOGW(const char *fmt, ...) __printflike(1, 2);
void LOGE(const char *fmt, ...) __printflike(1, 2);
#define PLOGE(fmt, args...) LOGE(fmt " failed with %d: %s\n", ##args, errno, std::strerror(errno))
int nop_log(const char *, va_list);
@@ -32,6 +24,3 @@ void nop_ex(int);
void no_logging();
void cmdline_logging();
template<int type>
void log_handler(const char *fmt, ...) __printflike(1, 2);