Changeset 6adb775f in mainline for uspace/lib/c/generic/tls.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/tls.c (modified) (5 diffs)

uspace/lib/c/generic/tls.c

@@ -34 +34 @@
  * Support for thread-local storage, as described in:
  *      Drepper U.: ELF Handling For Thread-Local Storage, 2005
- *
- * Only static model is supported.
- */ 
+ */
 
 #include <tls.h>
 #include <malloc.h>
 #include <str.h>
-#include <align.h>
 #include <unistd.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
+size_t tls_get_size(void)
+{
+        return &_tbss_end - &_tdata_start;
+}
+
 /** Create TLS (Thread Local Storage) data structures.
- *
- * The code requires, that sections .tdata and .tbss are adjacent. It may be
- * changed in the future.
  *
  * @return Pointer to TCB.
@@ -56 +59 @@
         tcb_t *tcb;
         size_t tls_size = &_tbss_end - &_tdata_start;
-        
+
+#ifdef CONFIG_RTLD
+        if (runtime_env != NULL)
+                return rtld_tls_make(runtime_env);
+#endif
         tcb = tls_alloc_arch(&data, tls_size);
         if (!tcb)
                 return NULL;
-        
+
         /*
          * Copy thread local data from the initialization image.
@@ -77 +84 @@
 {
         size_t tls_size = &_tbss_end - &_tdata_start;
+
+#ifdef CONFIG_RTLD
+        if (runtime_env != NULL)
+                tls_size = runtime_env->tls_size;
+#endif
         tls_free_arch(tcb, tls_size);
 }
@@ -121 +133 @@
 {
         tcb_t *tcb;
-        
-        size = ALIGN_UP(size, &_tls_alignment);
-        *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);
-        if (!*data)
+
+        *data = malloc(sizeof(tcb_t) + size);
+        if (*data == NULL)
                 return NULL;
         tcb = (tcb_t *) (*data + size);
@@ -139 +150 @@
 void tls_free_variant_2(tcb_t *tcb, size_t size)
 {
-        size = ALIGN_UP(size, &_tls_alignment);
         void *start = ((void *) tcb) - size;
         free(start);