Changeset 17341d4 in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2016-04-20T17:25:48Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dc0d8b52

Parents:

13dfa3f9

Message:

Move rtld internals out of loader. Stop misusing rtld instance from current environment for loading dynamically linked executables.

File:

• uspace/lib/c/generic/rtld/module.c (modified) (9 diffs)

uspace/lib/c/generic/rtld/module.c

@@ -91 +91 @@
  * path components are ignored.
  */
-module_t *module_find(const char *name)
+module_t *module_find(rtld_t *rtld, const char *name)
 {
         const char *p, *soname;
@@ -106 +106 @@
 
         /* Traverse list of all modules. Not extremely fast, but simple */
-        list_foreach(runtime_env->modules, modules_link, module_t, m) {
+        list_foreach(rtld->modules, modules_link, module_t, m) {
                 DPRINTF("m = %p\n", m);
                 if (str_cmp(m->dyn.soname, soname) == 0) {
@@ -122 +122 @@
  * Currently this trivially tries to load '/<name>'.
  */
-module_t *module_load(const char *name)
-{
-        elf_info_t info;
+module_t *module_load(rtld_t *rtld, const char *name)
+{
+        elf_finfo_t info;
         char name_buf[NAME_BUF_SIZE];
         module_t *m;
@@ -135 +135 @@
         }
 
+        m->rtld = rtld;
+
         if (str_size(name) > NAME_BUF_SIZE - 2) {
                 printf("soname too long. increase NAME_BUF_SIZE\n");
@@ -145 +147 @@
 
         /* FIXME: need to real allocation of address space */
-        m->bias = runtime_env->next_bias;
-        runtime_env->next_bias += 0x100000;
+        m->bias = rtld->next_bias;
+        rtld->next_bias += 0x100000;
 
         DPRINTF("filename:'%s'\n", name_buf);
@@ -171 +173 @@
 
         /* Insert into the list of loaded modules */
-        list_append(&m->modules_link, &runtime_env->modules);
+        list_append(&m->modules_link, &rtld->modules);
 
         return m;
@@ -221 +223 @@
 
                         DPRINTF("%s needs %s\n", m->dyn.soname, dep_name);
-                        dm = module_find(dep_name);
+                        dm = module_find(m->rtld, dep_name);
                         if (!dm) {
-                                dm = module_load(dep_name);
+                                dm = module_load(m->rtld, dep_name);
                                 module_load_deps(dm);
                         }
@@ -241 +243 @@
  * @param       start   The module where to start from.
  */
-void modules_process_relocs(module_t *start)
-{
-        list_foreach(runtime_env->modules, modules_link, module_t, m) {
-                /* Skip rtld, since it has already been processed */
-                if (m != &runtime_env->rtld) {
+void modules_process_relocs(rtld_t *rtld, module_t *start)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                /* Skip rtld module, since it has already been processed */
+                if (m != &rtld->rtld) {
                         module_process_relocs(m);
                 }
@@ -253 +255 @@
 /** Clear BFS tags of all modules.
  */
-void modules_untag(void)
-{
-        list_foreach(runtime_env->modules, modules_link, module_t, m) {
+void modules_untag(rtld_t *rtld)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
                 m->bfs_tag = false;
         }