Rev 1081 | Rev 1129 | Go to most recent revision | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1081 | Rev 1113 | ||
---|---|---|---|
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> |
|
- | 35 | ||
- | 36 | #include <stdio.h> |
|
- | 37 | void * __make_tls(void) |
|
- | 38 | { |
|
- | 39 | psthread_data_t *pt; |
|
- | 40 | ||
- | 41 | pt = malloc(sizeof(psthread_data_t)); |
|
- | 42 | pt->self = pt; |
|
- | 43 | ||
- | 44 | return pt; |
|
- | 45 | } |
|
- | 46 | ||
- | 47 | void __free_tls(void *tls) |
|
- | 48 | { |
|
- | 49 | free(tls); |
|
- | 50 | } |
|
34 | 51 | ||
35 | /** Main thread function. |
52 | /** Main thread function. |
36 | * |
53 | * |
37 | * This function is called from __thread_entry() and is used |
54 | * This function is called from __thread_entry() and is used |
38 | * to call the thread's implementing function and perform cleanup |
55 | * to call the thread's implementing function and perform cleanup |
39 | * and exit when thread returns back. Do not call this function |
56 | * and exit when thread returns back. Do not call this function |
40 | * directly. |
57 | * directly. |
41 | * |
58 | * |
42 | * @param uarg Pointer to userspace argument structure. |
59 | * @param uarg Pointer to userspace argument structure. |
43 | */ |
60 | */ |
44 | void thread_main(uspace_arg_t *uarg) |
61 | void __thread_main(uspace_arg_t *uarg) |
45 | { |
62 | { |
- | 63 | /* This should initialize the area according to TLS specicification */ |
|
- | 64 | __tls_set(__make_tls()); |
|
- | 65 | ||
46 | uarg->uspace_thread_function(uarg->uspace_thread_arg); |
66 | uarg->uspace_thread_function(uarg->uspace_thread_arg); |
47 | free(uarg->uspace_stack); |
67 | free(uarg->uspace_stack); |
48 | free(uarg); |
68 | free(uarg); |
- | 69 | ||
- | 70 | __free_tls(__tls_get()); |
|
- | 71 | ||
49 | thread_exit(0); |
72 | thread_exit(0); |
50 | } |
73 | } |
51 | 74 | ||
52 | /** Create userspace thread. |
75 | /** Create userspace thread. |
53 | * |
76 | * |
54 | * This function creates new userspace thread and allocates userspace |
77 | * This function creates new userspace thread and allocates userspace |
55 | * stack and userspace argument structure for it. |
78 | * stack and userspace argument structure for it. |
56 | * |
79 | * |
57 | * @param function Function implementing the thread. |
80 | * @param function Function implementing the thread. |
58 | * @param arg Argument to be passed to thread. |
81 | * @param arg Argument to be passed to thread. |
59 | * @param name Symbolic name of the thread. |
82 | * @param name Symbolic name of the thread. |
60 | * |
83 | * |
61 | * @param TID of the new thread on success or -1 on failure. |
84 | * @param TID of the new thread on success or -1 on failure. |
62 | */ |
85 | */ |
63 | int thread_create(void (* function)(void *), void *arg, char *name) |
86 | int thread_create(void (* function)(void *), void *arg, char *name) |
64 | { |
87 | { |
65 | char *stack; |
88 | char *stack; |
66 | uspace_arg_t *uarg; |
89 | uspace_arg_t *uarg; |
67 | 90 | ||
68 | stack = (char *) malloc(getpagesize()); |
91 | stack = (char *) malloc(getpagesize()); |
69 | if (!stack) |
92 | if (!stack) |
70 | return -1; |
93 | return -1; |
71 | 94 | ||
72 | uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t)); |
95 | uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t)); |
73 | if (!uarg) { |
96 | if (!uarg) { |
74 | free(stack); |
97 | free(stack); |
75 | return -1; |
98 | return -1; |
76 | } |
99 | } |
77 | 100 | ||
78 | uarg->uspace_entry = (void *) FADDR(__thread_entry); |
101 | uarg->uspace_entry = (void *) FADDR(__thread_entry); |
79 | uarg->uspace_stack = (void *) stack; |
102 | uarg->uspace_stack = (void *) stack; |
80 | uarg->uspace_thread_function = function; |
103 | uarg->uspace_thread_function = function; |
81 | uarg->uspace_thread_arg = arg; |
104 | uarg->uspace_thread_arg = arg; |
82 | uarg->uspace_uarg = uarg; |
105 | uarg->uspace_uarg = uarg; |
83 | 106 | ||
84 | return __SYSCALL2(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name); |
107 | return __SYSCALL2(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name); |
85 | } |
108 | } |
86 | 109 | ||
87 | /** Terminate current thread. |
110 | /** Terminate current thread. |
88 | * |
111 | * |
89 | * @param stat Exit status. Currently not used. |
112 | * @param stat Exit status. Currently not used. |
90 | */ |
113 | */ |
91 | void thread_exit(int status) |
114 | void thread_exit(int status) |
92 | { |
115 | { |
93 | __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status); |
116 | __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status); |
94 | } |
117 | } |
95 | 118 |