Rev 1167 | Rev 1407 | Go to most recent revision | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1167 | Rev 1392 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (C) 2006 Jakub Jermar |
2 | * Copyright (C) 2006 Jakub Jermar |
3 | * All rights reserved. |
3 | * All rights reserved. |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
7 | * are met: |
7 | * are met: |
8 | * |
8 | * |
9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
16 | * |
16 | * |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | #include <thread.h> |
29 | #include <thread.h> |
30 | #include <libc.h> |
30 | #include <libc.h> |
31 | #include <stdlib.h> |
31 | #include <stdlib.h> |
32 | #include <arch/faddr.h> |
32 | #include <arch/faddr.h> |
33 | #include <kernel/proc/uarg.h> |
33 | #include <kernel/proc/uarg.h> |
34 | #include <psthread.h> |
34 | #include <psthread.h> |
35 | #include <string.h> |
35 | #include <string.h> |
- | 36 | #include <async.h> |
|
36 | 37 | ||
37 | #include <stdio.h> |
38 | #include <stdio.h> |
38 | 39 | ||
39 | 40 | ||
40 | #ifndef THREAD_INITIAL_STACK_PAGES_NO |
41 | #ifndef THREAD_INITIAL_STACK_PAGES_NO |
41 | #define THREAD_INITIAL_STACK_PAGES_NO 1 |
42 | #define THREAD_INITIAL_STACK_PAGES_NO 1 |
42 | #endif |
43 | #endif |
43 | 44 | ||
44 | 45 | ||
45 | extern char _tdata_start; |
46 | extern char _tdata_start; |
46 | extern char _tdata_end; |
47 | extern char _tdata_end; |
47 | extern char _tbss_start; |
48 | extern char _tbss_start; |
48 | extern char _tbss_end; |
49 | extern char _tbss_end; |
49 | 50 | ||
50 | /** Create Thread Local storage area, return pointer to TCB(ThreadControlBlock) |
51 | /** Create Thread Local storage area, return pointer to TCB(ThreadControlBlock) |
51 | * |
52 | * |
52 | * !! The code requires, that sections .tdata and .tbss are adjacent. |
53 | * !! The code requires, that sections .tdata and .tbss are adjacent. |
53 | * It may be changed in the future. |
54 | * It may be changed in the future. |
54 | */ |
55 | */ |
55 | tcb_t * __make_tls(void) |
56 | tcb_t * __make_tls(void) |
56 | { |
57 | { |
57 | void *data; |
58 | void *data; |
58 | tcb_t *tcb; |
59 | tcb_t *tcb; |
59 | size_t tls_size = &_tbss_end - &_tdata_start; |
60 | size_t tls_size = &_tbss_end - &_tdata_start; |
60 | 61 | ||
61 | tcb = __alloc_tls(&data, tls_size); |
62 | tcb = __alloc_tls(&data, tls_size); |
62 | 63 | ||
63 | memcpy(data, &_tdata_start, &_tdata_end - &_tdata_start); |
64 | memcpy(data, &_tdata_start, &_tdata_end - &_tdata_start); |
64 | memset(data + (&_tbss_start-&_tdata_start), &_tbss_end-&_tbss_start, 0); |
65 | memset(data + (&_tbss_start-&_tdata_start), &_tbss_end-&_tbss_start, 0); |
65 | 66 | ||
66 | return tcb; |
67 | return tcb; |
67 | } |
68 | } |
68 | 69 | ||
69 | void __free_tls(tcb_t *tcb) |
70 | void __free_tls(tcb_t *tcb) |
70 | { |
71 | { |
71 | size_t tls_size = &_tbss_end - &_tdata_start; |
72 | size_t tls_size = &_tbss_end - &_tdata_start; |
72 | __free_tls_arch(tcb, tls_size); |
73 | __free_tls_arch(tcb, tls_size); |
73 | } |
74 | } |
74 | 75 | ||
75 | /** Main thread function. |
76 | /** Main thread function. |
76 | * |
77 | * |
77 | * This function is called from __thread_entry() and is used |
78 | * This function is called from __thread_entry() and is used |
78 | * to call the thread's implementing function and perform cleanup |
79 | * to call the thread's implementing function and perform cleanup |
79 | * and exit when thread returns back. Do not call this function |
80 | * and exit when thread returns back. Do not call this function |
80 | * directly. |
81 | * directly. |
81 | * |
82 | * |
82 | * @param uarg Pointer to userspace argument structure. |
83 | * @param uarg Pointer to userspace argument structure. |
- | 84 | * |
|
- | 85 | * TODO: Thread stack pages memory leak |
|
83 | */ |
86 | */ |
84 | void __thread_main(uspace_arg_t *uarg) |
87 | void __thread_main(uspace_arg_t *uarg) |
85 | { |
88 | { |
86 | tcb_t *tcb; |
89 | psthread_data_t *pt; |
87 | /* This should initialize the area according to TLS specicification */ |
- | |
- | 90 | ||
88 | tcb = __make_tls(); |
91 | pt = psthread_setup(); |
89 | __tcb_set(tcb); |
92 | __tcb_set(pt->tcb); |
- | 93 | ||
90 | psthread_setup(tcb); |
94 | async_create_manager(); |
91 | 95 | ||
92 | uarg->uspace_thread_function(uarg->uspace_thread_arg); |
96 | uarg->uspace_thread_function(uarg->uspace_thread_arg); |
93 | free(uarg->uspace_stack); |
97 | free(uarg->uspace_stack); |
94 | free(uarg); |
98 | free(uarg); |
95 | 99 | ||
96 | psthread_teardown(tcb->pst_data); |
100 | async_destroy_manager(); |
97 | __free_tls(tcb); |
101 | psthread_teardown(pt); |
98 | 102 | ||
99 | thread_exit(0); |
103 | thread_exit(0); |
100 | } |
104 | } |
101 | 105 | ||
102 | /** Create userspace thread. |
106 | /** Create userspace thread. |
103 | * |
107 | * |
104 | * This function creates new userspace thread and allocates userspace |
108 | * This function creates new userspace thread and allocates userspace |
105 | * stack and userspace argument structure for it. |
109 | * stack and userspace argument structure for it. |
106 | * |
110 | * |
107 | * @param function Function implementing the thread. |
111 | * @param function Function implementing the thread. |
108 | * @param arg Argument to be passed to thread. |
112 | * @param arg Argument to be passed to thread. |
109 | * @param name Symbolic name of the thread. |
113 | * @param name Symbolic name of the thread. |
110 | * |
114 | * |
111 | * @param TID of the new thread on success or -1 on failure. |
115 | * @param TID of the new thread on success or -1 on failure. |
112 | */ |
116 | */ |
113 | int thread_create(void (* function)(void *), void *arg, char *name) |
117 | int thread_create(void (* function)(void *), void *arg, char *name) |
114 | { |
118 | { |
115 | char *stack; |
119 | char *stack; |
116 | uspace_arg_t *uarg; |
120 | uspace_arg_t *uarg; |
117 | 121 | ||
118 | stack = (char *) malloc(getpagesize()*THREAD_INITIAL_STACK_PAGES_NO); |
122 | stack = (char *) malloc(getpagesize()*THREAD_INITIAL_STACK_PAGES_NO); |
119 | if (!stack) |
123 | if (!stack) |
120 | return -1; |
124 | return -1; |
121 | 125 | ||
122 | uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t)); |
126 | uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t)); |
123 | if (!uarg) { |
127 | if (!uarg) { |
124 | free(stack); |
128 | free(stack); |
125 | return -1; |
129 | return -1; |
126 | } |
130 | } |
127 | 131 | ||
128 | uarg->uspace_entry = (void *) FADDR(__thread_entry); |
132 | uarg->uspace_entry = (void *) FADDR(__thread_entry); |
129 | uarg->uspace_stack = (void *) stack; |
133 | uarg->uspace_stack = (void *) stack; |
130 | uarg->uspace_thread_function = function; |
134 | uarg->uspace_thread_function = function; |
131 | uarg->uspace_thread_arg = arg; |
135 | uarg->uspace_thread_arg = arg; |
132 | uarg->uspace_uarg = uarg; |
136 | uarg->uspace_uarg = uarg; |
133 | 137 | ||
134 | return __SYSCALL2(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name); |
138 | return __SYSCALL2(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name); |
135 | } |
139 | } |
136 | 140 | ||
137 | /** Terminate current thread. |
141 | /** Terminate current thread. |
138 | * |
142 | * |
139 | * @param stat Exit status. Currently not used. |
143 | * @param stat Exit status. Currently not used. |
140 | */ |
144 | */ |
141 | void thread_exit(int status) |
145 | void thread_exit(int status) |
142 | { |
146 | { |
143 | __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status); |
147 | __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status); |
144 | } |
148 | } |
145 | 149 |