Changes in uspace/lib/c/generic/tls.c [3a9414e:31399f3] in mainline

File:

• uspace/lib/c/generic/tls.c (modified) (6 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)
-{
-#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.
@@ -73 +56 @@
         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.
@@ -97 +76 @@
 void tls_free(tcb_t *tcb)
 {
-#ifdef CONFIG_RTLD
-        free(tcb->dtv);
-#endif
-        tls_free_arch(tcb, tls_get_size());
+        size_t tls_size = &_tbss_end - &_tdata_start;
+        tls_free_arch(tcb, tls_size);
 }
 
@@ -112 +89 @@
 tcb_t *tls_alloc_variant_1(void **data, size_t size)
 {
-        tcb_t *tcb;
+        tcb_t *result;
 
-        tcb = malloc(sizeof(tcb_t) + size);
-        if (!tcb)
+        result = malloc(sizeof(tcb_t) + size);
+        if (!result)
                 return NULL;
-        *data = ((void *)tcb) + sizeof(tcb_t);
-#ifdef CONFIG_RTLD
-        tcb->dtv = NULL;
-#endif
+        *data = ((void *)result) + sizeof(tcb_t);
 
-        return tcb;
+        return result;
 }
 
@@ -147 +121 @@
 {
         tcb_t *tcb;
-
-        *data = malloc(sizeof(tcb_t) + size);
-        if (*data == NULL)
+        
+        size = ALIGN_UP(size, &_tls_alignment);
+        *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);
+        if (!*data)
                 return NULL;
         tcb = (tcb_t *) (*data + size);
         tcb->self = tcb;
-#ifdef CONFIG_RTLD
-        tcb->dtv = NULL;
-#endif
 
         return tcb;
@@ -167 +139 @@
 void tls_free_variant_2(tcb_t *tcb, size_t size)
 {
+        size = ALIGN_UP(size, &_tls_alignment);
         void *start = ((void *) tcb) - size;
         free(start);