Changes in uspace/lib/c/generic/libc.c [9d58539:153c7a29] in mainline

File:

• uspace/lib/c/generic/libc.c (modified) (6 diffs)

uspace/lib/c/generic/libc.c

@@ -41 +41 @@
  */
 
+#include <errno.h>
 #include <libc.h>
 #include <stdlib.h>
@@ -52 +53 @@
 #include "private/io.h"
 
+#ifdef FUTEX_UPGRADABLE
+#include <rcu.h>
+#endif
+
 #ifdef CONFIG_RTLD
 #include <rtld/rtld.h>
 #endif
+
 
 static bool env_setup = false;
@@ -62 +68 @@
         /* Initialize user task run-time environment */
         __malloc_init();
-        __async_init();
+        
+        /* Save the PCB pointer */
+        __pcb = (pcb_t *) pcb_ptr;
+        
+#ifdef CONFIG_RTLD
+        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+                runtime_env = (rtld_t *) __pcb->rtld_runtime;
+        } else {
+                if (rtld_init_static() != EOK)
+                        abort();
+        }
+#endif
         
         fibril_t *fibril = fibril_setup();
@@ -70 +87 @@
         __tcb_set(fibril->tcb);
         
-        /* Save the PCB pointer */
-        __pcb = (pcb_t *) pcb_ptr;
+        
+#ifdef FUTEX_UPGRADABLE
+        rcu_register_fibril();
+#endif
+        
+        __async_init();
         
         /* The basic run-time environment is setup */
@@ -79 +100 @@
         char **argv;
         
-#ifdef __IN_SHARED_LIBC__
-        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
-                runtime_env = (runtime_env_t *) __pcb->rtld_runtime;
-        }
-#endif
         /*
          * Get command line arguments and initialize
@@ -112 +128 @@
                 __stdio_done();
                 task_retval(status);
-                fibril_teardown(__tcb_get()->fibril_data);
+                fibril_teardown(__tcb_get()->fibril_data, false);
         }