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