Changeset d50f3e5 in mainline for uspace/lib/c

Timestamp:

2025-03-09T20:06:24Z (11 months ago)

Author:

Matěj Volf <git@…>

Children:

53e652d

Parents:

af28af6

git-author:

Matěj Volf <git@…> (2025-03-09 20:05:51)

git-committer:

Matěj Volf <git@…> (2025-03-09 20:06:24)

Message:

decrease scrope of pthread keys support

Location:

uspace/lib/c

Files:

• generic/libc.c (modified) (1 diff)
• generic/private/fibril.h (modified) (2 diffs)
• generic/thread/fibril.c (modified) (4 diffs)
• include/fibril.h (modified) (1 diff)
• meson.build (modified) (1 diff)
• test/fibril/exit_hook.c (deleted)
• test/main.c (modified) (1 diff)

uspace/lib/c/generic/libc.c

@@ -173 +173 @@
 void __libc_exit(int status)
 {
-        fibril_run_exit_hooks(&main_fibril);
-
         /*
          * GCC extension __attribute__((destructor)),

uspace/lib/c/generic/private/fibril.h

@@ -70 +70 @@
         fibril_owner_info_t *waits_for;
         fibril_event_t *sleep_event;
-
-        list_t exit_hooks;
 };
-
-typedef struct {
-        link_t link;
-        void (*func)(void);
-} fibril_hook_t;
 
 extern fibril_t *fibril_alloc(void);
@@ -93 +86 @@
 extern errno_t fibril_ipc_wait(ipc_call_t *, const struct timespec *);
 extern void fibril_ipc_poke(void);
-
-extern void fibril_run_exit_hooks(fibril_t *);
 
 /**

uspace/lib/c/generic/thread/fibril.c

@@ -185 +185 @@
 void fibril_setup(fibril_t *f)
 {
-        list_initialize(&f->exit_hooks);
         futex_lock(&fibril_futex);
         list_append(&f->all_link, &fibril_list);
@@ -846 +845 @@
 }
 
-void fibril_run_exit_hooks(fibril_t *f)
-{
-        list_foreach_safe(f->exit_hooks, cur, _next) {
-                fibril_hook_t *hook = list_get_instance(cur, fibril_hook_t, link);
-                list_remove(cur);
-                hook->func();
-                free(hook);
-        }
-}
-
 /**
  * Exit a fibril. Never returns.
@@ -865 +854 @@
         // TODO: implement fibril_join() and remember retval
         (void) retval;
-
-        fibril_run_exit_hooks(fibril_self());
 
         fibril_t *f = _ready_list_pop_nonblocking(false);
@@ -931 +918 @@
 }
 
-errno_t fibril_add_exit_hook(void (*hook)(void))
-{
-        fibril_hook_t *h = malloc(sizeof(fibril_hook_t));
-        if (!h)
-                return ENOMEM;
-
-        DPRINTF("adding exit hook: function %p (fibril_hook_t structure at %p)\n", hook, h);
-
-        h->func = hook;
-        list_append(&h->link, &fibril_self()->exit_hooks);
-        return EOK;
-}
-
 errno_t fibril_ipc_wait(ipc_call_t *call, const struct timespec *expires)
 {

uspace/lib/c/include/fibril.h

@@ -74 +74 @@
 extern __noreturn void fibril_exit(long);
 
-/** Add a function to be called after fibril exits, just before it is destroyed */
-extern errno_t fibril_add_exit_hook(void (*)(void));
-
 __HELENOS_DECLS_END;
 

uspace/lib/c/meson.build

@@ -177 +177 @@
         'test/double_to_str.c',
         'test/fibril/timer.c',
-        'test/fibril/exit_hook.c',
         'test/getopt.c',
         'test/gsort.c',

uspace/lib/c/test/main.c

@@ -38 +38 @@
 PCUT_IMPORT(double_to_str);
 PCUT_IMPORT(fibril_timer);
-PCUT_IMPORT(fibril_exit_hook);
 PCUT_IMPORT(getopt);
 PCUT_IMPORT(gsort);