Directly log to log file

This commit is contained in:
topjohnwu 2020-12-03 20:15:18 -08:00
parent 797ba4fbf4
commit f152e8c33d
6 changed files with 87 additions and 52 deletions

View File

@ -222,39 +222,6 @@ void unlock_blocks() {
} }
} }
static void collect_logs(bool reset) {
static bool running = false;
static pthread_mutex_t log_lock = PTHREAD_MUTEX_INITIALIZER;
{
mutex_guard lock(log_lock);
if (running)
return;
int test = exec_command_sync("/system/bin/logcat", "-d", "-f", "/dev/null");
chmod("/dev/null", 0666);
if (test != 0)
return;
running = true;
}
if (reset)
rename(LOGFILE, LOGFILE ".bak");
// Start a daemon thread and wait indefinitely
new_daemon_thread([]{
int fd = xopen(LOGFILE, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644);
exec_t exec {
.fd = fd,
.fork = fork_no_zombie
};
int pid = exec_command(exec, "/system/bin/logcat", "-s", "Magisk");
close(fd);
if (pid < 0) {
mutex_guard lock(log_lock);
running = false;
} else {
waitpid(pid, nullptr, 0);
}
});
}
#define test_bit(bit, array) (array[bit / 8] & (1 << (bit % 8))) #define test_bit(bit, array) (array[bit / 8] & (1 << (bit % 8)))
static bool check_key_combo() { static bool check_key_combo() {
@ -317,7 +284,7 @@ void post_fs_data(int client) {
if (!check_data()) if (!check_data())
goto unblock_init; goto unblock_init;
collect_logs(true); setup_logfile(true);
LOGI("** post-fs-data mode running\n"); LOGI("** post-fs-data mode running\n");
@ -369,7 +336,7 @@ void late_start(int client) {
write_int(client, 0); write_int(client, 0);
close(client); close(client);
collect_logs(false); setup_logfile(false);
if (!pfs_done || safe_mode) if (!pfs_done || safe_mode)
return; return;
@ -384,7 +351,7 @@ void boot_complete(int client) {
write_int(client, 0); write_int(client, 0);
close(client); close(client);
collect_logs(false); setup_logfile(false);
if (safe_mode) if (safe_mode)
return; return;

View File

@ -14,6 +14,7 @@
#include <db.hpp> #include <db.hpp>
#include <resetprop.hpp> #include <resetprop.hpp>
#include <flags.hpp> #include <flags.hpp>
#include <stream.hpp>
using namespace std; using namespace std;
@ -122,21 +123,77 @@ static void handle_request(int client) {
} }
// Create new thread to handle complex requests // Create new thread to handle complex requests
new_daemon_thread(std::bind(&request_handler, client, req_code, cred)); new_daemon_thread([=] { return request_handler(client, req_code, cred); });
return; return;
shortcut: shortcut:
close(client); close(client);
} }
#define vlog __android_log_vprint static FILE *log_file;
bool in_mem_log = true;
static char *log_buf;
static size_t log_buf_len;
void setup_logfile(bool reset) {
if (!in_mem_log)
return;
in_mem_log = false;
if (reset)
rename(LOGFILE, LOGFILE ".bak");
int fd = xopen(LOGFILE, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644);
// Dump all logs in memory (if exists)
if (log_buf) {
write(fd, log_buf, log_buf_len);
}
// Redirect to log file
log_file = fdopen(fd, "a");
setbuf(log_file, nullptr);
free(log_buf);
}
static int magisk_log(int prio, const char *fmt, va_list ap) {
// Log to logcat
__android_log_vprint(prio, "Magisk", fmt, ap);
char buf[4096];
timeval tv;
tm tm;
char type;
switch (prio) {
case ANDROID_LOG_DEBUG:
type = 'D';
break;
case ANDROID_LOG_INFO:
type = 'I';
break;
case ANDROID_LOG_WARN:
type = 'W';
break;
default:
type = 'E';
break;
}
gettimeofday(&tv, nullptr);
localtime_r(&tv.tv_sec, &tm);
size_t len = strftime(buf, sizeof(buf), "%m-%d %T", &tm);
int ms = tv.tv_usec / 1000;
len += sprintf(buf + len, ".%03d %c : ", ms, type);
strcpy(buf + len, fmt);
return vfprintf(log_file, buf, ap);
}
static void android_logging() { static void android_logging() {
static constexpr char TAG[] = "Magisk"; log_file = make_stream_fp<byte_stream>(log_buf, log_buf_len).release();
log_cb.d = [](auto fmt, auto ap){ return vlog(ANDROID_LOG_DEBUG, TAG, fmt, ap); }; log_cb.d = [](auto fmt, auto ap){ return magisk_log(ANDROID_LOG_DEBUG, fmt, ap); };
log_cb.i = [](auto fmt, auto ap){ return vlog(ANDROID_LOG_INFO, TAG, fmt, ap); }; log_cb.i = [](auto fmt, auto ap){ return magisk_log(ANDROID_LOG_INFO, fmt, ap); };
log_cb.w = [](auto fmt, auto ap){ return vlog(ANDROID_LOG_WARN, TAG, fmt, ap); }; log_cb.w = [](auto fmt, auto ap){ return magisk_log(ANDROID_LOG_WARN, fmt, ap); };
log_cb.e = [](auto fmt, auto ap){ return vlog(ANDROID_LOG_ERROR, TAG, fmt, ap); }; log_cb.e = [](auto fmt, auto ap){ return magisk_log(ANDROID_LOG_ERROR, fmt, ap); };
log_cb.ex = nop_ex; log_cb.ex = nop_ex;
} }

View File

@ -53,6 +53,7 @@ void su_daemon_handler(int client, ucred *credential);
int connect_daemon(bool create = false); int connect_daemon(bool create = false);
void unlock_blocks(); void unlock_blocks();
void reboot(); void reboot();
void setup_logfile(bool reset);
// Module stuffs // Module stuffs
void handle_modules(); void handle_modules();

View File

@ -353,7 +353,7 @@ void file_readline(bool trim, const char *file, const function<bool(string_view)
free(buf); free(buf);
} }
void parse_prop_file(const char *file, const function<bool(string_view, string_view)> &&fn) { void parse_prop_file(const char *file, const function<bool(string_view, string_view)> &fn) {
file_readline(true, file, [&](string_view line_view) -> bool { file_readline(true, file, [&](string_view line_view) -> bool {
char *line = (char *) line_view.data(); char *line = (char *) line_view.data();
if (line[0] == '#') if (line[0] == '#')
@ -422,3 +422,11 @@ void restore_folder(const char *dir, vector<raw_file> &files) {
setattr(path.data(), &file.attr); setattr(path.data(), &file.attr);
} }
} }
sDIR make_dir(DIR *dp) {
return sDIR(dp, [](DIR *dp){ return dp ? closedir(dp) : 1; });
}
sFILE make_file(FILE *fp) {
return sFILE(fp, [](FILE *fp){ return fp ? fclose(fp) : 1; });
}

View File

@ -67,7 +67,7 @@ static inline void file_readline(const char *file,
file_readline(false, file, fn); file_readline(false, file, fn);
} }
void parse_prop_file(const char *file, void parse_prop_file(const char *file,
const std::function<bool(std::string_view, std::string_view)> &&fn); const std::function<bool(std::string_view, std::string_view)> &fn);
void *__mmap(const char *filename, size_t *size, bool rw); void *__mmap(const char *filename, size_t *size, bool rw);
void frm_rf(int dirfd); void frm_rf(int dirfd);
void clone_dir(int src, int dest); void clone_dir(int src, int dest);
@ -113,27 +113,29 @@ void mmap_rw(const char *filename, B &buf, L &sz) {
using sFILE = std::unique_ptr<FILE, decltype(&fclose)>; using sFILE = std::unique_ptr<FILE, decltype(&fclose)>;
using sDIR = std::unique_ptr<DIR, decltype(&closedir)>; using sDIR = std::unique_ptr<DIR, decltype(&closedir)>;
sDIR make_dir(DIR *dp);
sFILE make_file(FILE *fp);
static inline sDIR open_dir(const char *path) { static inline sDIR open_dir(const char *path) {
return sDIR(opendir(path), closedir); return make_dir(opendir(path));
} }
static inline sDIR xopen_dir(const char *path) { static inline sDIR xopen_dir(const char *path) {
return sDIR(xopendir(path), closedir); return make_dir(xopendir(path));
} }
static inline sDIR xopen_dir(int dirfd) { static inline sDIR xopen_dir(int dirfd) {
return sDIR(xfdopendir(dirfd), closedir); return make_dir(xfdopendir(dirfd));
} }
static inline sFILE open_file(const char *path, const char *mode) { static inline sFILE open_file(const char *path, const char *mode) {
return sFILE(fopen(path, mode), fclose); return make_file(fopen(path, mode));
} }
static inline sFILE xopen_file(const char *path, const char *mode) { static inline sFILE xopen_file(const char *path, const char *mode) {
return sFILE(xfopen(path, mode), fclose); return make_file(xfopen(path, mode));
} }
static inline sFILE xopen_file(int fd, const char *mode) { static inline sFILE xopen_file(int fd, const char *mode) {
return sFILE(xfdopen(fd, mode), fclose); return make_file(xfdopen(fd, mode));
} }

View File

@ -23,7 +23,7 @@ static int strm_close(void *v) {
} }
sFILE make_stream_fp(stream_ptr &&strm) { sFILE make_stream_fp(stream_ptr &&strm) {
sFILE fp(funopen(strm.release(), strm_read, strm_write, strm_seek, strm_close), fclose); auto fp = make_file(funopen(strm.release(), strm_read, strm_write, strm_seek, strm_close));
setbuf(fp.get(), nullptr); setbuf(fp.get(), nullptr);
return fp; return fp;
} }