104 lines
2.8 KiB
Diff
104 lines
2.8 KiB
Diff
From 214f9bf3727c3350401b3f4b4389258c24486e06 Mon Sep 17 00:00:00 2001
|
|
From: Tao Liu <ltao@redhat.com>
|
|
Date: Sat, 16 Oct 2021 13:21:12 +0800
|
|
Subject: [PATCH 2/9] symbols: Integrate symbol_search() with mod_symname_hash
|
|
search
|
|
|
|
This patch introduces mod_symname_hash search to symbol_search(),
|
|
to get a better searching performance.
|
|
|
|
Signed-off-by: Tao Liu <ltao@redhat.com>
|
|
Reviewed-by: Philipp Rudo <prudo@redhat.com>
|
|
---
|
|
symbols.c | 58 ++++++++++++++++++-------------------------------------
|
|
1 file changed, 19 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/symbols.c b/symbols.c
|
|
index ad12d1c22225..c4ad31fe926f 100644
|
|
--- a/symbols.c
|
|
+++ b/symbols.c
|
|
@@ -4551,6 +4551,17 @@ symbol_query(char *s, char *print_pad, struct syment **spp)
|
|
return(cnt);
|
|
}
|
|
|
|
+static int
|
|
+skip_symbols(struct syment *sp, char *s)
|
|
+{
|
|
+ int pseudos, skip = FALSE;
|
|
+
|
|
+ pseudos = (strstr(s, "_MODULE_START_") || strstr(s, "_MODULE_END_") ||
|
|
+ strstr(s, "_MODULE_INIT_START_") || strstr(s, "_MODULE_INIT_END_"));
|
|
+ if (!pseudos && MODULE_PSEUDO_SYMBOL(sp))
|
|
+ skip = TRUE;
|
|
+ return skip;
|
|
+}
|
|
|
|
/*
|
|
* Return the syment of a symbol.
|
|
@@ -4558,10 +4569,7 @@ symbol_query(char *s, char *print_pad, struct syment **spp)
|
|
struct syment *
|
|
symbol_search(char *s)
|
|
{
|
|
- int i;
|
|
- struct syment *sp_hashed, *sp, *sp_end;
|
|
- struct load_module *lm;
|
|
- int pseudos, search_init;
|
|
+ struct syment *sp_hashed, *sp;
|
|
|
|
sp_hashed = symname_hash_search(s);
|
|
|
|
@@ -4570,43 +4578,15 @@ symbol_search(char *s)
|
|
return(sp);
|
|
}
|
|
|
|
- pseudos = (strstr(s, "_MODULE_START_") || strstr(s, "_MODULE_END_"));
|
|
- search_init = FALSE;
|
|
-
|
|
- for (i = 0; i < st->mods_installed; i++) {
|
|
- lm = &st->load_modules[i];
|
|
- if (lm->mod_flags & MOD_INIT)
|
|
- search_init = TRUE;
|
|
- sp = lm->mod_symtable;
|
|
- sp_end = lm->mod_symend;
|
|
-
|
|
- for ( ; sp <= sp_end; sp++) {
|
|
- if (!pseudos && MODULE_PSEUDO_SYMBOL(sp))
|
|
- continue;
|
|
- if (STREQ(s, sp->name))
|
|
- return(sp);
|
|
- }
|
|
- }
|
|
-
|
|
- if (!search_init)
|
|
- return((struct syment *)NULL);
|
|
-
|
|
- pseudos = (strstr(s, "_MODULE_INIT_START_") || strstr(s, "_MODULE_INIT_END_"));
|
|
-
|
|
- for (i = 0; i < st->mods_installed; i++) {
|
|
- lm = &st->load_modules[i];
|
|
- if (!lm->mod_init_symtable)
|
|
+ sp = st->mod_symname_hash[SYMNAME_HASH_INDEX(s)];
|
|
+ while (sp) {
|
|
+ if (skip_symbols(sp, s)) {
|
|
+ sp = sp->name_hash_next;
|
|
continue;
|
|
- sp = lm->mod_init_symtable;
|
|
- sp_end = lm->mod_init_symend;
|
|
-
|
|
- for ( ; sp < sp_end; sp++) {
|
|
- if (!pseudos && MODULE_PSEUDO_SYMBOL(sp))
|
|
- continue;
|
|
-
|
|
- if (STREQ(s, sp->name))
|
|
- return(sp);
|
|
}
|
|
+ if (STREQ(sp->name, s))
|
|
+ return sp;
|
|
+ sp = sp->name_hash_next;
|
|
}
|
|
|
|
return((struct syment *)NULL);
|
|
--
|
|
2.30.2
|
|
|