Index: uspace/lib/c/generic/rtld/symbol.c =================================================================== --- uspace/lib/c/generic/rtld/symbol.c (revision 0ae9e18465809a5520c51c76be2866b19c48bd0e) +++ uspace/lib/c/generic/rtld/symbol.c (revision ae20886e566fbe3bdcbb6fc5248967b648be990e) @@ -65,4 +65,9 @@ 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; Index: uspace/lib/posix/meson.build =================================================================== --- uspace/lib/posix/meson.build (revision 0ae9e18465809a5520c51c76be2866b19c48bd0e) +++ uspace/lib/posix/meson.build (revision ae20886e566fbe3bdcbb6fc5248967b648be990e) @@ -61,4 +61,5 @@ 'test/stdlib.c', 'test/unistd.c', + 'test/pthread/keys.c', ) Index: uspace/lib/posix/src/pthread/keys.c =================================================================== --- uspace/lib/posix/src/pthread/keys.c (revision 0ae9e18465809a5520c51c76be2866b19c48bd0e) +++ uspace/lib/posix/src/pthread/keys.c (revision ae20886e566fbe3bdcbb6fc5248967b648be990e) @@ -36,28 +36,69 @@ #include #include +#include +#include #include "../internal/common.h" + +#include +#define DPRINTF(format, ...) ((void) 0); + +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; + 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); + 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) { + /* Inlined not_implemented() macro to add custom message */ + static int __not_implemented_counter = 0; + if (__not_implemented_counter == 0) { + fprintf(stderr, "pthread_key_create: destructors not supported\n"); + } + __not_implemented_counter++; + } + + *key = k; + return EOK; } Index: uspace/lib/posix/test/main.c =================================================================== --- uspace/lib/posix/test/main.c (revision 0ae9e18465809a5520c51c76be2866b19c48bd0e) +++ uspace/lib/posix/test/main.c (revision ae20886e566fbe3bdcbb6fc5248967b648be990e) @@ -34,4 +34,5 @@ PCUT_IMPORT(stdlib); PCUT_IMPORT(unistd); +PCUT_IMPORT(pthread_keys); PCUT_MAIN(); Index: uspace/lib/posix/test/pthread/keys.c =================================================================== --- uspace/lib/posix/test/pthread/keys.c (revision ae20886e566fbe3bdcbb6fc5248967b648be990e) +++ uspace/lib/posix/test/pthread/keys.c (revision ae20886e566fbe3bdcbb6fc5248967b648be990e) @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2025 Matej Volf + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include + +PCUT_INIT; + +PCUT_TEST_SUITE(pthread_keys); + +pthread_key_t key; + +static errno_t simple_fibril(void *_arg) +{ + PCUT_ASSERT_INT_EQUALS(0, pthread_setspecific(key, (void *) 0x0d9e)); + PCUT_ASSERT_PTR_EQUALS((void *) 0x0d9e, pthread_getspecific(key)); + + for (int i = 0; i < 10; i++) { + fibril_yield(); + } + + return EOK; +} + +PCUT_TEST(pthread_keys_basic) +{ + PCUT_ASSERT_INT_EQUALS(0, pthread_key_create(&key, NULL)); + PCUT_ASSERT_PTR_EQUALS(NULL, pthread_getspecific(key)); + + PCUT_ASSERT_INT_EQUALS(0, pthread_setspecific(key, (void *) 0x42)); + PCUT_ASSERT_PTR_EQUALS((void *) 0x42, pthread_getspecific(key)); + + fid_t other = fibril_create(simple_fibril, NULL); + fibril_start(other); + + for (int i = 0; i < 5; i++) { + fibril_yield(); + } + + PCUT_ASSERT_PTR_EQUALS((void *) 0x42, pthread_getspecific(key)); + + for (int i = 0; i < 10; i++) { + fibril_yield(); + } + + PCUT_ASSERT_PTR_EQUALS((void *) 0x42, pthread_getspecific(key)); +} + +PCUT_EXPORT(pthread_keys);