Changeset 2482192 in mainline

Timestamp:

2025-03-05T22:22:36Z (4 days ago)

Author:

Matěj Volf <git@…>

Children:

9a41e6e

Parents:

5208709

git-author:

Matěj Volf <git@…> (2025-01-18 20:57:32)

git-committer:

Matěj Volf <git@…> (2025-03-05 22:22:36)

Message:

fix initialization of fibril.exit_hooks

Location:

uspace

Files:

• lib/c/generic/libc.c (modified) (1 diff)
• lib/c/generic/thread/fibril.c (modified) (3 diffs)
• srv/loader/main.c (modified) (1 diff)

uspace/lib/c/generic/libc.c

@@ -172 +172 @@
 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
+
         /*
          * GCC extension __attribute__((destructor)),

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);
@@ -566 +567 @@
         fibril->arg = arg;
 
-        list_initialize(&fibril->exit_hooks);
-
         context_create_t sctx = {
                 .fn = _fibril_main,
@@ -934 +933 @@
                 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);

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();