Rev 4660 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4660 | Rev 4661 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (c) 2008 Jiri Svoboda |
2 | * Copyright (c) 2008 Jiri Svoboda |
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 | /** @addtogroup trace |
29 | /** @addtogroup trace |
30 | * @{ |
30 | * @{ |
31 | */ |
31 | */ |
32 | /** @file |
32 | /** @file |
33 | */ |
33 | */ |
34 | 34 | ||
35 | #include <stdio.h> |
35 | #include <stdio.h> |
36 | #include <stdlib.h> |
36 | #include <stdlib.h> |
37 | #include <unistd.h> |
37 | #include <unistd.h> |
38 | #include <ipc/ipc.h> |
38 | #include <ipc/ipc.h> |
39 | #include <fibril.h> |
39 | #include <fibril.h> |
40 | #include <errno.h> |
40 | #include <errno.h> |
41 | #include <udebug.h> |
41 | #include <udebug.h> |
42 | #include <async.h> |
42 | #include <async.h> |
43 | #include <task.h> |
43 | #include <task.h> |
44 | #include <mem.h> |
44 | #include <mem.h> |
45 | #include <string.h> |
45 | #include <string.h> |
46 | #include <bool.h> |
46 | #include <bool.h> |
47 | #include <loader/loader.h> |
47 | #include <loader/loader.h> |
48 | #include <io/console.h> |
48 | #include <io/console.h> |
49 | #include <io/keycode.h> |
49 | #include <io/keycode.h> |
50 | #include <fibril_sync.h> |
50 | #include <fibril_sync.h> |
51 | 51 | ||
52 | #include <libc.h> |
52 | #include <libc.h> |
53 | 53 | ||
54 | // Temporary: service and method names |
54 | // Temporary: service and method names |
55 | #include "proto.h" |
55 | #include "proto.h" |
56 | #include <ipc/services.h> |
56 | #include <ipc/services.h> |
57 | #include "../../srv/vfs/vfs.h" |
57 | #include "../../srv/vfs/vfs.h" |
58 | #include <ipc/console.h> |
58 | #include <ipc/console.h> |
59 | 59 | ||
60 | #include "syscalls.h" |
60 | #include "syscalls.h" |
61 | #include "ipcp.h" |
61 | #include "ipcp.h" |
62 | #include "errors.h" |
62 | #include "errors.h" |
63 | #include "trace.h" |
63 | #include "trace.h" |
64 | 64 | ||
65 | #define THBUF_SIZE 64 |
65 | #define THBUF_SIZE 64 |
66 | uintptr_t thread_hash_buf[THBUF_SIZE]; |
66 | uintptr_t thread_hash_buf[THBUF_SIZE]; |
67 | int n_threads; |
67 | int n_threads; |
68 | 68 | ||
69 | int next_thread_id; |
69 | int next_thread_id; |
70 | 70 | ||
71 | ipc_call_t thread_ipc_req[THBUF_SIZE]; |
71 | ipc_call_t thread_ipc_req[THBUF_SIZE]; |
72 | 72 | ||
73 | int phoneid; |
73 | int phoneid; |
74 | bool abort_trace; |
74 | bool abort_trace; |
75 | 75 | ||
76 | uintptr_t thash; |
76 | uintptr_t thash; |
77 | static bool paused; |
77 | static bool paused; |
78 | static fibril_condvar_t state_cv; |
78 | static fibril_condvar_t state_cv; |
79 | static fibril_mutex_t state_lock; |
79 | static fibril_mutex_t state_lock; |
80 | 80 | ||
81 | static bool cev_valid; |
81 | static bool cev_valid; |
82 | static console_event_t cev; |
82 | static console_event_t cev; |
83 | 83 | ||
84 | void thread_trace_start(uintptr_t thread_hash); |
84 | void thread_trace_start(uintptr_t thread_hash); |
85 | 85 | ||
86 | static proto_t *proto_console; |
86 | static proto_t *proto_console; |
87 | static task_id_t task_id; |
87 | static task_id_t task_id; |
88 | static loader_t *task_ldr; |
88 | static loader_t *task_ldr; |
89 | static bool task_wait_for; |
89 | static bool task_wait_for; |
90 | 90 | ||
91 | /** Combination of events/data to print. */ |
91 | /** Combination of events/data to print. */ |
92 | display_mask_t display_mask; |
92 | display_mask_t display_mask; |
93 | 93 | ||
94 | static int program_run_fibril(void *arg); |
94 | static int program_run_fibril(void *arg); |
95 | static int cev_fibril(void *arg); |
95 | static int cev_fibril(void *arg); |
96 | 96 | ||
97 | static void program_run(void) |
97 | static void program_run(void) |
98 | { |
98 | { |
99 | fid_t fid; |
99 | fid_t fid; |
100 | 100 | ||
101 | fid = fibril_create(program_run_fibril, NULL); |
101 | fid = fibril_create(program_run_fibril, NULL); |
102 | if (fid == 0) { |
102 | if (fid == 0) { |
103 | printf("Error creating fibril\n"); |
103 | printf("Error creating fibril\n"); |
104 | exit(1); |
104 | exit(1); |
105 | } |
105 | } |
106 | 106 | ||
107 | fibril_add_ready(fid); |
107 | fibril_add_ready(fid); |
108 | } |
108 | } |
109 | 109 | ||
110 | static void cev_fibril_start(void) |
110 | static void cev_fibril_start(void) |
111 | { |
111 | { |
112 | fid_t fid; |
112 | fid_t fid; |
113 | 113 | ||
114 | fid = fibril_create(cev_fibril, NULL); |
114 | fid = fibril_create(cev_fibril, NULL); |
115 | if (fid == 0) { |
115 | if (fid == 0) { |
116 | printf("Error creating fibril\n"); |
116 | printf("Error creating fibril\n"); |
117 | exit(1); |
117 | exit(1); |
118 | } |
118 | } |
119 | 119 | ||
120 | fibril_add_ready(fid); |
120 | fibril_add_ready(fid); |
121 | } |
121 | } |
122 | 122 | ||
123 | static int program_run_fibril(void *arg) |
123 | static int program_run_fibril(void *arg) |
124 | { |
124 | { |
125 | int rc; |
125 | int rc; |
126 | 126 | ||
127 | /* |
127 | /* |
128 | * This must be done in background as it will block until |
128 | * This must be done in background as it will block until |
129 | * we let the task reply to this call. |
129 | * we let the task reply to this call. |
130 | */ |
130 | */ |
131 | rc = loader_run(task_ldr); |
131 | rc = loader_run(task_ldr); |
132 | if (rc != 0) { |
132 | if (rc != 0) { |
133 | printf("Error running program\n"); |
133 | printf("Error running program\n"); |
134 | exit(1); |
134 | exit(1); |
135 | } |
135 | } |
136 | 136 | ||
137 | free(task_ldr); |
137 | free(task_ldr); |
138 | task_ldr = NULL; |
138 | task_ldr = NULL; |
139 | 139 | ||
140 | printf("program_run_fibril exiting\n"); |
140 | printf("program_run_fibril exiting\n"); |
141 | return 0; |
141 | return 0; |
142 | } |
142 | } |
143 | 143 | ||
144 | 144 | ||
145 | static int connect_task(task_id_t task_id) |
145 | static int connect_task(task_id_t task_id) |
146 | { |
146 | { |
147 | int rc; |
147 | int rc; |
148 | 148 | ||
149 | rc = ipc_connect_kbox(task_id); |
149 | rc = ipc_connect_kbox(task_id); |
150 | 150 | ||
151 | if (rc == ENOTSUP) { |
151 | if (rc == ENOTSUP) { |
152 | printf("You do not have userspace debugging support " |
152 | printf("You do not have userspace debugging support " |
153 | "compiled in the kernel.\n"); |
153 | "compiled in the kernel.\n"); |
154 | printf("Compile kernel with 'Support for userspace debuggers' " |
154 | printf("Compile kernel with 'Support for userspace debuggers' " |
155 | "(CONFIG_UDEBUG) enabled.\n"); |
155 | "(CONFIG_UDEBUG) enabled.\n"); |
156 | return rc; |
156 | return rc; |
157 | } |
157 | } |
158 | 158 | ||
159 | if (rc < 0) { |
159 | if (rc < 0) { |
160 | printf("Error connecting\n"); |
160 | printf("Error connecting\n"); |
161 | printf("ipc_connect_task(%lld) -> %d ", task_id, rc); |
161 | printf("ipc_connect_task(%lld) -> %d ", task_id, rc); |
162 | return rc; |
162 | return rc; |
163 | } |
163 | } |
164 | 164 | ||
165 | phoneid = rc; |
165 | phoneid = rc; |
166 | 166 | ||
167 | rc = udebug_begin(phoneid); |
167 | rc = udebug_begin(phoneid); |
168 | if (rc < 0) { |
168 | if (rc < 0) { |
169 | printf("udebug_begin() -> %d\n", rc); |
169 | printf("udebug_begin() -> %d\n", rc); |
170 | return rc; |
170 | return rc; |
171 | } |
171 | } |
172 | 172 | ||
173 | rc = udebug_set_evmask(phoneid, UDEBUG_EM_ALL); |
173 | rc = udebug_set_evmask(phoneid, UDEBUG_EM_ALL); |
174 | if (rc < 0) { |
174 | if (rc < 0) { |
175 | printf("udebug_set_evmask(0x%x) -> %d\n ", UDEBUG_EM_ALL, rc); |
175 | printf("udebug_set_evmask(0x%x) -> %d\n ", UDEBUG_EM_ALL, rc); |
176 | return rc; |
176 | return rc; |
177 | } |
177 | } |
178 | 178 | ||
179 | return 0; |
179 | return 0; |
180 | } |
180 | } |
181 | 181 | ||
182 | static int get_thread_list(void) |
182 | static int get_thread_list(void) |
183 | { |
183 | { |
184 | int rc; |
184 | int rc; |
185 | size_t tb_copied; |
185 | size_t tb_copied; |
186 | size_t tb_needed; |
186 | size_t tb_needed; |
187 | int i; |
187 | int i; |
188 | 188 | ||
189 | rc = udebug_thread_read(phoneid, thread_hash_buf, |
189 | rc = udebug_thread_read(phoneid, thread_hash_buf, |
190 | THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed); |
190 | THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed); |
191 | if (rc < 0) { |
191 | if (rc < 0) { |
192 | printf("udebug_thread_read() -> %d\n", rc); |
192 | printf("udebug_thread_read() -> %d\n", rc); |
193 | return rc; |
193 | return rc; |
194 | } |
194 | } |
195 | 195 | ||
196 | n_threads = tb_copied / sizeof(uintptr_t); |
196 | n_threads = tb_copied / sizeof(uintptr_t); |
197 | 197 | ||
198 | printf("Threads:"); |
198 | printf("Threads:"); |
199 | for (i = 0; i < n_threads; i++) { |
199 | for (i = 0; i < n_threads; i++) { |
200 | printf(" [%d] (hash 0x%lx)", 1+i, thread_hash_buf[i]); |
200 | printf(" [%d] (hash 0x%lx)", 1+i, thread_hash_buf[i]); |
201 | } |
201 | } |
202 | printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t)); |
202 | printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t)); |
203 | 203 | ||
204 | return 0; |
204 | return 0; |
205 | } |
205 | } |
206 | 206 | ||
207 | void val_print(sysarg_t val, val_type_t v_type) |
207 | void val_print(sysarg_t val, val_type_t v_type) |
208 | { |
208 | { |
209 | switch (v_type) { |
209 | switch (v_type) { |
210 | case V_VOID: |
210 | case V_VOID: |
211 | printf("<void>"); |
211 | printf("<void>"); |
212 | break; |
212 | break; |
213 | 213 | ||
214 | case V_INTEGER: |
214 | case V_INTEGER: |
215 | printf("%ld", val); |
215 | printf("%ld", val); |
216 | break; |
216 | break; |
217 | 217 | ||
218 | case V_HASH: |
218 | case V_HASH: |
219 | case V_PTR: |
219 | case V_PTR: |
220 | printf("0x%08lx", val); |
220 | printf("0x%08lx", val); |
221 | break; |
221 | break; |
222 | 222 | ||
223 | case V_ERRNO: |
223 | case V_ERRNO: |
224 | if (val >= -15 && val <= 0) { |
224 | if (val >= -15 && val <= 0) { |
225 | printf("%ld %s (%s)", val, |
225 | printf("%ld %s (%s)", val, |
226 | err_desc[-val].name, |
226 | err_desc[-val].name, |
227 | err_desc[-val].desc); |
227 | err_desc[-val].desc); |
228 | } else { |
228 | } else { |
229 | printf("%ld", val); |
229 | printf("%ld", val); |
230 | } |
230 | } |
231 | break; |
231 | break; |
232 | case V_INT_ERRNO: |
232 | case V_INT_ERRNO: |
233 | if (val >= -15 && val < 0) { |
233 | if (val >= -15 && val < 0) { |
234 | printf("%ld %s (%s)", val, |
234 | printf("%ld %s (%s)", val, |
235 | err_desc[-val].name, |
235 | err_desc[-val].name, |
236 | err_desc[-val].desc); |
236 | err_desc[-val].desc); |
237 | } else { |
237 | } else { |
238 | printf("%ld", val); |
238 | printf("%ld", val); |
239 | } |
239 | } |
240 | break; |
240 | break; |
241 | 241 | ||
242 | case V_CHAR: |
242 | case V_CHAR: |
243 | if (val >= 0x20 && val < 0x7f) { |
243 | if (val >= 0x20 && val < 0x7f) { |
244 | printf("'%c'", val); |
244 | printf("'%c'", val); |
245 | } else { |
245 | } else { |
246 | switch (val) { |
246 | switch (val) { |
247 | case '\a': printf("'\\a'"); break; |
247 | case '\a': printf("'\\a'"); break; |
248 | case '\b': printf("'\\b'"); break; |
248 | case '\b': printf("'\\b'"); break; |
249 | case '\n': printf("'\\n'"); break; |
249 | case '\n': printf("'\\n'"); break; |
250 | case '\r': printf("'\\r'"); break; |
250 | case '\r': printf("'\\r'"); break; |
251 | case '\t': printf("'\\t'"); break; |
251 | case '\t': printf("'\\t'"); break; |
252 | case '\\': printf("'\\\\'"); break; |
252 | case '\\': printf("'\\\\'"); break; |
253 | default: printf("'\\x%02lX'", val); break; |
253 | default: printf("'\\x%02lX'", val); break; |
254 | } |
254 | } |
255 | } |
255 | } |
256 | break; |
256 | break; |
257 | } |
257 | } |
258 | } |
258 | } |
259 | 259 | ||
260 | 260 | ||
261 | static void print_sc_retval(sysarg_t retval, val_type_t val_type) |
261 | static void print_sc_retval(sysarg_t retval, val_type_t val_type) |
262 | { |
262 | { |
263 | printf(" -> "); |
263 | printf(" -> "); |
264 | val_print(retval, val_type); |
264 | val_print(retval, val_type); |
265 | putchar('\n'); |
265 | putchar('\n'); |
266 | } |
266 | } |
267 | 267 | ||
268 | static void print_sc_args(sysarg_t *sc_args, int n) |
268 | static void print_sc_args(sysarg_t *sc_args, int n) |
269 | { |
269 | { |
270 | int i; |
270 | int i; |
271 | 271 | ||
272 | putchar('('); |
272 | putchar('('); |
273 | if (n > 0) printf("%ld", sc_args[0]); |
273 | if (n > 0) printf("%ld", sc_args[0]); |
274 | for (i = 1; i < n; i++) { |
274 | for (i = 1; i < n; i++) { |
275 | printf(", %ld", sc_args[i]); |
275 | printf(", %ld", sc_args[i]); |
276 | } |
276 | } |
277 | putchar(')'); |
277 | putchar(')'); |
278 | } |
278 | } |
279 | 279 | ||
280 | static void sc_ipc_call_async_fast(sysarg_t *sc_args, sysarg_t sc_rc) |
280 | static void sc_ipc_call_async_fast(sysarg_t *sc_args, sysarg_t sc_rc) |
281 | { |
281 | { |
282 | ipc_call_t call; |
282 | ipc_call_t call; |
283 | ipcarg_t phoneid; |
283 | ipcarg_t phoneid; |
284 | 284 | ||
285 | if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY) |
285 | if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY) |
286 | return; |
286 | return; |
287 | 287 | ||
288 | phoneid = sc_args[0]; |
288 | phoneid = sc_args[0]; |
289 | 289 | ||
290 | IPC_SET_METHOD(call, sc_args[1]); |
290 | IPC_SET_METHOD(call, sc_args[1]); |
291 | IPC_SET_ARG1(call, sc_args[2]); |
291 | IPC_SET_ARG1(call, sc_args[2]); |
292 | IPC_SET_ARG2(call, sc_args[3]); |
292 | IPC_SET_ARG2(call, sc_args[3]); |
293 | IPC_SET_ARG3(call, sc_args[4]); |
293 | IPC_SET_ARG3(call, sc_args[4]); |
294 | IPC_SET_ARG4(call, sc_args[5]); |
294 | IPC_SET_ARG4(call, sc_args[5]); |
295 | IPC_SET_ARG5(call, 0); |
295 | IPC_SET_ARG5(call, 0); |
296 | 296 | ||
297 | ipcp_call_out(phoneid, &call, sc_rc); |
297 | ipcp_call_out(phoneid, &call, sc_rc); |
298 | } |
298 | } |
299 | 299 | ||
300 | static void sc_ipc_call_async_slow(sysarg_t *sc_args, sysarg_t sc_rc) |
300 | static void sc_ipc_call_async_slow(sysarg_t *sc_args, sysarg_t sc_rc) |
301 | { |
301 | { |
302 | ipc_call_t call; |
302 | ipc_call_t call; |
303 | int rc; |
303 | int rc; |
304 | 304 | ||
305 | if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY) |
305 | if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY) |
306 | return; |
306 | return; |
307 | 307 | ||
308 | memset(&call, 0, sizeof(call)); |
308 | memset(&call, 0, sizeof(call)); |
309 | rc = udebug_mem_read(phoneid, &call.args, sc_args[1], sizeof(call.args)); |
309 | rc = udebug_mem_read(phoneid, &call.args, sc_args[1], sizeof(call.args)); |
310 | 310 | ||
311 | if (rc >= 0) { |
311 | if (rc >= 0) { |
312 | ipcp_call_out(sc_args[0], &call, sc_rc); |
312 | ipcp_call_out(sc_args[0], &call, sc_rc); |
313 | } |
313 | } |
314 | } |
314 | } |
315 | 315 | ||
316 | static void sc_ipc_call_sync_fast(sysarg_t *sc_args) |
316 | static void sc_ipc_call_sync_fast(sysarg_t *sc_args) |
317 | { |
317 | { |
318 | ipc_call_t question, reply; |
318 | ipc_call_t question, reply; |
319 | int rc; |
319 | int rc; |
320 | int phoneidx; |
320 | int phoneidx; |
321 | 321 | ||
322 | // printf("sc_ipc_call_sync_fast()\n"); |
322 | // printf("sc_ipc_call_sync_fast()\n"); |
323 | phoneidx = sc_args[0]; |
323 | phoneidx = sc_args[0]; |
324 | 324 | ||
325 | IPC_SET_METHOD(question, sc_args[1]); |
325 | IPC_SET_METHOD(question, sc_args[1]); |
326 | IPC_SET_ARG1(question, sc_args[2]); |
326 | IPC_SET_ARG1(question, sc_args[2]); |
327 | IPC_SET_ARG2(question, sc_args[3]); |
327 | IPC_SET_ARG2(question, sc_args[3]); |
328 | IPC_SET_ARG3(question, sc_args[4]); |
328 | IPC_SET_ARG3(question, sc_args[4]); |
329 | IPC_SET_ARG4(question, 0); |
329 | IPC_SET_ARG4(question, 0); |
330 | IPC_SET_ARG5(question, 0); |
330 | IPC_SET_ARG5(question, 0); |
331 | 331 | ||
332 | // printf("memset\n"); |
332 | // printf("memset\n"); |
333 | memset(&reply, 0, sizeof(reply)); |
333 | memset(&reply, 0, sizeof(reply)); |
334 | // printf("udebug_mem_read(phone=%d, buffer_ptr=%u, src_addr=%d, n=%d\n", |
334 | // printf("udebug_mem_read(phone=%d, buffer_ptr=%u, src_addr=%d, n=%d\n", |
335 | // phoneid, &reply.args, sc_args[5], sizeof(reply.args)); |
335 | // phoneid, &reply.args, sc_args[5], sizeof(reply.args)); |
336 | rc = udebug_mem_read(phoneid, &reply.args, sc_args[5], sizeof(reply.args)); |
336 | rc = udebug_mem_read(phoneid, &reply.args, sc_args[5], sizeof(reply.args)); |
337 | // printf("dmr->%d\n", rc); |
337 | // printf("dmr->%d\n", rc); |
338 | if (rc < 0) return; |
338 | if (rc < 0) return; |
339 | 339 | ||
340 | // printf("call ipc_call_sync\n"); |
340 | // printf("call ipc_call_sync\n"); |
341 | ipcp_call_sync(phoneidx, &question, &reply); |
341 | ipcp_call_sync(phoneidx, &question, &reply); |
342 | } |
342 | } |
343 | 343 | ||
344 | static void sc_ipc_call_sync_slow_b(unsigned thread_id, sysarg_t *sc_args) |
344 | static void sc_ipc_call_sync_slow_b(unsigned thread_id, sysarg_t *sc_args) |
345 | { |
345 | { |
346 | ipc_call_t question, reply; |
346 | ipc_call_t question, reply; |
347 | int rc; |
347 | int rc; |
348 | 348 | ||
349 | memset(&question, 0, sizeof(question)); |
349 | memset(&question, 0, sizeof(question)); |
350 | rc = udebug_mem_read(phoneid, &question.args, sc_args[1], sizeof(question.args)); |
350 | rc = udebug_mem_read(phoneid, &question.args, sc_args[1], sizeof(question.args)); |
351 | if (rc < 0) { |
351 | if (rc < 0) { |
352 | printf("Error: mem_read->%d\n", rc); |
352 | printf("Error: mem_read->%d\n", rc); |
353 | return; |
353 | return; |
354 | } |
354 | } |
355 | 355 | ||
356 | thread_ipc_req[thread_id] = question; |
356 | thread_ipc_req[thread_id] = question; |
357 | } |
357 | } |
358 | 358 | ||
359 | static void sc_ipc_call_sync_slow_e(unsigned thread_id, sysarg_t *sc_args) |
359 | static void sc_ipc_call_sync_slow_e(unsigned thread_id, sysarg_t *sc_args) |
360 | { |
360 | { |
361 | ipc_call_t question, reply; |
361 | ipc_call_t question, reply; |
362 | int rc; |
362 | int rc; |
363 | 363 | ||
364 | memset(&reply, 0, sizeof(reply)); |
364 | memset(&reply, 0, sizeof(reply)); |
365 | rc = udebug_mem_read(phoneid, &reply.args, sc_args[2], sizeof(reply.args)); |
365 | rc = udebug_mem_read(phoneid, &reply.args, sc_args[2], sizeof(reply.args)); |
366 | if (rc < 0) { |
366 | if (rc < 0) { |
367 | printf("Error: mem_read->%d\n", rc); |
367 | printf("Error: mem_read->%d\n", rc); |
368 | return; |
368 | return; |
369 | } |
369 | } |
370 | 370 | ||
371 | ipcp_call_sync(sc_args[0], &thread_ipc_req[thread_id], &reply); |
371 | ipcp_call_sync(sc_args[0], &thread_ipc_req[thread_id], &reply); |
372 | } |
372 | } |
373 | 373 | ||
374 | static void sc_ipc_wait(sysarg_t *sc_args, int sc_rc) |
374 | static void sc_ipc_wait(sysarg_t *sc_args, int sc_rc) |
375 | { |
375 | { |
376 | ipc_call_t call; |
376 | ipc_call_t call; |
377 | int rc; |
377 | int rc; |
378 | 378 | ||
379 | if (sc_rc == 0) return; |
379 | if (sc_rc == 0) return; |
380 | 380 | ||
381 | memset(&call, 0, sizeof(call)); |
381 | memset(&call, 0, sizeof(call)); |
382 | rc = udebug_mem_read(phoneid, &call, sc_args[0], sizeof(call)); |
382 | rc = udebug_mem_read(phoneid, &call, sc_args[0], sizeof(call)); |
383 | // printf("udebug_mem_read(phone %d, dest %d, app-mem src %d, size %d -> %d\n", |
383 | // printf("udebug_mem_read(phone %d, dest %d, app-mem src %d, size %d -> %d\n", |
384 | // phoneid, (int)&call, sc_args[0], sizeof(call), rc); |
384 | // phoneid, (int)&call, sc_args[0], sizeof(call), rc); |
385 | 385 | ||
386 | if (rc >= 0) { |
386 | if (rc >= 0) { |
387 | ipcp_call_in(&call, sc_rc); |
387 | ipcp_call_in(&call, sc_rc); |
388 | } |
388 | } |
389 | } |
389 | } |
390 | 390 | ||
391 | static void event_syscall_b(unsigned thread_id, uintptr_t thread_hash, |
391 | static void event_syscall_b(unsigned thread_id, uintptr_t thread_hash, |
392 | unsigned sc_id, sysarg_t sc_rc) |
392 | unsigned sc_id, sysarg_t sc_rc) |
393 | { |
393 | { |
394 | sysarg_t sc_args[6]; |
394 | sysarg_t sc_args[6]; |
395 | int rc; |
395 | int rc; |
396 | 396 | ||
397 | /* Read syscall arguments */ |
397 | /* Read syscall arguments */ |
398 | rc = udebug_args_read(phoneid, thread_hash, sc_args); |
398 | rc = udebug_args_read(phoneid, thread_hash, sc_args); |
399 | 399 | ||
400 | async_serialize_start(); |
400 | async_serialize_start(); |
401 | 401 | ||
402 | // printf("[%d] ", thread_id); |
402 | // printf("[%d] ", thread_id); |
403 | 403 | ||
404 | if (rc < 0) { |
404 | if (rc < 0) { |
405 | printf("error\n"); |
405 | printf("error\n"); |
406 | async_serialize_end(); |
406 | async_serialize_end(); |
407 | return; |
407 | return; |
408 | } |
408 | } |
409 | 409 | ||
410 | if ((display_mask & DM_SYSCALL) != 0) { |
410 | if ((display_mask & DM_SYSCALL) != 0) { |
411 | /* Print syscall name and arguments */ |
411 | /* Print syscall name and arguments */ |
412 | printf("%s", syscall_desc[sc_id].name); |
412 | printf("%s", syscall_desc[sc_id].name); |
413 | print_sc_args(sc_args, syscall_desc[sc_id].n_args); |
413 | print_sc_args(sc_args, syscall_desc[sc_id].n_args); |
414 | } |
414 | } |
415 | 415 | ||
416 | switch (sc_id) { |
416 | switch (sc_id) { |
417 | case SYS_IPC_CALL_SYNC_SLOW: |
417 | case SYS_IPC_CALL_SYNC_SLOW: |
418 | sc_ipc_call_sync_slow_b(thread_id, sc_args); |
418 | sc_ipc_call_sync_slow_b(thread_id, sc_args); |
419 | break; |
419 | break; |
420 | default: |
420 | default: |
421 | break; |
421 | break; |
422 | } |
422 | } |
423 | 423 | ||
424 | async_serialize_end(); |
424 | async_serialize_end(); |
425 | } |
425 | } |
426 | 426 | ||
427 | static void event_syscall_e(unsigned thread_id, uintptr_t thread_hash, |
427 | static void event_syscall_e(unsigned thread_id, uintptr_t thread_hash, |
428 | unsigned sc_id, sysarg_t sc_rc) |
428 | unsigned sc_id, sysarg_t sc_rc) |
429 | { |
429 | { |
430 | sysarg_t sc_args[6]; |
430 | sysarg_t sc_args[6]; |
431 | int rv_type; |
431 | int rv_type; |
432 | int rc; |
432 | int rc; |
433 | 433 | ||
434 | /* Read syscall arguments */ |
434 | /* Read syscall arguments */ |
435 | rc = udebug_args_read(phoneid, thread_hash, sc_args); |
435 | rc = udebug_args_read(phoneid, thread_hash, sc_args); |
436 | 436 | ||
437 | async_serialize_start(); |
437 | async_serialize_start(); |
438 | 438 | ||
439 | // printf("[%d] ", thread_id); |
439 | // printf("[%d] ", thread_id); |
440 | 440 | ||
441 | if (rc < 0) { |
441 | if (rc < 0) { |
442 | printf("error\n"); |
442 | printf("error\n"); |
443 | async_serialize_end(); |
443 | async_serialize_end(); |
444 | return; |
444 | return; |
445 | } |
445 | } |
446 | 446 | ||
447 | if ((display_mask & DM_SYSCALL) != 0) { |
447 | if ((display_mask & DM_SYSCALL) != 0) { |
448 | /* Print syscall return value */ |
448 | /* Print syscall return value */ |
449 | rv_type = syscall_desc[sc_id].rv_type; |
449 | rv_type = syscall_desc[sc_id].rv_type; |
450 | print_sc_retval(sc_rc, rv_type); |
450 | print_sc_retval(sc_rc, rv_type); |
451 | } |
451 | } |
452 | 452 | ||
453 | switch (sc_id) { |
453 | switch (sc_id) { |
454 | case SYS_IPC_CALL_ASYNC_FAST: |
454 | case SYS_IPC_CALL_ASYNC_FAST: |
455 | sc_ipc_call_async_fast(sc_args, sc_rc); |
455 | sc_ipc_call_async_fast(sc_args, sc_rc); |
456 | break; |
456 | break; |
457 | case SYS_IPC_CALL_ASYNC_SLOW: |
457 | case SYS_IPC_CALL_ASYNC_SLOW: |
458 | sc_ipc_call_async_slow(sc_args, sc_rc); |
458 | sc_ipc_call_async_slow(sc_args, sc_rc); |
459 | break; |
459 | break; |
460 | case SYS_IPC_CALL_SYNC_FAST: |
460 | case SYS_IPC_CALL_SYNC_FAST: |
461 | sc_ipc_call_sync_fast(sc_args); |
461 | sc_ipc_call_sync_fast(sc_args); |
462 | break; |
462 | break; |
463 | case SYS_IPC_CALL_SYNC_SLOW: |
463 | case SYS_IPC_CALL_SYNC_SLOW: |
464 | sc_ipc_call_sync_slow_e(thread_id, sc_args); |
464 | sc_ipc_call_sync_slow_e(thread_id, sc_args); |
465 | break; |
465 | break; |
466 | case SYS_IPC_WAIT: |
466 | case SYS_IPC_WAIT: |
467 | sc_ipc_wait(sc_args, sc_rc); |
467 | sc_ipc_wait(sc_args, sc_rc); |
468 | break; |
468 | break; |
469 | default: |
469 | default: |
470 | break; |
470 | break; |
471 | } |
471 | } |
472 | 472 | ||
473 | async_serialize_end(); |
473 | async_serialize_end(); |
474 | } |
474 | } |
475 | 475 | ||
476 | static void event_thread_b(uintptr_t hash) |
476 | static void event_thread_b(uintptr_t hash) |
477 | { |
477 | { |
478 | async_serialize_start(); |
478 | async_serialize_start(); |
479 | printf("New thread, hash 0x%lx\n", hash); |
479 | printf("New thread, hash 0x%lx\n", hash); |
480 | async_serialize_end(); |
480 | async_serialize_end(); |
481 | 481 | ||
482 | thread_trace_start(hash); |
482 | thread_trace_start(hash); |
483 | } |
483 | } |
484 | 484 | ||
485 | static int trace_loop(void *thread_hash_arg) |
485 | static int trace_loop(void *thread_hash_arg) |
486 | { |
486 | { |
487 | int rc; |
487 | int rc; |
488 | unsigned ev_type; |
488 | unsigned ev_type; |
489 | uintptr_t thread_hash; |
489 | uintptr_t thread_hash; |
490 | unsigned thread_id; |
490 | unsigned thread_id; |
491 | sysarg_t val0, val1; |
491 | sysarg_t val0, val1; |
492 | 492 | ||
493 | thread_hash = (uintptr_t)thread_hash_arg; |
493 | thread_hash = (uintptr_t)thread_hash_arg; |
494 | thread_id = next_thread_id++; |
494 | thread_id = next_thread_id++; |
495 | if (thread_id >= THBUF_SIZE) { |
495 | if (thread_id >= THBUF_SIZE) { |
496 | printf("Too many threads.\n"); |
496 | printf("Too many threads.\n"); |
497 | return ELIMIT; |
497 | return ELIMIT; |
498 | } |
498 | } |
499 | 499 | ||
500 | printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash); |
500 | printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash); |
501 | 501 | ||
502 | while (!abort_trace) { |
502 | while (!abort_trace) { |
503 | 503 | ||
504 | fibril_mutex_lock(&state_lock); |
504 | fibril_mutex_lock(&state_lock); |
505 | if (paused) { |
505 | if (paused) { |
506 | printf("Thread [%d] paused. Press R to resume.\n", |
506 | printf("Thread [%d] paused. Press R to resume.\n", |
507 | thread_id); |
507 | thread_id); |
508 | 508 | ||
509 | while (paused) |
509 | while (paused) |
510 | fibril_condvar_wait(&state_cv, &state_lock); |
510 | fibril_condvar_wait(&state_cv, &state_lock); |
511 | 511 | ||
512 | printf("Thread [%d] resumed.\n", thread_id); |
512 | printf("Thread [%d] resumed.\n", thread_id); |
513 | } |
513 | } |
514 | fibril_mutex_unlock(&state_lock); |
514 | fibril_mutex_unlock(&state_lock); |
515 | 515 | ||
516 | /* Run thread until an event occurs */ |
516 | /* Run thread until an event occurs */ |
517 | rc = udebug_go(phoneid, thread_hash, |
517 | rc = udebug_go(phoneid, thread_hash, |
518 | &ev_type, &val0, &val1); |
518 | &ev_type, &val0, &val1); |
519 | 519 | ||
520 | // printf("rc = %d, ev_type=%d\n", rc, ev_type); |
520 | // printf("rc = %d, ev_type=%d\n", rc, ev_type); |
521 | if (ev_type == UDEBUG_EVENT_FINISHED) { |
521 | if (ev_type == UDEBUG_EVENT_FINISHED) { |
522 | /* Done tracing this thread */ |
522 | /* Done tracing this thread */ |
523 | break; |
523 | break; |
524 | } |
524 | } |
525 | 525 | ||
526 | if (rc >= 0) { |
526 | if (rc >= 0) { |
527 | switch (ev_type) { |
527 | switch (ev_type) { |
528 | case UDEBUG_EVENT_SYSCALL_B: |
528 | case UDEBUG_EVENT_SYSCALL_B: |
529 | event_syscall_b(thread_id, thread_hash, val0, (int)val1); |
529 | event_syscall_b(thread_id, thread_hash, val0, (int)val1); |
530 | break; |
530 | break; |
531 | case UDEBUG_EVENT_SYSCALL_E: |
531 | case UDEBUG_EVENT_SYSCALL_E: |
532 | event_syscall_e(thread_id, thread_hash, val0, (int)val1); |
532 | event_syscall_e(thread_id, thread_hash, val0, (int)val1); |
533 | break; |
533 | break; |
534 | case UDEBUG_EVENT_STOP: |
534 | case UDEBUG_EVENT_STOP: |
535 | printf("Stop event\n"); |
535 | printf("Stop event\n"); |
536 | fibril_mutex_lock(&state_lock); |
536 | fibril_mutex_lock(&state_lock); |
537 | paused = true; |
537 | paused = true; |
538 | fibril_mutex_unlock(&state_lock); |
538 | fibril_mutex_unlock(&state_lock); |
539 | break; |
539 | break; |
540 | case UDEBUG_EVENT_THREAD_B: |
540 | case UDEBUG_EVENT_THREAD_B: |
541 | event_thread_b(val0); |
541 | event_thread_b(val0); |
542 | break; |
542 | break; |
543 | case UDEBUG_EVENT_THREAD_E: |
543 | case UDEBUG_EVENT_THREAD_E: |
544 | printf("Thread 0x%lx exited.\n", val0); |
544 | printf("Thread 0x%lx exited.\n", val0); |
545 | fibril_mutex_lock(&state_lock); |
545 | fibril_mutex_lock(&state_lock); |
546 | abort_trace = true; |
546 | abort_trace = true; |
547 | fibril_condvar_broadcast(&state_cv); |
547 | fibril_condvar_broadcast(&state_cv); |
548 | fibril_mutex_unlock(&state_lock); |
548 | fibril_mutex_unlock(&state_lock); |
549 | break; |
549 | break; |
550 | default: |
550 | default: |
551 | printf("Unknown event type %d.\n", ev_type); |
551 | printf("Unknown event type %d.\n", ev_type); |
552 | break; |
552 | break; |
553 | } |
553 | } |
554 | } |
554 | } |
555 | 555 | ||
556 | } |
556 | } |
557 | 557 | ||
558 | printf("Finished tracing thread [%d].\n", thread_id); |
558 | printf("Finished tracing thread [%d].\n", thread_id); |
559 | return 0; |
559 | return 0; |
560 | } |
560 | } |
561 | 561 | ||
562 | void thread_trace_start(uintptr_t thread_hash) |
562 | void thread_trace_start(uintptr_t thread_hash) |
563 | { |
563 | { |
564 | fid_t fid; |
564 | fid_t fid; |
565 | 565 | ||
566 | thash = thread_hash; |
566 | thash = thread_hash; |
567 | 567 | ||
568 | fid = fibril_create(trace_loop, (void *)thread_hash); |
568 | fid = fibril_create(trace_loop, (void *)thread_hash); |
569 | if (fid == 0) { |
569 | if (fid == 0) { |
570 | printf("Warning: Failed creating fibril\n"); |
570 | printf("Warning: Failed creating fibril\n"); |
571 | } |
571 | } |
572 | fibril_add_ready(fid); |
572 | fibril_add_ready(fid); |
573 | } |
573 | } |
574 | 574 | ||
575 | static loader_t *preload_task(const char *path, char *const argv[], |
575 | static loader_t *preload_task(const char *path, char *const argv[], |
576 | task_id_t *task_id) |
576 | task_id_t *task_id) |
577 | { |
577 | { |
578 | loader_t *ldr; |
578 | loader_t *ldr; |
579 | int rc; |
579 | int rc; |
580 | 580 | ||
581 | /* Spawn a program loader */ |
581 | /* Spawn a program loader */ |
582 | ldr = loader_connect(); |
582 | ldr = loader_connect(); |
583 | if (ldr == NULL) |
583 | if (ldr == NULL) |
584 | return 0; |
584 | return 0; |
585 | 585 | ||
586 | /* Get task ID. */ |
586 | /* Get task ID. */ |
587 | rc = loader_get_task_id(ldr, task_id); |
587 | rc = loader_get_task_id(ldr, task_id); |
588 | if (rc != EOK) |
588 | if (rc != EOK) |
589 | goto error; |
589 | goto error; |
590 | 590 | ||
591 | /* Send program pathname */ |
591 | /* Send program pathname */ |
592 | rc = loader_set_pathname(ldr, path); |
592 | rc = loader_set_pathname(ldr, path); |
593 | if (rc != EOK) |
593 | if (rc != EOK) |
594 | goto error; |
594 | goto error; |
595 | 595 | ||
596 | /* Send arguments */ |
596 | /* Send arguments */ |
597 | rc = loader_set_args(ldr, argv); |
597 | rc = loader_set_args(ldr, argv); |
598 | if (rc != EOK) |
598 | if (rc != EOK) |
599 | goto error; |
599 | goto error; |
600 | 600 | ||
601 | /* Send default files */ |
601 | /* Send default files */ |
602 | fdi_node_t *files[4]; |
602 | fdi_node_t *files[4]; |
603 | fdi_node_t stdin_node; |
603 | fdi_node_t stdin_node; |
604 | fdi_node_t stdout_node; |
604 | fdi_node_t stdout_node; |
605 | fdi_node_t stderr_node; |
605 | fdi_node_t stderr_node; |
606 | 606 | ||
607 | if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK)) |
607 | if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK)) |
608 | files[0] = &stdin_node; |
608 | files[0] = &stdin_node; |
609 | else |
609 | else |
610 | files[0] = NULL; |
610 | files[0] = NULL; |
611 | 611 | ||
612 | if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK)) |
612 | if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK)) |
613 | files[1] = &stdout_node; |
613 | files[1] = &stdout_node; |
614 | else |
614 | else |
615 | files[1] = NULL; |
615 | files[1] = NULL; |
616 | 616 | ||
617 | if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK)) |
617 | if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK)) |
618 | files[2] = &stderr_node; |
618 | files[2] = &stderr_node; |
619 | else |
619 | else |
620 | files[2] = NULL; |
620 | files[2] = NULL; |
621 | 621 | ||
622 | files[3] = NULL; |
622 | files[3] = NULL; |
623 | 623 | ||
624 | rc = loader_set_files(ldr, files); |
624 | rc = loader_set_files(ldr, files); |
625 | if (rc != EOK) |
625 | if (rc != EOK) |
626 | goto error; |
626 | goto error; |
627 | 627 | ||
628 | /* Load the program. */ |
628 | /* Load the program. */ |
629 | rc = loader_load_program(ldr); |
629 | rc = loader_load_program(ldr); |
630 | if (rc != EOK) |
630 | if (rc != EOK) |
631 | goto error; |
631 | goto error; |
632 | 632 | ||
633 | /* Success */ |
633 | /* Success */ |
634 | return ldr; |
634 | return ldr; |
635 | 635 | ||
636 | /* Error exit */ |
636 | /* Error exit */ |
637 | error: |
637 | error: |
638 | loader_abort(ldr); |
638 | loader_abort(ldr); |
639 | free(ldr); |
639 | free(ldr); |
640 | return NULL; |
640 | return NULL; |
641 | } |
641 | } |
642 | 642 | ||
643 | static int cev_fibril(void *arg) |
643 | static int cev_fibril(void *arg) |
644 | { |
644 | { |
645 | (void) arg; |
645 | (void) arg; |
646 | 646 | ||
647 | while (true) { |
647 | while (true) { |
648 | fibril_mutex_lock(&state_lock); |
648 | fibril_mutex_lock(&state_lock); |
649 | while (cev_valid) |
649 | while (cev_valid) |
650 | fibril_condvar_wait(&state_cv, &state_lock); |
650 | fibril_condvar_wait(&state_cv, &state_lock); |
651 | fibril_mutex_unlock(&state_lock); |
651 | fibril_mutex_unlock(&state_lock); |
652 | 652 | ||
653 | if (!console_get_event(fphone(stdin), &cev)) |
653 | if (!console_get_event(fphone(stdin), &cev)) |
654 | return -1; |
654 | return -1; |
655 | 655 | ||
656 | fibril_mutex_lock(&state_lock); |
656 | fibril_mutex_lock(&state_lock); |
657 | cev_valid = true; |
657 | cev_valid = true; |
658 | fibril_condvar_broadcast(&state_cv); |
658 | fibril_condvar_broadcast(&state_cv); |
659 | fibril_mutex_unlock(&state_lock); |
659 | fibril_mutex_unlock(&state_lock); |
660 | } |
660 | } |
661 | } |
661 | } |
662 | 662 | ||
663 | static void trace_task(task_id_t task_id) |
663 | static void trace_task(task_id_t task_id) |
664 | { |
664 | { |
665 | console_event_t ev; |
665 | console_event_t ev; |
666 | bool done; |
666 | bool done; |
667 | int i; |
667 | int i; |
668 | int rc; |
668 | int rc; |
669 | 669 | ||
670 | ipcp_init(); |
670 | ipcp_init(); |
671 | 671 | ||
672 | /* |
672 | /* |
673 | * User apps now typically have console on phone 3. |
673 | * User apps now typically have console on phone 3. |
674 | * (Phones 1 and 2 are used by the loader). |
674 | * (Phones 1 and 2 are used by the loader). |
675 | */ |
675 | */ |
676 | ipcp_connection_set(3, 0, proto_console); |
676 | ipcp_connection_set(3, 0, proto_console); |
677 | 677 | ||
678 | rc = get_thread_list(); |
678 | rc = get_thread_list(); |
679 | if (rc < 0) { |
679 | if (rc < 0) { |
680 | printf("Failed to get thread list (error %d)\n", rc); |
680 | printf("Failed to get thread list (error %d)\n", rc); |
681 | return; |
681 | return; |
682 | } |
682 | } |
683 | 683 | ||
684 | abort_trace = false; |
684 | abort_trace = false; |
685 | 685 | ||
686 | for (i = 0; i < n_threads; i++) { |
686 | for (i = 0; i < n_threads; i++) { |
687 | thread_trace_start(thread_hash_buf[i]); |
687 | thread_trace_start(thread_hash_buf[i]); |
688 | } |
688 | } |
689 | 689 | ||
690 | done = false; |
690 | done = false; |
691 | 691 | ||
692 | while (!done) { |
692 | while (!done) { |
693 | fibril_mutex_lock(&state_lock); |
693 | fibril_mutex_lock(&state_lock); |
694 | while (!cev_valid && !abort_trace) |
694 | while (!cev_valid && !abort_trace) |
695 | fibril_condvar_wait(&state_cv, &state_lock); |
695 | fibril_condvar_wait(&state_cv, &state_lock); |
696 | fibril_mutex_unlock(&state_lock); |
696 | fibril_mutex_unlock(&state_lock); |
697 | 697 | ||
698 | ev = cev; |
698 | ev = cev; |
699 | 699 | ||
700 | fibril_mutex_lock(&state_lock); |
700 | fibril_mutex_lock(&state_lock); |
701 | cev_valid = false; |
701 | cev_valid = false; |
702 | fibril_condvar_broadcast(&state_cv); |
702 | fibril_condvar_broadcast(&state_cv); |
703 | fibril_mutex_unlock(&state_lock); |
703 | fibril_mutex_unlock(&state_lock); |
704 | 704 | ||
705 | if (abort_trace) |
705 | if (abort_trace) |
706 | break; |
706 | break; |
707 | 707 | ||
708 | if (ev.type != KEY_PRESS) |
708 | if (ev.type != KEY_PRESS) |
709 | continue; |
709 | continue; |
710 | 710 | ||
711 | switch (ev.key) { |
711 | switch (ev.key) { |
712 | case KC_Q: |
712 | case KC_Q: |
713 | done = true; |
713 | done = true; |
714 | break; |
714 | break; |
715 | case KC_P: |
715 | case KC_P: |
716 | printf("Pause...\n"); |
716 | printf("Pause...\n"); |
717 | rc = udebug_stop(phoneid, thash); |
717 | rc = udebug_stop(phoneid, thash); |
718 | if (rc != EOK) |
718 | if (rc != EOK) |
719 | printf("Error: stop -> %d\n", rc); |
719 | printf("Error: stop -> %d\n", rc); |
720 | break; |
720 | break; |
721 | case KC_R: |
721 | case KC_R: |
722 | fibril_mutex_lock(&state_lock); |
722 | fibril_mutex_lock(&state_lock); |
723 | paused = false; |
723 | paused = false; |
724 | fibril_condvar_broadcast(&state_cv); |
724 | fibril_condvar_broadcast(&state_cv); |
725 | fibril_mutex_unlock(&state_lock); |
725 | fibril_mutex_unlock(&state_lock); |
726 | printf("Resume...\n"); |
726 | printf("Resume...\n"); |
727 | break; |
727 | break; |
728 | } |
728 | } |
729 | } |
729 | } |
730 | 730 | ||
731 | printf("\nTerminate debugging session...\n"); |
731 | printf("\nTerminate debugging session...\n"); |
732 | abort_trace = true; |
732 | abort_trace = true; |
733 | udebug_end(phoneid); |
733 | udebug_end(phoneid); |
734 | ipc_hangup(phoneid); |
734 | ipc_hangup(phoneid); |
735 | 735 | ||
736 | ipcp_cleanup(); |
736 | ipcp_cleanup(); |
737 | 737 | ||
738 | printf("Done\n"); |
738 | printf("Done\n"); |
739 | return; |
739 | return; |
740 | } |
740 | } |
741 | 741 | ||
742 | static void main_init(void) |
742 | static void main_init(void) |
743 | { |
743 | { |
744 | proto_t *p; |
744 | proto_t *p; |
745 | oper_t *o; |
745 | oper_t *o; |
746 | 746 | ||
747 | val_type_t arg_def[OPER_MAX_ARGS] = { |
747 | val_type_t arg_def[OPER_MAX_ARGS] = { |
748 | V_INTEGER, |
748 | V_INTEGER, |
749 | V_INTEGER, |
749 | V_INTEGER, |
750 | V_INTEGER, |
750 | V_INTEGER, |
751 | V_INTEGER, |
751 | V_INTEGER, |
752 | V_INTEGER |
752 | V_INTEGER |
753 | }; |
753 | }; |
754 | 754 | ||
755 | val_type_t resp_def[OPER_MAX_ARGS] = { |
755 | val_type_t resp_def[OPER_MAX_ARGS] = { |
756 | V_INTEGER, |
756 | V_INTEGER, |
757 | V_INTEGER, |
757 | V_INTEGER, |
758 | V_INTEGER, |
758 | V_INTEGER, |
759 | V_INTEGER, |
759 | V_INTEGER, |
760 | V_INTEGER |
760 | V_INTEGER |
761 | }; |
761 | }; |
762 | 762 | ||
763 | next_thread_id = 1; |
763 | next_thread_id = 1; |
764 | paused = false; |
764 | paused = false; |
765 | cev_valid = false; |
765 | cev_valid = false; |
766 | 766 | ||
767 | fibril_mutex_initialize(&state_lock); |
767 | fibril_mutex_initialize(&state_lock); |
768 | fibril_condvar_initialize(&state_cv); |
768 | fibril_condvar_initialize(&state_cv); |
769 | 769 | ||
770 | proto_init(); |
770 | proto_init(); |
771 | 771 | ||
772 | p = proto_new("vfs"); |
772 | p = proto_new("vfs"); |
- | 773 | o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def); |
|
- | 774 | proto_add_oper(p, VFS_IN_OPEN, o); |
|
- | 775 | o = oper_new("open_node", 4, arg_def, V_INT_ERRNO, 0, resp_def); |
|
- | 776 | proto_add_oper(p, VFS_IN_OPEN_NODE, o); |
|
773 | o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def); |
777 | o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def); |
774 | proto_add_oper(p, VFS_IN_READ, o); |
778 | proto_add_oper(p, VFS_IN_READ, o); |
775 | o = oper_new("write", 1, arg_def, V_ERRNO, 1, resp_def); |
779 | o = oper_new("write", 1, arg_def, V_ERRNO, 1, resp_def); |
776 | proto_add_oper(p, VFS_IN_WRITE, o); |
780 | proto_add_oper(p, VFS_IN_WRITE, o); |
- | 781 | o = oper_new("seek", 3, arg_def, V_ERRNO, 0, resp_def); |
|
- | 782 | proto_add_oper(p, VFS_IN_SEEK, o); |
|
777 | o = oper_new("truncate", 5, arg_def, V_ERRNO, 0, resp_def); |
783 | o = oper_new("truncate", 5, arg_def, V_ERRNO, 0, resp_def); |
778 | proto_add_oper(p, VFS_IN_TRUNCATE, o); |
784 | proto_add_oper(p, VFS_IN_TRUNCATE, o); |
- | 785 | o = oper_new("fstat", 1, arg_def, V_ERRNO, 0, resp_def); |
|
- | 786 | proto_add_oper(p, VFS_IN_FSTAT, o); |
|
- | 787 | o = oper_new("close", 1, arg_def, V_ERRNO, 0, resp_def); |
|
- | 788 | proto_add_oper(p, VFS_IN_CLOSE, o); |
|
779 | o = oper_new("mount", 2, arg_def, V_ERRNO, 0, resp_def); |
789 | o = oper_new("mount", 2, arg_def, V_ERRNO, 0, resp_def); |
780 | proto_add_oper(p, VFS_IN_MOUNT, o); |
790 | proto_add_oper(p, VFS_IN_MOUNT, o); |
781 | /* o = oper_new("unmount", 0, arg_def); |
791 | /* o = oper_new("unmount", 0, arg_def); |
782 | proto_add_oper(p, VFS_IN_UNMOUNT, o);*/ |
792 | proto_add_oper(p, VFS_IN_UNMOUNT, o);*/ |
783 | o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def); |
- | |
784 | proto_add_oper(p, VFS_IN_OPEN, o); |
- | |
785 | o = oper_new("close", 1, arg_def, V_ERRNO, 0, resp_def); |
- | |
786 | proto_add_oper(p, VFS_IN_CLOSE, o); |
- | |
787 | o = oper_new("seek", 3, arg_def, V_ERRNO, 0, resp_def); |
793 | o = oper_new("sync", 1, arg_def, V_ERRNO, 0, resp_def); |
788 | proto_add_oper(p, VFS_IN_SEEK, o); |
794 | proto_add_oper(p, VFS_IN_SYNC, o); |
789 | o = oper_new("mkdir", 1, arg_def, V_ERRNO, 0, resp_def); |
795 | o = oper_new("mkdir", 1, arg_def, V_ERRNO, 0, resp_def); |
790 | proto_add_oper(p, VFS_IN_MKDIR, o); |
796 | proto_add_oper(p, VFS_IN_MKDIR, o); |
791 | o = oper_new("unlink", 0, arg_def, V_ERRNO, 0, resp_def); |
797 | o = oper_new("unlink", 0, arg_def, V_ERRNO, 0, resp_def); |
792 | proto_add_oper(p, VFS_IN_UNLINK, o); |
798 | proto_add_oper(p, VFS_IN_UNLINK, o); |
793 | o = oper_new("rename", 0, arg_def, V_ERRNO, 0, resp_def); |
799 | o = oper_new("rename", 0, arg_def, V_ERRNO, 0, resp_def); |
794 | proto_add_oper(p, VFS_IN_RENAME, o); |
800 | proto_add_oper(p, VFS_IN_RENAME, o); |
- | 801 | o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def); |
|
- | 802 | proto_add_oper(p, VFS_IN_STAT, o); |
|
795 | 803 | ||
796 | proto_register(SERVICE_VFS, p); |
804 | proto_register(SERVICE_VFS, p); |
797 | 805 | ||
798 | p = proto_new("console"); |
806 | p = proto_new("console"); |
- | 807 | ||
- | 808 | o = oper_new("write", 1, arg_def, V_ERRNO, 1, resp_def); |
|
- | 809 | proto_add_oper(p, VFS_IN_WRITE, o); |
|
- | 810 | ||
799 | resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER; |
811 | resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER; |
800 | resp_def[2] = V_INTEGER; resp_def[3] = V_CHAR; |
812 | resp_def[2] = V_INTEGER; resp_def[3] = V_CHAR; |
801 | o = oper_new("getkey", 0, arg_def, V_ERRNO, 4, resp_def); |
813 | o = oper_new("getkey", 0, arg_def, V_ERRNO, 4, resp_def); |
802 | 814 | ||
803 | arg_def[0] = V_CHAR; |
815 | arg_def[0] = V_CHAR; |
804 | o = oper_new("clear", 0, arg_def, V_VOID, 0, resp_def); |
816 | o = oper_new("clear", 0, arg_def, V_VOID, 0, resp_def); |
805 | proto_add_oper(p, CONSOLE_CLEAR, o); |
817 | proto_add_oper(p, CONSOLE_CLEAR, o); |
806 | 818 | ||
807 | arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; |
819 | arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; |
808 | o = oper_new("goto", 2, arg_def, V_VOID, 0, resp_def); |
820 | o = oper_new("goto", 2, arg_def, V_VOID, 0, resp_def); |
809 | proto_add_oper(p, CONSOLE_GOTO, o); |
821 | proto_add_oper(p, CONSOLE_GOTO, o); |
810 | 822 | ||
811 | resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER; |
823 | resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER; |
812 | o = oper_new("getsize", 0, arg_def, V_INTEGER, 2, resp_def); |
824 | o = oper_new("getsize", 0, arg_def, V_INTEGER, 2, resp_def); |
813 | proto_add_oper(p, CONSOLE_GET_SIZE, o); |
825 | proto_add_oper(p, CONSOLE_GET_SIZE, o); |
814 | 826 | ||
815 | arg_def[0] = V_INTEGER; |
827 | arg_def[0] = V_INTEGER; |
816 | o = oper_new("set_style", 1, arg_def, V_VOID, 0, resp_def); |
828 | o = oper_new("set_style", 1, arg_def, V_VOID, 0, resp_def); |
817 | proto_add_oper(p, CONSOLE_SET_STYLE, o); |
829 | proto_add_oper(p, CONSOLE_SET_STYLE, o); |
818 | arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; arg_def[2] = V_INTEGER; |
830 | arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; arg_def[2] = V_INTEGER; |
819 | o = oper_new("set_color", 3, arg_def, V_VOID, 0, resp_def); |
831 | o = oper_new("set_color", 3, arg_def, V_VOID, 0, resp_def); |
820 | proto_add_oper(p, CONSOLE_SET_COLOR, o); |
832 | proto_add_oper(p, CONSOLE_SET_COLOR, o); |
821 | arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; |
833 | arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; |
822 | o = oper_new("set_rgb_color", 2, arg_def, V_VOID, 0, resp_def); |
834 | o = oper_new("set_rgb_color", 2, arg_def, V_VOID, 0, resp_def); |
823 | proto_add_oper(p, CONSOLE_SET_RGB_COLOR, o); |
835 | proto_add_oper(p, CONSOLE_SET_RGB_COLOR, o); |
824 | o = oper_new("cursor_visibility", 1, arg_def, V_VOID, 0, resp_def); |
836 | o = oper_new("cursor_visibility", 1, arg_def, V_VOID, 0, resp_def); |
825 | proto_add_oper(p, CONSOLE_CURSOR_VISIBILITY, o); |
837 | proto_add_oper(p, CONSOLE_CURSOR_VISIBILITY, o); |
826 | 838 | ||
827 | proto_console = p; |
839 | proto_console = p; |
828 | proto_register(SERVICE_CONSOLE, p); |
840 | proto_register(SERVICE_CONSOLE, p); |
829 | } |
841 | } |
830 | 842 | ||
831 | static void print_syntax() |
843 | static void print_syntax() |
832 | { |
844 | { |
833 | printf("Syntax:\n"); |
845 | printf("Syntax:\n"); |
834 | printf("\ttrace [+<events>] <executable> [<arg1> [...]]\n"); |
846 | printf("\ttrace [+<events>] <executable> [<arg1> [...]]\n"); |
835 | printf("or\ttrace [+<events>] -t <task_id>\n"); |
847 | printf("or\ttrace [+<events>] -t <task_id>\n"); |
836 | printf("Events: (default is +tp)\n"); |
848 | printf("Events: (default is +tp)\n"); |
837 | printf("\n"); |
849 | printf("\n"); |
838 | printf("\tt ... Thread creation and termination\n"); |
850 | printf("\tt ... Thread creation and termination\n"); |
839 | printf("\ts ... System calls\n"); |
851 | printf("\ts ... System calls\n"); |
840 | printf("\ti ... Low-level IPC\n"); |
852 | printf("\ti ... Low-level IPC\n"); |
841 | printf("\tp ... Protocol level\n"); |
853 | printf("\tp ... Protocol level\n"); |
842 | printf("\n"); |
854 | printf("\n"); |
843 | printf("Examples:\n"); |
855 | printf("Examples:\n"); |
844 | printf("\ttrace +s /app/tetris\n"); |
856 | printf("\ttrace +s /app/tetris\n"); |
845 | printf("\ttrace +tsip -t 12\n"); |
857 | printf("\ttrace +tsip -t 12\n"); |
846 | } |
858 | } |
847 | 859 | ||
848 | static display_mask_t parse_display_mask(char *text) |
860 | static display_mask_t parse_display_mask(char *text) |
849 | { |
861 | { |
850 | display_mask_t dm; |
862 | display_mask_t dm; |
851 | char *c; |
863 | char *c; |
852 | 864 | ||
853 | c = text; |
865 | c = text; |
854 | 866 | ||
855 | while (*c) { |
867 | while (*c) { |
856 | switch (*c) { |
868 | switch (*c) { |
857 | case 't': dm = dm | DM_THREAD; break; |
869 | case 't': dm = dm | DM_THREAD; break; |
858 | case 's': dm = dm | DM_SYSCALL; break; |
870 | case 's': dm = dm | DM_SYSCALL; break; |
859 | case 'i': dm = dm | DM_IPC; break; |
871 | case 'i': dm = dm | DM_IPC; break; |
860 | case 'p': dm = dm | DM_SYSTEM | DM_USER; break; |
872 | case 'p': dm = dm | DM_SYSTEM | DM_USER; break; |
861 | default: |
873 | default: |
862 | printf("Unexpected event type '%c'.\n", *c); |
874 | printf("Unexpected event type '%c'.\n", *c); |
863 | exit(1); |
875 | exit(1); |
864 | } |
876 | } |
865 | 877 | ||
866 | ++c; |
878 | ++c; |
867 | } |
879 | } |
868 | 880 | ||
869 | return dm; |
881 | return dm; |
870 | } |
882 | } |
871 | 883 | ||
872 | static int parse_args(int argc, char *argv[]) |
884 | static int parse_args(int argc, char *argv[]) |
873 | { |
885 | { |
874 | char *arg; |
886 | char *arg; |
875 | char *err_p; |
887 | char *err_p; |
876 | 888 | ||
877 | task_id = 0; |
889 | task_id = 0; |
878 | 890 | ||
879 | --argc; ++argv; |
891 | --argc; ++argv; |
880 | 892 | ||
881 | while (argc > 0) { |
893 | while (argc > 0) { |
882 | arg = *argv; |
894 | arg = *argv; |
883 | if (arg[0] == '+') { |
895 | if (arg[0] == '+') { |
884 | display_mask = parse_display_mask(&arg[1]); |
896 | display_mask = parse_display_mask(&arg[1]); |
885 | } else if (arg[0] == '-') { |
897 | } else if (arg[0] == '-') { |
886 | if (arg[1] == 't') { |
898 | if (arg[1] == 't') { |
887 | /* Trace an already running task */ |
899 | /* Trace an already running task */ |
888 | --argc; ++argv; |
900 | --argc; ++argv; |
889 | task_id = strtol(*argv, &err_p, 10); |
901 | task_id = strtol(*argv, &err_p, 10); |
890 | task_ldr = NULL; |
902 | task_ldr = NULL; |
891 | task_wait_for = false; |
903 | task_wait_for = false; |
892 | if (*err_p) { |
904 | if (*err_p) { |
893 | printf("Task ID syntax error\n"); |
905 | printf("Task ID syntax error\n"); |
894 | print_syntax(); |
906 | print_syntax(); |
895 | return -1; |
907 | return -1; |
896 | } |
908 | } |
897 | } else { |
909 | } else { |
898 | printf("Uknown option '%s'\n", arg[0]); |
910 | printf("Uknown option '%s'\n", arg[0]); |
899 | print_syntax(); |
911 | print_syntax(); |
900 | return -1; |
912 | return -1; |
901 | } |
913 | } |
902 | } else { |
914 | } else { |
903 | break; |
915 | break; |
904 | } |
916 | } |
905 | 917 | ||
906 | --argc; ++argv; |
918 | --argc; ++argv; |
907 | } |
919 | } |
908 | 920 | ||
909 | if (task_id != 0) { |
921 | if (task_id != 0) { |
910 | if (argc == 0) return 0; |
922 | if (argc == 0) return 0; |
911 | printf("Extra arguments\n"); |
923 | printf("Extra arguments\n"); |
912 | print_syntax(); |
924 | print_syntax(); |
913 | return -1; |
925 | return -1; |
914 | } |
926 | } |
915 | 927 | ||
916 | if (argc < 1) { |
928 | if (argc < 1) { |
917 | printf("Missing argument\n"); |
929 | printf("Missing argument\n"); |
918 | print_syntax(); |
930 | print_syntax(); |
919 | return -1; |
931 | return -1; |
920 | } |
932 | } |
921 | 933 | ||
922 | /* Preload the specified program file. */ |
934 | /* Preload the specified program file. */ |
923 | printf("Spawning '%s' with arguments:\n", *argv); |
935 | printf("Spawning '%s' with arguments:\n", *argv); |
924 | { |
936 | { |
925 | char **cp = argv; |
937 | char **cp = argv; |
926 | while (*cp) printf("'%s'\n", *cp++); |
938 | while (*cp) printf("'%s'\n", *cp++); |
927 | } |
939 | } |
928 | task_ldr = preload_task(*argv, argv, &task_id); |
940 | task_ldr = preload_task(*argv, argv, &task_id); |
929 | task_wait_for = true; |
941 | task_wait_for = true; |
930 | 942 | ||
931 | return 0; |
943 | return 0; |
932 | } |
944 | } |
933 | 945 | ||
934 | int main(int argc, char *argv[]) |
946 | int main(int argc, char *argv[]) |
935 | { |
947 | { |
936 | int rc; |
948 | int rc; |
937 | task_exit_t texit; |
949 | task_exit_t texit; |
938 | int retval; |
950 | int retval; |
939 | 951 | ||
940 | printf("System Call / IPC Tracer\n"); |
952 | printf("System Call / IPC Tracer\n"); |
941 | printf("Controls: Q - Quit, P - Pause, R - Resume\n"); |
953 | printf("Controls: Q - Quit, P - Pause, R - Resume\n"); |
942 | 954 | ||
943 | display_mask = DM_THREAD | DM_SYSTEM | DM_USER; |
955 | display_mask = DM_THREAD | DM_SYSTEM | DM_USER; |
944 | 956 | ||
945 | if (parse_args(argc, argv) < 0) |
957 | if (parse_args(argc, argv) < 0) |
946 | return 1; |
958 | return 1; |
947 | 959 | ||
948 | main_init(); |
960 | main_init(); |
949 | 961 | ||
950 | rc = connect_task(task_id); |
962 | rc = connect_task(task_id); |
951 | if (rc < 0) { |
963 | if (rc < 0) { |
952 | printf("Failed connecting to task %lld.\n", task_id); |
964 | printf("Failed connecting to task %lld.\n", task_id); |
953 | return 1; |
965 | return 1; |
954 | } |
966 | } |
955 | 967 | ||
956 | printf("Connected to task %lld.\n", task_id); |
968 | printf("Connected to task %lld.\n", task_id); |
957 | 969 | ||
958 | if (task_ldr != NULL) |
970 | if (task_ldr != NULL) |
959 | program_run(); |
971 | program_run(); |
960 | 972 | ||
961 | cev_fibril_start(); |
973 | cev_fibril_start(); |
962 | trace_task(task_id); |
974 | trace_task(task_id); |
963 | 975 | ||
964 | if (task_wait_for) { |
976 | if (task_wait_for) { |
965 | printf("Waiting for task to exit.\n"); |
977 | printf("Waiting for task to exit.\n"); |
966 | 978 | ||
967 | rc = task_wait(task_id, &texit, &retval); |
979 | rc = task_wait(task_id, &texit, &retval); |
968 | if (rc != EOK) { |
980 | if (rc != EOK) { |
969 | printf("Failed waiting for task.\n"); |
981 | printf("Failed waiting for task.\n"); |
970 | return -1; |
982 | return -1; |
971 | } |
983 | } |
972 | 984 | ||
973 | if (texit == TASK_EXIT_NORMAL) { |
985 | if (texit == TASK_EXIT_NORMAL) { |
974 | printf("Task exited normally, return value %d.\n", |
986 | printf("Task exited normally, return value %d.\n", |
975 | retval); |
987 | retval); |
976 | } else { |
988 | } else { |
977 | printf("Task exited unexpectedly.\n"); |
989 | printf("Task exited unexpectedly.\n"); |
978 | } |
990 | } |
979 | } |
991 | } |
980 | 992 | ||
981 | return 0; |
993 | return 0; |
982 | } |
994 | } |
983 | 995 | ||
984 | /** @} |
996 | /** @} |
985 | */ |
997 | */ |
986 | 998 |