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