Commit d7fe74f9 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann
Browse files

libbpf: add common min/max macro to libbpf_internal.h 



Multiple files in libbpf redefine their own definitions for min/max.
Let's define them in libbpf_internal.h and use those everywhere.

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 7f94208c

tools/lib/bpf/bpf.c

+2 −5
Original line number Diff line number Diff line
@@ -26,10 +26,11 @@ 
#include <memory.h>

#include <unistd.h>

#include <asm/unistd.h>

#include <errno.h>

#include <linux/bpf.h>

#include "bpf.h"

#include "libbpf.h"

#include <errno.h>

#include "libbpf_internal.h"



/*

 * When building perf, unistd.h is overridden. __NR_bpf is
@@ -53,10 +54,6 @@ 
# endif

#endif



#ifndef min

#define min(x, y) ((x) < (y) ? (x) : (y))

#endif



static inline __u64 ptr_to_u64(const void *ptr)

{

	return (__u64) (unsigned long) ptr;

tools/lib/bpf/bpf_prog_linfo.c

+1 −4
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ 
#include <linux/err.h>

#include <linux/bpf.h>

#include "libbpf.h"



#ifndef min

#define min(x, y) ((x) < (y) ? (x) : (y))

#endif

#include "libbpf_internal.h"



struct bpf_prog_linfo {

	void *raw_linfo;

tools/lib/bpf/btf.c

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
#include "libbpf_internal.h"

#include "hashmap.h"



#define max(a, b) ((a) > (b) ? (a) : (b))

#define min(a, b) ((a) < (b) ? (a) : (b))



#define BTF_MAX_NR_TYPES 0x7fffffff

#define BTF_MAX_STR_OFFSET 0x7fffffff

tools/lib/bpf/btf_dump.c

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
#include "libbpf.h"

#include "libbpf_internal.h"



#define min(x, y) ((x) < (y) ? (x) : (y))

#define max(x, y) ((x) < (y) ? (y) : (x))



static const char PREFIXES[] = "\t\t\t\t\t\t\t\t\t\t\t\t\t";

static const size_t PREFIX_CNT = sizeof(PREFIXES) - 1;

tools/lib/bpf/libbpf_internal.h

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ 
#define BTF_PARAM_ENC(name, type) (name), (type)

#define BTF_VAR_SECINFO_ENC(type, offset, size) (type), (offset), (size)



#ifndef min

# define min(x, y) ((x) < (y) ? (x) : (y))

#endif

#ifndef max

# define max(x, y) ((x) < (y) ? (y) : (x))

#endif



extern void libbpf_print(enum libbpf_print_level level,

			 const char *format, ...)

	__attribute__((format(printf, 2, 3)));

CRA Git | Maintained and supported by SUSTech CRA and CCSE