WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust logs for dex2oat 

1. Log dex2oat for debugging purpose
2. Avoid log formatting warning of type `dev_t` since it could be `%lu`
   or `%u`
3. Reformat changed files
This commit is contained in:
JingMatrix 2025-03-07 06:03:54 +01:00
parent 3cdf5ac345
commit 165ad94bf9
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemon/src/main/jni/dex2oat.cpp
View File

@ -16,23 +16,20 @@
* *
* Copyright (C) 2023 LSPosed Contributors * Copyright (C) 2023 LSPosed Contributors
*/ */
#include <fcntl.h> #include <fcntl.h>
#include <jni.h> #include <jni.h>
#include <string> #include <sched.h>
#include <stdlib.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <sched.h>
#include <string>
#include "logging.h" #include "logging.h"
extern "C" extern "C" JNIEXPORT void JNICALL Java_org_lsposed_lspd_service_Dex2OatService_doMountNative(
JNIEXPORT void JNICALL JNIEnv *env, jobject, jboolean enabled, jstring r32, jstring d32, jstring r64, jstring d64) {
Java_org_lsposed_lspd_service_Dex2OatService_doMountNative(JNIEnv *env, jobject,
jboolean enabled,
jstring r32, jstring d32,
jstring r64, jstring d64) {
char dex2oat32[PATH_MAX], dex2oat64[PATH_MAX]; char dex2oat32[PATH_MAX], dex2oat64[PATH_MAX];
realpath("bin/dex2oat32", dex2oat32); realpath("bin/dex2oat32", dex2oat32);
realpath("bin/dex2oat64", dex2oat64); realpath("bin/dex2oat64", dex2oat64);
@ -102,8 +99,7 @@ static int setsockcreatecon_raw(const char *context) {
return ret < 0 ? -1 : 0; return ret < 0 ? -1 : 0;
} }
extern "C" extern "C" JNIEXPORT jboolean JNICALL
JNIEXPORT jboolean JNICALL
Java_org_lsposed_lspd_service_Dex2OatService_setSockCreateContext(JNIEnv *env, jclass, Java_org_lsposed_lspd_service_Dex2OatService_setSockCreateContext(JNIEnv *env, jclass,
jstring contextStr) { jstring contextStr) {
const char *context = env->GetStringUTFChars(contextStr, nullptr); const char *context = env->GetStringUTFChars(contextStr, nullptr);
@ -112,8 +108,7 @@ Java_org_lsposed_lspd_service_Dex2OatService_setSockCreateContext(JNIEnv *env, j
return ret == 0; return ret == 0;
} }
extern "C" extern "C" JNIEXPORT jstring JNICALL
JNIEXPORT jstring JNICALL
Java_org_lsposed_lspd_service_Dex2OatService_getSockPath(JNIEnv *env, jobject) { Java_org_lsposed_lspd_service_Dex2OatService_getSockPath(JNIEnv *env, jobject) {
return env->NewStringUTF("5291374ceda0aef7c5d86cd2a4f6a3ac\0"); return env->NewStringUTF("5291374ceda0aef7c5d86cd2a4f6a3ac\0");
} }

8
daemon/src/main/jni/logcat.cpp
View File

@ -226,10 +226,10 @@ void Logcat::ProcessBuffer(struct log_msg *buf) {
shortcut = true; shortcut = true;
} }
if (verbose_ && (shortcut || buf->id() == log_id::LOG_ID_CRASH || entry.pid == my_pid_ || if (verbose_ && (shortcut || buf->id() == log_id::LOG_ID_CRASH || entry.pid == my_pid_ ||
tag == "APatchD"sv || tag == "Dobby"sv || tag == "KernelSU"sv || tag == "APatchD"sv || tag == "Dobby"sv || tag.starts_with("dex2oat"sv) ||
tag == "LSPlant"sv || tag == "LSPlt"sv || tag.starts_with("LSPosed"sv) || tag == "KernelSU"sv || tag == "LSPlant"sv || tag == "LSPlt"sv ||
tag == "Magisk"sv || tag == "SELinux"sv || tag.starts_with("zygisk"sv))) tag.starts_with("LSPosed"sv) || tag == "Magisk"sv || tag == "SELinux"sv ||
[[unlikely]] { tag.starts_with("zygisk"sv))) [[unlikely]] {
verbose_print_count_ += PrintLogLine(entry, verbose_file_.get()); verbose_print_count_ += PrintLogLine(entry, verbose_file_.get());
} }
if (entry.pid == my_pid_ && tag == "LSPosedLogcat"sv) [[unlikely]] { if (entry.pid == my_pid_ && tag == "LSPosedLogcat"sv) [[unlikely]] {

1
dex2oat/src/main/cpp/oat_hook.cpp
View File

@ -106,7 +106,6 @@ __attribute__((constructor)) static void initialize() {
break; break;
} }
} }
LOGD("dex2oat binary %lu:%lu", dev, inode);
PLT_HOOK_REGISTER(dev, inode, _ZNK3art9OatHeader20GetKeyValueStoreSizeEv); PLT_HOOK_REGISTER(dev, inode, _ZNK3art9OatHeader20GetKeyValueStoreSizeEv);
PLT_HOOK_REGISTER(dev, inode, _ZNK3art9OatHeader16GetKeyValueStoreEv); PLT_HOOK_REGISTER(dev, inode, _ZNK3art9OatHeader16GetKeyValueStoreEv);