'static inline' -> 'inline' am: 06caf87004 am: 237f079a9b
Change-Id: I4853b4bce8459a77f6d83058514744d12bc5c3ff
diff --git a/libbpf_android/include/bpf/BpfUtils.h b/libbpf_android/include/bpf/BpfUtils.h
index 92cfa50..af2d88a 100644
--- a/libbpf_android/include/bpf/BpfUtils.h
+++ b/libbpf_android/include/bpf/BpfUtils.h
@@ -57,12 +57,12 @@
* all unused portions are zero. It will fail with E2BIG if we don't fully zero bpf_attr.
*/
-static inline int bpf(int cmd, const bpf_attr& attr) {
+inline int bpf(int cmd, const bpf_attr& attr) {
return syscall(__NR_bpf, cmd, &attr, sizeof(attr));
}
-static inline int createMap(bpf_map_type map_type, uint32_t key_size, uint32_t value_size,
- uint32_t max_entries, uint32_t map_flags) {
+inline int createMap(bpf_map_type map_type, uint32_t key_size, uint32_t value_size,
+ uint32_t max_entries, uint32_t map_flags) {
return bpf(BPF_MAP_CREATE, {
.map_type = map_type,
.key_size = key_size,
@@ -72,8 +72,8 @@
});
}
-static inline int writeToMapEntry(const base::unique_fd& map_fd, const void* key, const void* value,
- uint64_t flags) {
+inline int writeToMapEntry(const base::unique_fd& map_fd, const void* key, const void* value,
+ uint64_t flags) {
return bpf(BPF_MAP_UPDATE_ELEM, {
.map_fd = static_cast<__u32>(map_fd.get()),
.key = ptr_to_u64(key),
@@ -82,7 +82,7 @@
});
}
-static inline int findMapEntry(const base::unique_fd& map_fd, const void* key, void* value) {
+inline int findMapEntry(const base::unique_fd& map_fd, const void* key, void* value) {
return bpf(BPF_MAP_LOOKUP_ELEM, {
.map_fd = static_cast<__u32>(map_fd.get()),
.key = ptr_to_u64(key),
@@ -90,14 +90,14 @@
});
}
-static inline int deleteMapEntry(const base::unique_fd& map_fd, const void* key) {
+inline int deleteMapEntry(const base::unique_fd& map_fd, const void* key) {
return bpf(BPF_MAP_DELETE_ELEM, {
.map_fd = static_cast<__u32>(map_fd.get()),
.key = ptr_to_u64(key),
});
}
-static inline int getNextMapKey(const base::unique_fd& map_fd, const void* key, void* next_key) {
+inline int getNextMapKey(const base::unique_fd& map_fd, const void* key, void* next_key) {
return bpf(BPF_MAP_GET_NEXT_KEY, {
.map_fd = static_cast<__u32>(map_fd.get()),
.key = ptr_to_u64(key),
@@ -105,30 +105,30 @@
});
}
-static inline int getFirstMapKey(const base::unique_fd& map_fd, void* firstKey) {
+inline int getFirstMapKey(const base::unique_fd& map_fd, void* firstKey) {
return getNextMapKey(map_fd, NULL, firstKey);
}
-static inline int bpfFdPin(const base::unique_fd& map_fd, const char* pathname) {
+inline int bpfFdPin(const base::unique_fd& map_fd, const char* pathname) {
return bpf(BPF_OBJ_PIN, {
.pathname = ptr_to_u64(pathname),
.bpf_fd = static_cast<__u32>(map_fd.get()),
});
}
-static inline int bpfFdGet(const char* pathname, uint32_t flag) {
+inline int bpfFdGet(const char* pathname, uint32_t flag) {
return bpf(BPF_OBJ_GET, {
.pathname = ptr_to_u64(pathname),
.file_flags = flag,
});
}
-static inline int mapRetrieve(const char* pathname, uint32_t flag) {
+inline int mapRetrieve(const char* pathname, uint32_t flag) {
return bpfFdGet(pathname, flag);
}
-static inline int attachProgram(bpf_attach_type type, const base::unique_fd& prog_fd,
- const base::unique_fd& cg_fd) {
+inline int attachProgram(bpf_attach_type type, const base::unique_fd& prog_fd,
+ const base::unique_fd& cg_fd) {
return bpf(BPF_PROG_ATTACH, {
.target_fd = static_cast<__u32>(cg_fd.get()),
.attach_bpf_fd = static_cast<__u32>(prog_fd.get()),
@@ -136,7 +136,7 @@
});
}
-static inline int detachProgram(bpf_attach_type type, const base::unique_fd& cg_fd) {
+inline int detachProgram(bpf_attach_type type, const base::unique_fd& cg_fd) {
return bpf(BPF_PROG_DETACH, {
.target_fd = static_cast<__u32>(cg_fd.get()),
.attach_type = type,
@@ -149,7 +149,7 @@
std::string BpfLevelToString(BpfLevel BpfLevel);
BpfLevel getBpfSupportLevel();
-static inline bool isBpfSupported() {
+inline bool isBpfSupported() {
return getBpfSupportLevel() != BpfLevel::NONE;
}