Changeset 17aca1c in mainline for uspace/lib/c/generic/libc.c
- Timestamp:
- 2011-02-04T20:56:52Z (13 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/libc.c
re778543 r17aca1c 42 42 43 43 #include <libc.h> 44 #include <stdio.h> 45 #include <unistd.h> 46 #include <malloc.h> 44 #include <stdlib.h> 47 45 #include <tls.h> 48 #include <thread.h>49 46 #include <fibril.h> 50 #include <ipc/ipc.h> 51 #include <async.h> 52 #include <as.h> 47 #include <task.h> 53 48 #include <loader/pcb.h> 49 #include "private/libc.h" 50 #include "private/async.h" 51 #include "private/async_sess.h" 52 #include "private/malloc.h" 53 #include "private/io.h" 54 54 55 extern int main(int argc, char *argv[]); 56 57 void _exit(int status) 58 { 59 thread_exit(status); 60 } 55 static bool env_setup = false; 61 56 62 57 void __main(void *pcb_ptr) 63 58 { 64 59 /* Initialize user task run-time environment */ 65 __ heap_init();60 __malloc_init(); 66 61 __async_init(); 62 __async_sess_init(); 63 67 64 fibril_t *fibril = fibril_setup(); 65 if (fibril == NULL) 66 abort(); 67 68 68 __tcb_set(fibril->tcb); 69 69 … … 71 71 __pcb = (pcb_t *) pcb_ptr; 72 72 73 /* The basic run-time environment is setup */ 74 env_setup = true; 75 73 76 int argc; 74 77 char **argv; 75 78 76 /* Get command line arguments and initialize 77 standard input and output */ 79 /* 80 * Get command line arguments and initialize 81 * standard input and output 82 */ 78 83 if (__pcb == NULL) { 79 84 argc = 0; … … 87 92 } 88 93 89 /* Run main() and set task return value 90 according the result */ 91 (void) task_retval(main(argc, argv)); 94 /* 95 * Run main() and set task return value 96 * according the result 97 */ 98 int retval = main(argc, argv); 99 exit(retval); 92 100 } 93 101 94 void __exit(void)102 void exit(int status) 95 103 { 96 __stdio_done(); 97 fibril_teardown(__tcb_get()->fibril_data); 98 _exit(0); 104 if (env_setup) { 105 __stdio_done(); 106 task_retval(status); 107 fibril_teardown(__tcb_get()->fibril_data); 108 } 109 110 __SYSCALL1(SYS_TASK_EXIT, false); 111 112 /* Unreachable */ 113 while (1); 114 } 115 116 void abort(void) 117 { 118 __SYSCALL1(SYS_TASK_EXIT, true); 119 120 /* Unreachable */ 121 while (1); 99 122 } 100 123
Note:
See TracChangeset
for help on using the changeset viewer.