joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Enable libbpf logging in bpf loader" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-03-18 16:46:22 -07:00 • committed by Gerrit Code Review
commit 0c2cb82014
1 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
bpf/loader/NetBpfLoad.cpp
View file

@ -1414,6 +1414,29 @@ static bool isWear() {
return wear;
}
static int libbpfPrint(enum libbpf_print_level lvl, const char *const formatStr,
va_list argList) {
int32_t prio;
switch (lvl) {
case LIBBPF_WARN:
prio = ANDROID_LOG_WARN;
break;
case LIBBPF_INFO:
prio = ANDROID_LOG_INFO;
break;
case LIBBPF_DEBUG:
prio = ANDROID_LOG_DEBUG;
break;
}
char *s = strdup(formatStr ?: "(no format string)");
int len = strlen(s);
if (len && s[len - 1] == '\n')
s[len - 1] = 0;
LOG_PRI_VA(prio, LOG_TAG, s, argList);
free(s);
return 0;
}
static int doLoad(char** argv, char * const envp[]) {
if (!isAtLeastS) {
ALOGE("Impossible - not reachable on Android <S.");
@ -1421,6 +1444,7 @@ static int doLoad(char** argv, char * const envp[]) {
// for any possible busted 'optimized' start everything vendor init hacks on R
return 0;
}
libbpf_set_print(libbpfPrint);
const bool runningAsRoot = !getuid(); // true iff U QPR3 or V+