d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtld: extract printer for a single traced object into a helper

Browse Source 
Reviewed by:	markj
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D34716
This commit is contained in:
Konstantin Belousov 2022-03-30 23:46:21 +03:00
parent c25f36f630
commit 24d0c9c1f5
1 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
libexec/rtld-elf/rtld.c
View File

@ -4936,36 +4936,13 @@ trace_calc_fmts(const char **main_local, const char **fmt1, const char **fmt2)
}
static void
trace_loaded_objects(Obj_Entry *obj)
trace_print_obj(Obj_Entry *obj, const char *name, const char *path,
const char *main_local, const char *fmt1, const char *fmt2)
{
const char *fmt1, *fmt2, *fmt, *main_local, *list_containers;
const char *fmt;
int c;
trace_calc_fmts(&main_local, &fmt1, &fmt2);
list_containers = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_ALL);
for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
Needed_Entry *needed;
const char *name, *path;
bool is_lib;
if (obj->marker)
continue;
if (list_containers && obj->needed != NULL)
rtld_printf("%s:\n", obj->path);
for (needed = obj->needed; needed; needed = needed->next) {
if (needed->obj != NULL) {
if (needed->obj->traced && !list_containers)
continue;
needed->obj->traced = true;
path = needed->obj->path;
} else
path = "not found";
name = obj->strtab + needed->name;
is_lib = strncmp(name, "lib", 3) == 0; /* XXX - bogus */
fmt = is_lib ? fmt1 : fmt2;
fmt = strncmp(name, "lib", 3) == 0 ? fmt1 : fmt2; /* XXX bogus */
while ((c = *fmt++) != '\0') {
switch (c) {
default:
@ -5000,26 +4977,47 @@ trace_loaded_objects(Obj_Entry *obj)
case 'o':
rtld_putstr(name);
break;
#if 0
case 'm':
rtld_printf("%d", sodp->sod_major);
break;
case 'n':
rtld_printf("%d", sodp->sod_minor);
break;
#endif
case 'p':
rtld_putstr(path);
break;
case 'x':
rtld_printf("%p", needed->obj ? needed->obj->mapbase :
0);
rtld_printf("%p", obj != NULL ?
obj->mapbase : NULL);
break;
}
break;
}
++fmt;
}
}
static void
trace_loaded_objects(Obj_Entry *obj)
{
const char *fmt1, *fmt2, *main_local, *list_containers;
trace_calc_fmts(&main_local, &fmt1, &fmt2);
list_containers = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_ALL);
for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) {
Needed_Entry *needed;
const char *name, *path;
if (obj->marker)
continue;
if (list_containers && obj->needed != NULL)
rtld_printf("%s:\n", obj->path);
for (needed = obj->needed; needed; needed = needed->next) {
if (needed->obj != NULL) {
if (needed->obj->traced && !list_containers)
continue;
needed->obj->traced = true;
path = needed->obj->path;
} else
path = "not found";
name = obj->strtab + needed->name;
trace_print_obj(obj, name, path, main_local, fmt1, fmt2);
}
}
}