Commit 7ffc0d08 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

scripts/sorttable: Make compare_extable() into two functions 

Instead of having the compare_extable() part of the sorttable.h header
where it get's defined twice, since it is a very simple function, just
define it twice in sorttable.c, and then it can use the proper read
functions for the word size and endianess and the Elf_Addr macro can be
removed from sorttable.h.

Also add a micro optimization. Instead of:

    if (a < b)
        return -1;
    if (a > b)
        return 1;
    return 0;

That can be shorten to:

   if (a < b)
      return -1;
   return a > b;

Cc: bpf <bpf@vger.kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nicolas Schier <nicolas@fjasle.eu>
Cc: Zheng Yejian <zhengyejian1@huawei.com>
Cc: Martin  Kelly <martin.kelly@crowdstrike.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/20250105162344.945299671@goodmis.org


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 66990c00

scripts/sorttable.c

+20 −0
Original line number Diff line number Diff line
@@ -173,6 +173,26 @@ static inline unsigned int get_secindex(unsigned int shndx, 
	return r(&symtab_shndx_start[sym_offs]);

}



static int compare_extable_32(const void *a, const void *b)

{

	Elf32_Addr av = r(a);

	Elf32_Addr bv = r(b);



	if (av < bv)

		return -1;

	return av > bv;

}



static int compare_extable_64(const void *a, const void *b)

{

	Elf64_Addr av = r8(a);

	Elf64_Addr bv = r8(b);



	if (av < bv)

		return -1;

	return av > bv;

}



/* 32 bit and 64 bit are very similar */

#include "sorttable.h"

#define SORTTABLE_64

scripts/sorttable.h

+0 −14
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#undef sort_mcount_loc

#undef elf_mcount_loc

#undef do_sort

#undef Elf_Addr

#undef Elf_Ehdr

#undef Elf_Shdr

#undef Elf_Sym
@@ -38,7 +37,6 @@ 
# define sort_mcount_loc	sort_mcount_loc_64

# define elf_mcount_loc		elf_mcount_loc_64

# define do_sort		do_sort_64

# define Elf_Addr		Elf64_Addr

# define Elf_Ehdr		Elf64_Ehdr

# define Elf_Shdr		Elf64_Shdr

# define Elf_Sym		Elf64_Sym
@@ -52,7 +50,6 @@ 
# define sort_mcount_loc	sort_mcount_loc_32

# define elf_mcount_loc		elf_mcount_loc_32

# define do_sort		do_sort_32

# define Elf_Addr		Elf32_Addr

# define Elf_Ehdr		Elf32_Ehdr

# define Elf_Shdr		Elf32_Shdr

# define Elf_Sym		Elf32_Sym
@@ -160,17 +157,6 @@ static void *sort_orctable(void *arg) 
}

#endif



static int compare_extable(const void *a, const void *b)

{

	Elf_Addr av = _r(a);

	Elf_Addr bv = _r(b);



	if (av < bv)

		return -1;

	if (av > bv)

		return 1;

	return 0;

}

#ifdef MCOUNT_SORT_ENABLED

pthread_t mcount_sort_thread;