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