Changeset f570cdf in mainline for uspace/lib/c/generic/tls.c

Timestamp:

2016-05-24T15:32:57Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c170438

Parents:

dcc150cb (diff), 0a981e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

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 <align.h>
 #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)
+{
+#ifdef CONFIG_RTLD
+        if (runtime_env != NULL)
+                return runtime_env->tls_size;
+#endif
+        return &_tbss_end - &_tdata_start;
+}
+
+/** Get address of static TLS block */
+void *tls_get(void)
+{
+#ifdef CONFIG_TLS_VARIANT_1
+        return (uint8_t *)__tcb_get() + sizeof(tcb_t);
+#else /* CONFIG_TLS_VARIANT_2 */
+        return (uint8_t *)__tcb_get() - tls_get_size();
+#endif
+}
+
 /** 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 +74 @@
         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.
@@ -76 +98 @@
 void tls_free(tcb_t *tcb)
 {
-        size_t tls_size = &_tbss_end - &_tdata_start;
-        tls_free_arch(tcb, tls_size);
+#ifdef CONFIG_RTLD
+        free(tcb->dtv);
+#endif
+        tls_free_arch(tcb, tls_get_size());
 }
 
@@ -89 +113 @@
 tcb_t *tls_alloc_variant_1(void **data, size_t size)
 {
-        tcb_t *result;
+        tcb_t *tcb;
 
-        result = malloc(sizeof(tcb_t) + size);
-        if (!result)
+        tcb = malloc(sizeof(tcb_t) + size);
+        if (!tcb)
                 return NULL;
-        *data = ((void *)result) + sizeof(tcb_t);
+        *data = ((void *)tcb) + sizeof(tcb_t);
+#ifdef CONFIG_RTLD
+        tcb->dtv = NULL;
+#endif
 
-        return result;
+        return tcb;
 }
 
@@ -121 +148 @@
 {
         tcb_t *tcb;
-        
+
         size = ALIGN_UP(size, &_tls_alignment);
         *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);
-        if (!*data)
+        if (*data == NULL)
                 return NULL;
         tcb = (tcb_t *) (*data + size);
         tcb->self = tcb;
+#ifdef CONFIG_RTLD
+        tcb->dtv = NULL;
+#endif
 
         return tcb;