Rev 1113 | Rev 1167 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1113 | Rev 1129 | ||
---|---|---|---|
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 | 36 | ||
36 | #include <stdio.h> |
37 | #include <stdio.h> |
37 | void * __make_tls(void) |
- | |
38 | { |
- | |
39 | psthread_data_t *pt; |
- | |
40 | 38 | ||
- | 39 | extern char _tdata_start; |
|
- | 40 | extern char _tdata_end; |
|
- | 41 | extern char _tbss_start; |
|
- | 42 | extern char _tbss_end; |
|
- | 43 | ||
- | 44 | /** Create Thread Local storage area, return pointer to TCB(ThreadControlBlock) |
|
- | 45 | * |
|
- | 46 | * !! The code requires, that sections .tdata and .tbss are adjacent. |
|
41 | pt = malloc(sizeof(psthread_data_t)); |
47 | * It may be changed in the future. |
- | 48 | */ |
|
- | 49 | tcb_t * __make_tls(void) |
|
- | 50 | { |
|
- | 51 | void *data; |
|
42 | pt->self = pt; |
52 | tcb_t *tcb; |
- | 53 | size_t tls_size = &_tbss_end - &_tdata_start; |
|
- | 54 | ||
- | 55 | tcb = __alloc_tls(&data, tls_size); |
|
- | 56 | ||
- | 57 | memcpy(data, &_tdata_start, &_tdata_end - &_tdata_start); |
|
- | 58 | memset(data + (&_tbss_start-&_tdata_start), &_tbss_end-&_tbss_start, 0); |
|
43 | 59 | ||
44 | return pt; |
60 | return tcb; |
45 | } |
61 | } |
46 | 62 | ||
47 | void __free_tls(void *tls) |
63 | void __free_tls(tcb_t *tcb) |
48 | { |
64 | { |
- | 65 | size_t tls_size = &_tbss_end - &_tdata_start; |
|
49 | free(tls); |
66 | __free_tls_arch(tcb, tls_size); |
50 | } |
67 | } |
51 | 68 | ||
52 | /** Main thread function. |
69 | /** Main thread function. |
53 | * |
70 | * |
54 | * This function is called from __thread_entry() and is used |
71 | * This function is called from __thread_entry() and is used |
55 | * to call the thread's implementing function and perform cleanup |
72 | * to call the thread's implementing function and perform cleanup |
56 | * and exit when thread returns back. Do not call this function |
73 | * and exit when thread returns back. Do not call this function |
57 | * directly. |
74 | * directly. |
58 | * |
75 | * |
59 | * @param uarg Pointer to userspace argument structure. |
76 | * @param uarg Pointer to userspace argument structure. |
60 | */ |
77 | */ |
61 | void __thread_main(uspace_arg_t *uarg) |
78 | void __thread_main(uspace_arg_t *uarg) |
62 | { |
79 | { |
- | 80 | tcb_t *tcb; |
|
63 | /* This should initialize the area according to TLS specicification */ |
81 | /* This should initialize the area according to TLS specicification */ |
64 | __tls_set(__make_tls()); |
82 | tcb = __make_tls(); |
- | 83 | __tcb_set(tcb); |
|
- | 84 | psthread_setup(tcb); |
|
65 | 85 | ||
66 | uarg->uspace_thread_function(uarg->uspace_thread_arg); |
86 | uarg->uspace_thread_function(uarg->uspace_thread_arg); |
67 | free(uarg->uspace_stack); |
87 | free(uarg->uspace_stack); |
68 | free(uarg); |
88 | free(uarg); |
69 | 89 | ||
- | 90 | psthread_teardown(tcb->pst_data); |
|
70 | __free_tls(__tls_get()); |
91 | __free_tls(tcb); |
71 | 92 | ||
72 | thread_exit(0); |
93 | thread_exit(0); |
73 | } |
94 | } |
74 | 95 | ||
75 | /** Create userspace thread. |
96 | /** Create userspace thread. |
76 | * |
97 | * |
77 | * This function creates new userspace thread and allocates userspace |
98 | * This function creates new userspace thread and allocates userspace |
78 | * stack and userspace argument structure for it. |
99 | * stack and userspace argument structure for it. |
79 | * |
100 | * |
80 | * @param function Function implementing the thread. |
101 | * @param function Function implementing the thread. |
81 | * @param arg Argument to be passed to thread. |
102 | * @param arg Argument to be passed to thread. |
82 | * @param name Symbolic name of the thread. |
103 | * @param name Symbolic name of the thread. |
83 | * |
104 | * |
84 | * @param TID of the new thread on success or -1 on failure. |
105 | * @param TID of the new thread on success or -1 on failure. |
85 | */ |
106 | */ |
86 | int thread_create(void (* function)(void *), void *arg, char *name) |
107 | int thread_create(void (* function)(void *), void *arg, char *name) |
87 | { |
108 | { |
88 | char *stack; |
109 | char *stack; |
89 | uspace_arg_t *uarg; |
110 | uspace_arg_t *uarg; |
90 | 111 | ||
91 | stack = (char *) malloc(getpagesize()); |
112 | stack = (char *) malloc(getpagesize()); |
92 | if (!stack) |
113 | if (!stack) |
93 | return -1; |
114 | return -1; |
94 | 115 | ||
95 | uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t)); |
116 | uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t)); |
96 | if (!uarg) { |
117 | if (!uarg) { |
97 | free(stack); |
118 | free(stack); |
98 | return -1; |
119 | return -1; |
99 | } |
120 | } |
100 | 121 | ||
101 | uarg->uspace_entry = (void *) FADDR(__thread_entry); |
122 | uarg->uspace_entry = (void *) FADDR(__thread_entry); |
102 | uarg->uspace_stack = (void *) stack; |
123 | uarg->uspace_stack = (void *) stack; |
103 | uarg->uspace_thread_function = function; |
124 | uarg->uspace_thread_function = function; |
104 | uarg->uspace_thread_arg = arg; |
125 | uarg->uspace_thread_arg = arg; |
105 | uarg->uspace_uarg = uarg; |
126 | uarg->uspace_uarg = uarg; |
106 | 127 | ||
107 | return __SYSCALL2(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name); |
128 | return __SYSCALL2(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name); |
108 | } |
129 | } |
109 | 130 | ||
110 | /** Terminate current thread. |
131 | /** Terminate current thread. |
111 | * |
132 | * |
112 | * @param stat Exit status. Currently not used. |
133 | * @param stat Exit status. Currently not used. |
113 | */ |
134 | */ |
114 | void thread_exit(int status) |
135 | void thread_exit(int status) |
115 | { |
136 | { |
116 | __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status); |
137 | __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status); |
117 | } |
138 | } |
118 | 139 |