Changeset 17aca1c in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2011-02-04T20:56:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/lib/c/generic/libc.c

@@ -42 +42 @@
 
 #include <libc.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <tls.h>
-#include <thread.h>
 #include <fibril.h>
-#include <ipc/ipc.h>
-#include <async.h>
-#include <as.h>
+#include <task.h>
 #include <loader/pcb.h>
+#include "private/libc.h"
+#include "private/async.h"
+#include "private/async_sess.h"
+#include "private/malloc.h"
+#include "private/io.h"
 
-extern int main(int argc, char *argv[]);
-
-void _exit(int status)
-{
-        thread_exit(status);
-}
+static bool env_setup = false;
 
 void __main(void *pcb_ptr)
 {
         /* Initialize user task run-time environment */
-        __heap_init();
+        __malloc_init();
         __async_init();
+        __async_sess_init();
+        
         fibril_t *fibril = fibril_setup();
+        if (fibril == NULL)
+                abort();
+        
         __tcb_set(fibril->tcb);
         
@@ -71 +71 @@
         __pcb = (pcb_t *) pcb_ptr;
         
+        /* The basic run-time environment is setup */
+        env_setup = true;
+        
         int argc;
         char **argv;
         
-        /* Get command line arguments and initialize
-           standard input and output */
+        /*
+         * Get command line arguments and initialize
+         * standard input and output
+         */
         if (__pcb == NULL) {
                 argc = 0;
@@ -87 +92 @@
         }
         
-        /* Run main() and set task return value
-           according the result */
-        (void) task_retval(main(argc, argv));
+        /*
+         * Run main() and set task return value
+         * according the result
+         */
+        int retval = main(argc, argv);
+        exit(retval);
 }
 
-void __exit(void)
+void exit(int status)
 {
-        __stdio_done();
-        fibril_teardown(__tcb_get()->fibril_data);
-        _exit(0);
+        if (env_setup) {
+                __stdio_done();
+                task_retval(status);
+                fibril_teardown(__tcb_get()->fibril_data);
+        }
+        
+        __SYSCALL1(SYS_TASK_EXIT, false);
+        
+        /* Unreachable */
+        while (1);
+}
+
+void abort(void)
+{
+        __SYSCALL1(SYS_TASK_EXIT, true);
+        
+        /* Unreachable */
+        while (1);
 }