Changeset 12824b9 in mainline

Timestamp:

2025-03-11T10:24:56Z (29 hours ago)

Author:

Matěj Volf <git@…>

Parents:

98743e2

git-author:

Matěj Volf <git@…> (2025-03-11 10:22:37)

git-committer:

Matěj Volf <git@…> (2025-03-11 10:24:56)

Message:

remove unnecessary changes

Location:

uspace/lib

Files:

• c/generic/libc.c (modified) (1 diff)
• posix/meson.build (modified) (1 diff)
• posix/src/pthread/keys.c (modified) (5 diffs)

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/posix/meson.build

@@ -30 +30 @@
 includes += include_directories('include/posix', 'include')
 c_args += [ '-fno-builtin', '-D_XOPEN_SOURCE' ]
-allow_shared = true
 
 # TODO

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

@@ -43 +43 @@
 #define DPRINTF(format, ...) ((void) 0);
 
-static fibril_local bool fibril_initialized = false;
 static atomic_ushort next_key = 1; // skip the key 'zero'
 
@@ -57 +56 @@
 void *pthread_getspecific(pthread_key_t key)
 {
-        // 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);
@@ -74 +67 @@
 {
         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);
@@ -91 +77 @@
 int pthread_key_delete(pthread_key_t key)
 {
-        // see https://github.com/HelenOS/helenos/pull/245#issuecomment-2706795848
+        /* see https://github.com/HelenOS/helenos/pull/245#issuecomment-2706795848 */
         not_implemented();
         return EOK;
@@ -105 +91 @@
         }
         if (destructor != NULL) {
-                static int __counter = 0;
-                if (__counter == 0) {
+                /* 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");
                 }
-                __counter++;
+                __not_implemented_counter++;
         }