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