Changes in uspace/app/trace/trace.c [1569a9b:706b4de] in mainline

File:

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

uspace/app/trace/trace.c

@@ -38 +38 @@
 #include <stdint.h>
 #include <stddef.h>
-#include <str_error.h>
 #include <inttypes.h>
 #include <fibril.h>
@@ -63 +62 @@
 #include "syscalls.h"
 #include "ipcp.h"
+#include "errors.h"
 #include "trace.h"
 
@@ -157 +157 @@
                 
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIu64 ") -> %s ", task_id, str_error_name(errno));
+                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, errno);
                 return errno;
         }
         
         int rc = udebug_begin(ksess);
-        if (rc != EOK) {
-                printf("udebug_begin() -> %s\n", str_error_name(rc));
+        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;
         }
@@ -186 +186 @@
         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 +225 @@
                 if (sval >= -15 && sval <= 0) {
                         printf("%ld %s (%s)", sval,
-                            str_error_name((int) sval),
-                            str_error((int) sval));
+                            err_desc[-sval].name,
+                            err_desc[-sval].desc);
                 } else {
                         printf("%ld", sval);
@@ -234 +234 @@
                 if (sval >= -15 && sval < 0) {
                         printf("%ld %s (%s)", sval,
-                            str_error_name((int) sval),
-                            str_error((int) sval));
+                            err_desc[-sval].name,
+                            err_desc[-sval].desc);
                 } else {
                         printf("%ld", sval);
@@ -279 +279 @@
 }
 
-static void sc_ipc_call_async_fast(sysarg_t *sc_args, int 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) IPC_CALLRET_FATAL)
                 return;
 
@@ -296 +296 @@
         IPC_SET_ARG5(call, 0);
 
-        ipcp_call_out(phoneid, &call, 0);
-}
-
-static void sc_ipc_call_async_slow(sysarg_t *sc_args, int 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;
         int rc;
 
-        if (sc_rc != EOK)
+        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL)
                 return;
 
@@ -310 +310 @@
         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);
         }
 }
@@ -325 +325 @@
         rc = udebug_mem_read(sess, &call, sc_args[0], sizeof(call));
         
-        if (rc == EOK)
+        if (rc >= 0)
                 ipcp_call_in(&call, sc_rc);
 }
@@ -338 +338 @@
         rc = udebug_args_read(sess, thread_hash, sc_args);
 
-        if (rc != EOK) {
+        if (rc < 0) {
                 printf("error\n");
                 return;
@@ -368 +368 @@
 //      printf("[%d] ", thread_id);
 
-        if (rc != EOK) {
+        if (rc < 0) {
                 printf("error\n");
                 return;
@@ -445 +445 @@
                 }
 
-                if (rc == EOK) {
+                if (rc >= 0) {
                         switch (ev_type) {
                         case UDEBUG_EVENT_SYSCALL_B:
@@ -581 +581 @@
                 
                 if (!console_get_event(console, &event))
-                        return EINVAL;
+                        return -1;
                 
                 if (event.type == CEV_KEY) {
@@ -603 +603 @@
 
         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 +643 @@
                         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:
@@ -859 +859 @@
 
         rc = connect_task(task_id);
-        if (rc != EOK) {
+        if (rc < 0) {
                 printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;