Changeset c8680be4 in mainline

Timestamp:

2025-03-09T20:10:46Z (11 hours ago)

Author:

GitHub <noreply@…>

Parents:

0ae9e18 (diff), 98743e2 (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.

git-author:

Matěj Volf <mat.volfik@…> (2025-03-09 20:10:46)

git-committer:

GitHub <noreply@…> (2025-03-09 20:10:46)

Message:

Merge 98743e252b3fa43cef96b1ea3617304534b2fcc8 into 0ae9e18465809a5520c51c76be2866b19c48bd0e

Location:

uspace/lib

Files:

• c/generic/libc.c (modified) (1 diff)
• c/generic/rtld/symbol.c (modified) (1 diff)
• posix/meson.build (modified) (2 diffs)
• posix/src/pthread/keys.c (modified) (1 diff)
• posix/test/main.c (modified) (1 diff)
• posix/test/pthread/keys.c (added)

uspace/lib/c/generic/libc.c

@@ -81 +81 @@
                 main_fibril.tcb = tls_make_initial(__progsymbols.elfstart);
         }
+        main_fibril.is_freeable = false;
 
         assert(main_fibril.tcb);

uspace/lib/c/generic/rtld/symbol.c

@@ -65 +65 @@
 static elf_symbol_t *def_find_in_module(const char *name, module_t *m)
 {
+        if (m->dyn.hash == NULL) {
+                /* No hash table */
+                return NULL;
+        }
+
         elf_symbol_t *sym_table;
         elf_symbol_t *s, *sym;

uspace/lib/posix/meson.build

@@ -30 +30 @@
 includes += include_directories('include/posix', 'include')
 c_args += [ '-fno-builtin', '-D_XOPEN_SOURCE' ]
+allow_shared = true
 
 # TODO
@@ -61 +62 @@
         'test/stdlib.c',
         'test/unistd.c',
+        'test/pthread/keys.c',
 )
 

uspace/lib/posix/src/pthread/keys.c

@@ -36 +36 @@
 #include <pthread.h>
 #include <errno.h>
+#include <fibril.h>
+#include <stdatomic.h>
 #include "../internal/common.h"
+
+#include <stdio.h>
+#define DPRINTF(format, ...) ((void) 0);
+
+static fibril_local bool fibril_initialized = false;
+static atomic_ushort next_key = 1; // skip the key 'zero'
+
+/*
+ * For now, we just support maximum of 100 keys. This can be improved
+ * in the future by implementing a dynamically growing array with
+ * reallocations, but that will require more synchronization.
+ */
+#define PTHREAD_KEYS_MAX 100
+
+static fibril_local void *key_data[PTHREAD_KEYS_MAX];
 
 void *pthread_getspecific(pthread_key_t key)
 {
-        not_implemented();
-        return NULL;
+        // initialization is done in setspecific -> if not initialized, nothing was set yet
+        if (!fibril_initialized) {
+                DPRINTF("pthread_getspecific(%d) = NULL (uninitialized)\n", key);
+                return NULL;
+        }
+
+        assert(key < PTHREAD_KEYS_MAX);
+        assert(key < next_key);
+        assert(key > 0);
+
+        DPRINTF("pthread_getspecific(%d) = %p\n", key, key_data[key]);
+        return key_data[key];
 }
 
 int pthread_setspecific(pthread_key_t key, const void *data)
 {
-        not_implemented();
-        return ENOTSUP;
+        DPRINTF("pthread_setspecific(%d, %p)\n", key, data);
+        if (!fibril_initialized) {
+                DPRINTF("initializing pthread keys\n");
+                for (unsigned i = 0; i < PTHREAD_KEYS_MAX; i++) {
+                        key_data[i] = NULL;
+                }
+                fibril_initialized = true;
+        }
+        assert(key < PTHREAD_KEYS_MAX);
+        assert(key < next_key);
+        assert(key > 0);
+
+        key_data[key] = (void *) data;
+        return EOK;
 }
 
 int pthread_key_delete(pthread_key_t key)
 {
+        // see https://github.com/HelenOS/helenos/pull/245#issuecomment-2706795848
         not_implemented();
-        return ENOTSUP;
+        return EOK;
 }
 
 int pthread_key_create(pthread_key_t *key, void (*destructor)(void *))
 {
-        not_implemented();
-        return ENOTSUP;
+        unsigned short k = atomic_fetch_add(&next_key, 1);
+        DPRINTF("pthread_key_create(%p, %p) = %d\n", key, destructor, k);
+        if (k >= PTHREAD_KEYS_MAX) {
+                atomic_store(&next_key, PTHREAD_KEYS_MAX + 1);
+                return ELIMIT;
+        }
+        if (destructor != NULL) {
+                static int __counter = 0;
+                if (__counter == 0) {
+                        fprintf(stderr, "pthread_key_create: destructors not supported\n");
+                }
+                __counter++;
+        }
+
+        *key = k;
+        return EOK;
 }
 

uspace/lib/posix/test/main.c

@@ -34 +34 @@
 PCUT_IMPORT(stdlib);
 PCUT_IMPORT(unistd);
+PCUT_IMPORT(pthread_keys);
 
 PCUT_MAIN();