Changes in uspace/app/trace/trace.c [a53ed3a:9af1c61] in mainline

File:

• uspace/app/trace/trace.c (modified) (28 diffs)

uspace/app/trace/trace.c

@@ -63 +63 @@
 #include "syscalls.h"
 #include "ipcp.h"
+#include "errors.h"
 #include "trace.h"
 
@@ -93 +94 @@
 display_mask_t display_mask;
 
-static errno_t program_run_fibril(void *arg);
-static errno_t cev_fibril(void *arg);
+static int program_run_fibril(void *arg);
+static int cev_fibril(void *arg);
 
 static void program_run(void)
@@ -122 +123 @@
 }
 
-static errno_t program_run_fibril(void *arg)
-{
-        errno_t rc;
+static int program_run_fibril(void *arg)
+{
+        int rc;
 
         /*
@@ -131 +132 @@
          */
         rc = loader_run(task_ldr);
-        if (rc != EOK) {
+        if (rc != 0) {
                 printf("Error running program\n");
                 exit(1);
@@ -143 +144 @@
 
 
-static errno_t connect_task(task_id_t task_id)
+static int connect_task(task_id_t task_id)
 {
         async_sess_t *ksess = async_connect_kbox(task_id);
@@ -161 +162 @@
         }
         
-        errno_t rc = udebug_begin(ksess);
-        if (rc != EOK) {
-                printf("udebug_begin() -> %s\n", str_error_name(rc));
+        int rc = udebug_begin(ksess);
+        if (rc < 0) {
+                printf("udebug_begin() -> %d\n", rc);
                 return rc;
         }
         
         rc = udebug_set_evmask(ksess, UDEBUG_EM_ALL);
-        if (rc != EOK) {
-                printf("udebug_set_evmask(0x%x) -> %s\n ", UDEBUG_EM_ALL, str_error_name(rc));
+        if (rc < 0) {
+                printf("udebug_set_evmask(0x%x) -> %d\n ", UDEBUG_EM_ALL, rc);
                 return rc;
         }
@@ -177 +178 @@
 }
 
-static errno_t get_thread_list(void)
-{
-        errno_t rc;
+static int get_thread_list(void)
+{
+        int rc;
         size_t tb_copied;
         size_t tb_needed;
@@ -186 +187 @@
         rc = udebug_thread_read(sess, thread_hash_buf,
                 THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed);
-        if (rc != EOK) {
-                printf("udebug_thread_read() -> %s\n", str_error_name(rc));
+        if (rc < 0) {
+                printf("udebug_thread_read() -> %d\n", rc);
                 return rc;
         }
@@ -225 +226 @@
                 if (sval >= -15 && sval <= 0) {
                         printf("%ld %s (%s)", sval,
-                            str_error_name((errno_t) sval),
-                            str_error((errno_t) sval));
+                            err_desc[-sval].name,
+                            err_desc[-sval].desc);
                 } else {
                         printf("%ld", sval);
@@ -234 +235 @@
                 if (sval >= -15 && sval < 0) {
                         printf("%ld %s (%s)", sval,
-                            str_error_name((errno_t) sval),
-                            str_error((errno_t) sval));
+                            err_desc[-sval].name,
+                            err_desc[-sval].desc);
                 } else {
                         printf("%ld", sval);
@@ -279 +280 @@
 }
 
-static void sc_ipc_call_async_fast(sysarg_t *sc_args, errno_t sc_rc)
+static void sc_ipc_call_async_fast(sysarg_t *sc_args, sysarg_t sc_rc)
 {
         ipc_call_t call;
         sysarg_t phoneid;
         
-        if (sc_rc != EOK)
+        if (sc_rc != (sysarg_t) EOK)
                 return;
 
@@ -296 +297 @@
         IPC_SET_ARG5(call, 0);
 
-        ipcp_call_out(phoneid, &call, 0);
-}
-
-static void sc_ipc_call_async_slow(sysarg_t *sc_args, errno_t sc_rc)
+        ipcp_call_out(phoneid, &call, sc_rc);
+}
+
+static void sc_ipc_call_async_slow(sysarg_t *sc_args, sysarg_t sc_rc)
 {
         ipc_call_t call;
-        errno_t rc;
-
-        if (sc_rc != EOK)
+        int rc;
+
+        if (sc_rc != (sysarg_t) EOK)
                 return;
 
@@ -310 +311 @@
         rc = udebug_mem_read(sess, &call.args, sc_args[1], sizeof(call.args));
 
-        if (rc == EOK) {
-                ipcp_call_out(sc_args[0], &call, 0);
+        if (rc >= 0) {
+                ipcp_call_out(sc_args[0], &call, sc_rc);
         }
 }
@@ -318 +319 @@
 {
         ipc_call_t call;
-        errno_t rc;
+        int rc;
 
         if (sc_rc == 0) return;
@@ -325 +326 @@
         rc = udebug_mem_read(sess, &call, sc_args[0], sizeof(call));
         
-        if (rc == EOK)
+        if (rc >= 0)
                 ipcp_call_in(&call, sc_rc);
 }
@@ -333 +334 @@
 {
         sysarg_t sc_args[6];
-        errno_t rc;
+        int rc;
 
         /* Read syscall arguments */
         rc = udebug_args_read(sess, thread_hash, sc_args);
 
-        if (rc != EOK) {
+        if (rc < 0) {
                 printf("error\n");
                 return;
@@ -361 +362 @@
         sysarg_t sc_args[6];
         int rv_type;
-        errno_t rc;
+        int rc;
 
         /* Read syscall arguments */
@@ -368 +369 @@
 //      printf("[%d] ", thread_id);
 
-        if (rc != EOK) {
+        if (rc < 0) {
                 printf("error\n");
                 return;
@@ -384 +385 @@
         switch (sc_id) {
         case SYS_IPC_CALL_ASYNC_FAST:
-                sc_ipc_call_async_fast(sc_args, (errno_t) sc_rc);
+                sc_ipc_call_async_fast(sc_args, sc_rc);
                 break;
         case SYS_IPC_CALL_ASYNC_SLOW:
-                sc_ipc_call_async_slow(sc_args, (errno_t) sc_rc);
+                sc_ipc_call_async_slow(sc_args, sc_rc);
                 break;
         case SYS_IPC_WAIT:
@@ -403 +404 @@
 }
 
-static errno_t trace_loop(void *thread_hash_arg)
-{
-        errno_t rc;
+static int trace_loop(void *thread_hash_arg)
+{
+        int rc;
         unsigned ev_type;
         uintptr_t thread_hash;
@@ -445 +446 @@
                 }
 
-                if (rc == EOK) {
+                if (rc >= 0) {
                         switch (ev_type) {
                         case UDEBUG_EVENT_SYSCALL_B:
@@ -498 +499 @@
 {
         loader_t *ldr;
-        errno_t rc;
+        int rc;
 
         /* Spawn a program loader */
@@ -566 +567 @@
 }
 
-static errno_t cev_fibril(void *arg)
+static int cev_fibril(void *arg)
 {
         cons_event_t event;
@@ -581 +582 @@
                 
                 if (!console_get_event(console, &event))
-                        return EINVAL;
+                        return -1;
                 
                 if (event.type == CEV_KEY) {
@@ -598 +599 @@
         bool done;
         int i;
-        errno_t rc;
+        int rc;
 
         ipcp_init();
 
         rc = get_thread_list();
-        if (rc != EOK) {
-                printf("Failed to get thread list (%s)\n", str_error(rc));
+        if (rc < 0) {
+                printf("Failed to get thread list (error %d)\n", rc);
                 return;
         }
@@ -643 +644 @@
                         rc = udebug_stop(sess, thash);
                         if (rc != EOK)
-                                printf("Error: stop -> %s\n", str_error_name(rc));
+                                printf("Error: stop -> %d\n", rc);
                         break;
                 case KC_R:
@@ -844 +845 @@
 int main(int argc, char *argv[])
 {
-        errno_t rc;
+        int rc;
         task_exit_t texit;
         int retval;
@@ -859 +860 @@
 
         rc = connect_task(task_id);
-        if (rc != EOK) {
+        if (rc < 0) {
                 printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;