diff options
| author | Maciej Żenczykowski <maze@google.com> | 2021-07-06 10:37:12 +0000 |
|---|---|---|
| committer | Maciej Zenczykowski <maze@google.com> | 2021-07-06 10:50:12 +0000 |
| commit | c1f8ca3060b2f53e8a5e73c6b826d7e0c9932d8a (patch) | |
| tree | b4608f90b54a697c11c980d1bc849e4e5e03e7f8 | |
| parent | 2a51516a63c31076988e81a4126585bfd80b7eb4 (diff) | |
| download | bpf-android12-qpr1-d-s2-release.tar.gz | |
expose readSectionUint() for testingandroid-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Bug: 190519702
Test: atest bpf_module_test, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Original-Change: https://android-review.googlesource.com/1756850
Merged-In: I772c918d162440de6cc492b2faeafe03340fca11
Change-Id: I772c918d162440de6cc492b2faeafe03340fca11
| -rw-r--r-- | libbpf_android/Loader.cpp | 2 | ||||
| -rw-r--r-- | libbpf_android/include/libbpf_android.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp index aa1f3c0..259068a 100644 --- a/libbpf_android/Loader.cpp +++ b/libbpf_android/Loader.cpp @@ -210,7 +210,7 @@ static int readSectionByName(const char* name, ifstream& elfFile, vector<char>& return -2; } -static unsigned int readSectionUint(const char* name, ifstream& elfFile, unsigned int defVal) { +unsigned int readSectionUint(const char* name, ifstream& elfFile, unsigned int defVal) { vector<char> theBytes; int ret = readSectionByName(name, elfFile, theBytes); if (ret) { diff --git a/libbpf_android/include/libbpf_android.h b/libbpf_android/include/libbpf_android.h index 90c9906..640f35b 100644 --- a/libbpf_android/include/libbpf_android.h +++ b/libbpf_android/include/libbpf_android.h @@ -29,6 +29,9 @@ namespace bpf { // BPF loader implementation. Loads an eBPF ELF object int loadProg(const char* elfPath, bool* isCritical, const char* prefix = ""); +// Exposed for testing +unsigned int readSectionUint(const char* name, std::ifstream& elfFile, unsigned int defVal); + // Wait for bpfloader to load BPF programs. static inline void waitForProgsLoaded() { // infinite loop until success with 5/10/20/40/60/60/60... delay |