Changeset 6adb775f in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2016-04-25T16:46:31Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

32573ff

Parents:

dc0d8b52

Message:

TLS for dynamically linked executables and initially loaded DSOs (but must not call dlopen or there will be trouble).

File:

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

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

@@ -37 +37 @@
 #include <adt/list.h>
 #include <elf/elf_load.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <loader/pcb.h>
@@ -129 +130 @@
         int rc;
         
-        m = malloc(sizeof(module_t));
-        if (!m) {
+        m = calloc(1, sizeof(module_t));
+        if (m == NULL) {
                 printf("malloc failed\n");
                 exit(1);
@@ -136 +137 @@
 
         m->rtld = rtld;
+        m->id = rtld_get_next_id(rtld);
 
         if (str_size(name) > NAME_BUF_SIZE - 2) {
@@ -174 +176 @@
         /* Insert into the list of loaded modules */
         list_append(&m->modules_link, &rtld->modules);
+
+        /* Copy TLS info */
+        m->tdata = info.tls.tdata;
+        m->tdata_size = info.tls.tdata_size;
+        m->tbss_size = info.tls.tbss_size;
+
+        printf("tdata at %p size %zu, tbss size %zu\n",
+            m->tdata, m->tdata_size, m->tbss_size);
 
         return m;
@@ -236 +246 @@
 }
 
+/** Find module structure by ID. */
+module_t *module_by_id(rtld_t *rtld, unsigned long id)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                if (m->id == id)
+                        return m;
+        }
+
+        return NULL;
+}
+
 /** Process relocations in modules.
  *
@@ -253 +274 @@
 }
 
+void modules_process_tls(rtld_t *rtld)
+{
+        list_foreach(rtld->modules, modules_link, module_t, m) {
+                m->ioffs = rtld->tls_size;
+                rtld->tls_size += m->tdata_size + m->tbss_size;
+        }
+}
+
 /** Clear BFS tags of all modules.
  */