Changeset 04803bf in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/generic/libc.c (moved) (moved from uspace/lib/libc/generic/libc.c ) (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"
 
 /* From librtld. */
 #include <rtld.h>
-#include <string.h>
+//#include <string.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)
 {
-        int retval;
-
-        __heap_init();
+        /* Initialize user task run-time environment */
+        __malloc_init();
         __async_init();
+        __async_sess_init();
+        
         fibril_t *fibril = fibril_setup();
+        if (fibril == NULL)
+                abort();
+        
         __tcb_set(fibril->tcb);
         
         /* Save the PCB pointer */
         __pcb = (pcb_t *) pcb_ptr;
+        
+        /* The basic run-time environment is setup */
+        env_setup = true;
         
         int argc;
@@ -84 +86 @@
         }
 #endif
-
+        /*
+         * Get command line arguments and initialize
+         * standard input and output
+         */
         if (__pcb == NULL) {
                 argc = 0;
@@ -93 +98 @@
                 argv = __pcb->argv;
                 __stdio_init(__pcb->filc, __pcb->filv);
+                (void) chdir(__pcb->cwd);
         }
         
-        retval = main(argc, argv);
-
-        __stdio_done();
-        (void) task_retval(retval);
+        /*
+         * Run main() and set task return value
+         * according the result
+         */
+        int retval = main(argc, argv);
+        exit(retval);
 }
 
-void __exit(void)
+void exit(int status)
 {
-        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);
 }