Changeset 7064e71 in mainline

Timestamp:

2025-03-06T14:35:29Z (3 days ago)

Author:

Matěj Volf <git@…>

Children:

25ee7ec5

Parents:

9a41e6e

git-author:

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

git-committer:

Matěj Volf <git@…> (2025-03-06 14:35:29)

Message:

run fibril exit hooks for main fibril as well

Location:

uspace

Files:

• lib/c/generic/libc.c (modified) (2 diffs)
• lib/c/generic/private/fibril.h (modified) (1 diff)
• lib/c/generic/thread/fibril.c (modified) (3 diffs)
• lib/posix/src/pthread/keys.c (modified) (1 diff)
• srv/loader/main.c (modified) (1 diff)

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);
@@ -172 +173 @@
 void __libc_exit(int status)
 {
-        // TODO: some teardown of the main fibril?
-        // namely, fibril_exit_hooks would like to run even on the main fibril
+        fibril_run_exit_hooks(&main_fibril);
 
         /*

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

@@ -94 +94 @@
 extern void fibril_ipc_poke(void);
 
+extern void fibril_run_exit_hooks(fibril_t *);
+
 /**
  * "Restricted" fibril mutex.

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

@@ -199 +199 @@
         if (fibril->is_freeable) {
                 tls_free(fibril->tcb);
-                list_foreach_safe(fibril->exit_hooks, cur, _next) {
-                        fibril_hook_t *hook = list_get_instance(cur, fibril_hook_t, link);
-                        free(hook);
-                }
                 free(fibril);
         }
@@ -850 +846 @@
 }
 
+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.
@@ -860 +866 @@
         (void) retval;
 
-        list_foreach(fibril_self()->exit_hooks, link, fibril_hook_t, hook) {
-                hook->func();
-        }
+        fibril_run_exit_hooks(fibril_self());
 
         fibril_t *f = _ready_list_pop_nonblocking(false);

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

@@ -104 +104 @@
 {
         /*
-         * FIXME: this can cause a data race with another fibrill
-         * running on_fibril_exit. The obvious solution is to add
-         * a rwlock on the destructors array, which will be needed
-         * anyway if we want to support unlimited number of keys.
+         * FIXME: this can cause a data race if another fibrill concurrently
+         * runs on_fibril_exit. The obvious solution is to add a rwlock on
+         * the destructors array, which will be needed anyway if we want to
+         * support unlimited number of keys.
          */
         destructors[key] = NULL;

uspace/srv/loader/main.c

@@ -355 +355 @@
         DPRINTF("Jump to entry point at %p\n", pcb.entry);
 
-        // mvolfik is very confused: why is __libc_fini called BEFORE jumping to entrypoint??
         __libc_fini();
         __tcb_reset();