Changes in uspace/lib/c/generic/rtld/symbol.c [5035ba05:17341d4] in mainline

File:

• uspace/lib/c/generic/rtld/symbol.c (modified) (4 diffs)

uspace/lib/c/generic/rtld/symbol.c

@@ -112 +112 @@
  * @param name          Name of the symbol to search for.
  * @param start         Module in which to start the search..
+ * @param flags         @c ssf_none or @c ssf_noroot to not look for the symbol
+ *                      in @a start
  * @param mod           (output) Will be filled with a pointer to the module 
  *                      that contains the symbol.
  */
 elf_symbol_t *symbol_bfs_find(const char *name, module_t *start,
-    module_t **mod)
+    symbol_search_flags_t flags, module_t **mod)
 {
         module_t *m, *dm;
@@ -148 +150 @@
 
                 /* If ssf_noroot is specified, do not look in start module */
-                s = def_find_in_module(name, m);
-                if (s != NULL) {
-                        /* Symbol found */
-                        sym = s;
-                        *mod = m;
-                        break;
+                if (m != start || (flags & ssf_noroot) == 0) { 
+                        s = def_find_in_module(name, m);
+                        if (s != NULL) {
+                                /* Symbol found */
+                                sym = s;
+                                *mod = m;
+                                break;
+                        }
                 }
 
@@ -185 +189 @@
  *
  * By definition in System V ABI, if module origin has the flag DT_SYMBOLIC,
- * origin is searched first. Otherwise, search global modules in the default
- * order.
+ * origin is searched first. Otherwise, or if the symbol hasn't been found,
+ * the module dependency graph is searched breadth-first, beginning
+ * from the executable program.
  *
  * @param name          Name of the symbol to search for.
  * @param origin        Module in which the dependency originates.
- * @param flags         @c ssf_none or @c ssf_noexec to not look for the symbol
+ * @param flags         @c ssf_none or @c ssf_noroot to not look for the symbol
  *                      in the executable program.
  * @param mod           (output) Will be filled with a pointer to the module 
@@ -200 +205 @@
         elf_symbol_t *s;
 
-        DPRINTF("symbol_def_find('%s', origin='%s'\n",
-            name, origin->dyn.soname);
-        if (origin->dyn.symbolic && (!origin->exec || (flags & ssf_noexec) == 0)) {
-                DPRINTF("symbolic->find '%s' in module '%s'\n", name, origin->dyn.soname);
-                /*
+        if (origin->dyn.symbolic) {
+                /* 
                  * Origin module has a DT_SYMBOLIC flag.
                  * Try this module first
                  */
-                s = def_find_in_module(name, origin);
-                if (s != NULL) {
+                 s = def_find_in_module(name, origin);
+                 if (s != NULL) {
                         /* Found */
                         *mod = origin;
                         return s;
-                }
+                 }
         }
 
         /* Not DT_SYMBOLIC or no match. Now try other locations. */
 
-        list_foreach(origin->rtld->modules, modules_link, module_t, m) {
-                DPRINTF("module '%s' local?\n", m->dyn.soname);
-                if (!m->local && (!m->exec || (flags & ssf_noexec) == 0)) {
-                        DPRINTF("!local->find '%s' in module '%s'\n", name, m->dyn.soname);
-                        s = def_find_in_module(name, m);
-                        if (s != NULL) {
-                                /* Found */
-                                *mod = m;
-                                return s;
-                        }
-                }
-        }
-
-        /* Finally, try origin. */
-
-        DPRINTF("try finding '%s' in origin '%s'\n", name,
-            origin->dyn.soname);
-
-        if (!origin->exec || (flags & ssf_noexec) == 0) {
-                s = def_find_in_module(name, origin);
-                if (s != NULL) {
-                        /* Found */
-                        *mod = origin;
-                        return s;
-                }
-        }
-
-        DPRINTF("'%s' not found\n", name);
-        return NULL;
+        if (origin->rtld->program) {
+                /* Program is dynamic -- start with program as root. */
+                return symbol_bfs_find(name, origin->rtld->program, flags, mod);
+        } else {
+                /* Program is static -- start with @a origin as root. */
+                return symbol_bfs_find(name, origin, ssf_none, mod);
+        }
 }