Changes in uspace/app/trace/trace.c [9af1c61:a53ed3a] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/trace/trace.c
r9af1c61 ra53ed3a 63 63 #include "syscalls.h" 64 64 #include "ipcp.h" 65 #include "errors.h"66 65 #include "trace.h" 67 66 … … 94 93 display_mask_t display_mask; 95 94 96 static int program_run_fibril(void *arg);97 static int cev_fibril(void *arg);95 static errno_t program_run_fibril(void *arg); 96 static errno_t cev_fibril(void *arg); 98 97 99 98 static void program_run(void) … … 123 122 } 124 123 125 static int program_run_fibril(void *arg)126 { 127 int rc;124 static errno_t program_run_fibril(void *arg) 125 { 126 errno_t rc; 128 127 129 128 /* … … 132 131 */ 133 132 rc = loader_run(task_ldr); 134 if (rc != 0) {133 if (rc != EOK) { 135 134 printf("Error running program\n"); 136 135 exit(1); … … 144 143 145 144 146 static int connect_task(task_id_t task_id)145 static errno_t connect_task(task_id_t task_id) 147 146 { 148 147 async_sess_t *ksess = async_connect_kbox(task_id); … … 162 161 } 163 162 164 int rc = udebug_begin(ksess);165 if (rc < 0) {166 printf("udebug_begin() -> % d\n", rc);163 errno_t rc = udebug_begin(ksess); 164 if (rc != EOK) { 165 printf("udebug_begin() -> %s\n", str_error_name(rc)); 167 166 return rc; 168 167 } 169 168 170 169 rc = udebug_set_evmask(ksess, UDEBUG_EM_ALL); 171 if (rc < 0) {172 printf("udebug_set_evmask(0x%x) -> % d\n ", UDEBUG_EM_ALL, rc);170 if (rc != EOK) { 171 printf("udebug_set_evmask(0x%x) -> %s\n ", UDEBUG_EM_ALL, str_error_name(rc)); 173 172 return rc; 174 173 } … … 178 177 } 179 178 180 static int get_thread_list(void)181 { 182 int rc;179 static errno_t get_thread_list(void) 180 { 181 errno_t rc; 183 182 size_t tb_copied; 184 183 size_t tb_needed; … … 187 186 rc = udebug_thread_read(sess, thread_hash_buf, 188 187 THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed); 189 if (rc < 0) {190 printf("udebug_thread_read() -> % d\n", rc);188 if (rc != EOK) { 189 printf("udebug_thread_read() -> %s\n", str_error_name(rc)); 191 190 return rc; 192 191 } … … 226 225 if (sval >= -15 && sval <= 0) { 227 226 printf("%ld %s (%s)", sval, 228 err_desc[-sval].name,229 err_desc[-sval].desc);227 str_error_name((errno_t) sval), 228 str_error((errno_t) sval)); 230 229 } else { 231 230 printf("%ld", sval); … … 235 234 if (sval >= -15 && sval < 0) { 236 235 printf("%ld %s (%s)", sval, 237 err_desc[-sval].name,238 err_desc[-sval].desc);236 str_error_name((errno_t) sval), 237 str_error((errno_t) sval)); 239 238 } else { 240 239 printf("%ld", sval); … … 280 279 } 281 280 282 static void sc_ipc_call_async_fast(sysarg_t *sc_args, sysarg_t sc_rc)281 static void sc_ipc_call_async_fast(sysarg_t *sc_args, errno_t sc_rc) 283 282 { 284 283 ipc_call_t call; 285 284 sysarg_t phoneid; 286 285 287 if (sc_rc != (sysarg_t)EOK)286 if (sc_rc != EOK) 288 287 return; 289 288 … … 297 296 IPC_SET_ARG5(call, 0); 298 297 299 ipcp_call_out(phoneid, &call, sc_rc);300 } 301 302 static void sc_ipc_call_async_slow(sysarg_t *sc_args, sysarg_t sc_rc)298 ipcp_call_out(phoneid, &call, 0); 299 } 300 301 static void sc_ipc_call_async_slow(sysarg_t *sc_args, errno_t sc_rc) 303 302 { 304 303 ipc_call_t call; 305 int rc;306 307 if (sc_rc != (sysarg_t)EOK)304 errno_t rc; 305 306 if (sc_rc != EOK) 308 307 return; 309 308 … … 311 310 rc = udebug_mem_read(sess, &call.args, sc_args[1], sizeof(call.args)); 312 311 313 if (rc >= 0) {314 ipcp_call_out(sc_args[0], &call, sc_rc);312 if (rc == EOK) { 313 ipcp_call_out(sc_args[0], &call, 0); 315 314 } 316 315 } … … 319 318 { 320 319 ipc_call_t call; 321 int rc;320 errno_t rc; 322 321 323 322 if (sc_rc == 0) return; … … 326 325 rc = udebug_mem_read(sess, &call, sc_args[0], sizeof(call)); 327 326 328 if (rc >= 0)327 if (rc == EOK) 329 328 ipcp_call_in(&call, sc_rc); 330 329 } … … 334 333 { 335 334 sysarg_t sc_args[6]; 336 int rc;335 errno_t rc; 337 336 338 337 /* Read syscall arguments */ 339 338 rc = udebug_args_read(sess, thread_hash, sc_args); 340 339 341 if (rc < 0) {340 if (rc != EOK) { 342 341 printf("error\n"); 343 342 return; … … 362 361 sysarg_t sc_args[6]; 363 362 int rv_type; 364 int rc;363 errno_t rc; 365 364 366 365 /* Read syscall arguments */ … … 369 368 // printf("[%d] ", thread_id); 370 369 371 if (rc < 0) {370 if (rc != EOK) { 372 371 printf("error\n"); 373 372 return; … … 385 384 switch (sc_id) { 386 385 case SYS_IPC_CALL_ASYNC_FAST: 387 sc_ipc_call_async_fast(sc_args, sc_rc);386 sc_ipc_call_async_fast(sc_args, (errno_t) sc_rc); 388 387 break; 389 388 case SYS_IPC_CALL_ASYNC_SLOW: 390 sc_ipc_call_async_slow(sc_args, sc_rc);389 sc_ipc_call_async_slow(sc_args, (errno_t) sc_rc); 391 390 break; 392 391 case SYS_IPC_WAIT: … … 404 403 } 405 404 406 static int trace_loop(void *thread_hash_arg)407 { 408 int rc;405 static errno_t trace_loop(void *thread_hash_arg) 406 { 407 errno_t rc; 409 408 unsigned ev_type; 410 409 uintptr_t thread_hash; … … 446 445 } 447 446 448 if (rc >= 0) {447 if (rc == EOK) { 449 448 switch (ev_type) { 450 449 case UDEBUG_EVENT_SYSCALL_B: … … 499 498 { 500 499 loader_t *ldr; 501 int rc;500 errno_t rc; 502 501 503 502 /* Spawn a program loader */ … … 567 566 } 568 567 569 static int cev_fibril(void *arg)568 static errno_t cev_fibril(void *arg) 570 569 { 571 570 cons_event_t event; … … 582 581 583 582 if (!console_get_event(console, &event)) 584 return -1;583 return EINVAL; 585 584 586 585 if (event.type == CEV_KEY) { … … 599 598 bool done; 600 599 int i; 601 int rc;600 errno_t rc; 602 601 603 602 ipcp_init(); 604 603 605 604 rc = get_thread_list(); 606 if (rc < 0) {607 printf("Failed to get thread list ( error %d)\n", rc);605 if (rc != EOK) { 606 printf("Failed to get thread list (%s)\n", str_error(rc)); 608 607 return; 609 608 } … … 644 643 rc = udebug_stop(sess, thash); 645 644 if (rc != EOK) 646 printf("Error: stop -> % d\n", rc);645 printf("Error: stop -> %s\n", str_error_name(rc)); 647 646 break; 648 647 case KC_R: … … 845 844 int main(int argc, char *argv[]) 846 845 { 847 int rc;846 errno_t rc; 848 847 task_exit_t texit; 849 848 int retval; … … 860 859 861 860 rc = connect_task(task_id); 862 if (rc < 0) {861 if (rc != EOK) { 863 862 printf("Failed connecting to task %" PRIu64 ".\n", task_id); 864 863 return 1;
Note:
See TracChangeset
for help on using the changeset viewer.