Changeset 25f6bddb in mainline

Timestamp:

2018-11-11T15:47:39Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0b8fad2

Parents:

f4cb6c5f

git-author:

Jakub Jermar <jakub@…> (2018-11-11 10:27:00)

git-committer:

Jakub Jermar <jakub@…> (2018-11-11 15:47:39)

Message:

Deallocate waitq's used by the loader

Location:

uspace

Files:

• lib/c/generic/async/client.c (modified) (1 diff)
• lib/c/generic/async/ports.c (modified) (1 diff)
• lib/c/generic/async/server.c (modified) (1 diff)
• lib/c/generic/io/kio.c (modified) (1 diff)
• lib/c/generic/libc.c (modified) (1 diff)
• lib/c/generic/malloc.c (modified) (1 diff)
• lib/c/generic/private/async.h (modified) (1 diff)
• lib/c/generic/private/fibril.h (modified) (1 diff)
• lib/c/generic/private/malloc.h (modified) (1 diff)
• lib/c/generic/thread/fibril.c (modified) (1 diff)
• lib/c/generic/thread/fibril_synch.c (modified) (1 diff)
• lib/c/include/fibril_synch.h (modified) (1 diff)
• lib/c/include/io/kio.h (modified) (1 diff)
• lib/c/include/libc.h (modified) (1 diff)
• srv/loader/main.c (modified) (2 diffs)

uspace/lib/c/generic/async/client.c

@@ -189 +189 @@
         fibril_mutex_initialize(&session_ns.mutex);
         session_ns.exchanges = 0;
+}
+
+void __async_client_fini(void)
+{
+        fibril_rmutex_destroy(&message_mutex);
 }
 

uspace/lib/c/generic/async/ports.c

@@ -299 +299 @@
                 abort();
 }
+
+void __async_ports_fini(void)
+{
+        fibril_rmutex_destroy(&interface_mutex);
+}

uspace/lib/c/generic/async/server.c

@@ -1028 +1028 @@
 }
 
+void __async_server_fini(void)
+{
+        fibril_rmutex_destroy(&client_mutex);
+        fibril_rmutex_destroy(&notification_mutex);
+}
+
 errno_t async_accept_0(ipc_call_t *call)
 {

uspace/lib/c/generic/io/kio.c

@@ -60 +60 @@
         if (futex_initialize(&kio_buffer.futex, 1) != EOK)
                 abort();
+}
+
+void __kio_fini(void)
+{
+        futex_destroy(&kio_buffer.futex);
 }
 

uspace/lib/c/generic/libc.c

@@ -153 +153 @@
 }
 
+void __libc_fini(void)
+{
+        __async_client_fini();
+        __async_server_fini();
+        __async_ports_fini();
+
+        __fibril_synch_fini();
+        __fibrils_fini();
+
+        __malloc_fini();
+
+        __kio_fini();
+}
+
 void __libc_exit(int status)
 {

uspace/lib/c/generic/malloc.c

@@ -489 +489 @@
         if (!area_create(PAGE_SIZE))
                 abort();
+}
+
+void __malloc_fini(void)
+{
+        fibril_rmutex_destroy(&malloc_mutex);
 }
 

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

@@ -95 +95 @@
 
 extern void __async_server_init(void);
+extern void __async_server_fini(void);
 extern void __async_client_init(void);
+extern void __async_client_fini(void);
 extern void __async_ports_init(void);
+extern void __async_ports_fini(void);
 
 extern errno_t async_create_port_internal(iface_t, async_port_handler_t,

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

@@ -79 +79 @@
 
 extern void __fibrils_init(void);
+extern void __fibrils_fini(void);
 
 extern void fibril_wait_for(fibril_event_t *);

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

@@ -37 +37 @@
 
 extern void __malloc_init(void);
+extern void __malloc_fini(void);
 
 #endif

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

@@ -882 +882 @@
 }
 
+void __fibrils_fini(void)
+{
+        futex_destroy(&fibril_futex);
+        futex_destroy(&ipc_lists_futex);
+}
+
 void fibril_usleep(usec_t timeout)
 {

uspace/lib/c/generic/thread/fibril_synch.c

@@ -96 +96 @@
         if (futex_initialize(&fibril_synch_futex, 1) != EOK)
                 abort();
+}
+
+void __fibril_synch_fini(void)
+{
+        futex_destroy(&fibril_synch_futex);
 }
 

uspace/lib/c/include/fibril_synch.h

@@ -165 +165 @@
 
 extern void __fibril_synch_init(void);
+extern void __fibril_synch_fini(void);
 
 extern void fibril_mutex_initialize(fibril_mutex_t *);

uspace/lib/c/include/io/kio.h

@@ -43 +43 @@
 
 extern void __kio_init(void);
+extern void __kio_fini(void);
 extern errno_t kio_write(const void *, size_t, size_t *);
 extern void kio_update(void);

uspace/lib/c/include/libc.h

@@ -62 +62 @@
         __syscall6(p1, p2, p3, p4, p5, p6, id)
 
+extern void __libc_fini(void);
+
 #endif
 

uspace/srv/loader/main.c

@@ -59 +59 @@
 #include <vfs/vfs.h>
 #include <vfs/inbox.h>
+#include <libc.h>
 
 #ifdef CONFIG_RTLD
@@ -357 +358 @@
         DPRINTF("Jump to entry point at %p\n", pcb.entry);
 
+        __libc_fini();
         __tcb_reset();
         entry_point_jmp(prog_info.finfo.entry, &pcb);