Changes in uspace/app/trace/trace.c [28a3e74:19f857a] in mainline

File:

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

uspace/app/trace/trace.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <ipc/ipc.h>
 #include <fibril.h>
 #include <errno.h>
@@ -53 +54 @@
 #include <libc.h>
 
-/* Temporary: service and method names */
+// Temporary: service and method names
 #include "proto.h"
 #include <ipc/services.h>
@@ -148 +149 @@
         int rc;
 
-        rc = async_connect_kbox(task_id);
+        rc = ipc_connect_kbox(task_id);
 
         if (rc == ENOTSUP) {
@@ -160 +161 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -199 +200 @@
         printf("Threads:");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] (hash %p)", 1 + i, (void *) thread_hash_buf[i]);
-        }
-        printf("\ntotal of %zu threads\n", tb_needed / sizeof(uintptr_t));
+                printf(" [%d] (hash %p)", 1+i, thread_hash_buf[i]);
+        }
+        printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t));
 
         return 0;
@@ -223 +224 @@
         case V_HASH:
         case V_PTR:
-                printf("%p", (void *) val);
+                printf("%p", val);
                 break;
 
@@ -247 +248 @@
         case V_CHAR:
                 if (sval >= 0x20 && sval < 0x7f) {
-                        printf("'%c'", (char) sval);
+                        printf("'%c'", sval);
                 } else {
                         switch (sval) {
@@ -256 +257 @@
                         case '\t': printf("'\\t'"); break;
                         case '\\': printf("'\\\\'"); break;
-                        default: printf("'\\x%02" PRIxn "'", val); break;
+                        default: printf("'\\x%02lX'", val); break;
                         }
                 }
@@ -276 +277 @@
 
         putchar('(');
-        if (n > 0) printf("%" PRIun, sc_args[0]);
+        if (n > 0) printf("%" PRIdSYSARG, sc_args[0]);
         for (i = 1; i < n; i++) {
-                printf(", %" PRIun, sc_args[i]);
+                printf(", %" PRIdSYSARG, sc_args[i]);
         }
         putchar(')');
@@ -286 +287 @@
 {
         ipc_call_t call;
-        sysarg_t phoneid;
+        ipcarg_t phoneid;
         
         if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
@@ -294 +295 @@
         phoneid = sc_args[0];
 
-        IPC_SET_IMETHOD(call, sc_args[1]);
+        IPC_SET_METHOD(call, sc_args[1]);
         IPC_SET_ARG1(call, sc_args[2]);
         IPC_SET_ARG2(call, sc_args[3]);
@@ -330 +331 @@
         phoneidx = sc_args[0];
 
-        IPC_SET_IMETHOD(question, sc_args[1]);
+        IPC_SET_METHOD(question, sc_args[1]);
         IPC_SET_ARG1(question, sc_args[2]);
         IPC_SET_ARG2(question, sc_args[3]);
@@ -488 +489 @@
 {
         async_serialize_start();
-        printf("New thread, hash %p\n", (void *) hash);
+        printf("New thread, hash 0x%lx\n", hash);
         async_serialize_end();
 
@@ -509 +510 @@
         }
 
-        printf("Start tracing thread [%u] (hash %p).\n",
-            thread_id, (void *) thread_hash);
+        printf("Start tracing thread [%d] (hash %p).\n", thread_id, thread_hash);
 
         while (!abort_trace) {
@@ -516 +516 @@
                 fibril_mutex_lock(&state_lock);
                 if (paused) {
-                        printf("Thread [%u] paused. Press R to resume.\n",
+                        printf("Thread [%d] paused. Press R to resume.\n",
                             thread_id);
 
@@ -522 +522 @@
                                 fibril_condvar_wait(&state_cv, &state_lock);
 
-                        printf("Thread [%u] resumed.\n", thread_id);
+                        printf("Thread [%d] resumed.\n", thread_id);
                 }
                 fibril_mutex_unlock(&state_lock);
@@ -554 +554 @@
                                 break;
                         case UDEBUG_EVENT_THREAD_E:
-                                printf("Thread %" PRIun " exited.\n", val0);
+                                printf("Thread %p exited.\n", val0);
                                 fibril_mutex_lock(&state_lock);
                                 abort_trace = true;
@@ -744 +744 @@
         abort_trace = true;
         udebug_end(phoneid);
-        async_hangup(phoneid);
+        ipc_hangup(phoneid);
 
         ipcp_cleanup();
@@ -872 +872 @@
 static display_mask_t parse_display_mask(const char *text)
 {
-        display_mask_t dm = 0;
+        display_mask_t dm;
         const char *c = text;
         
@@ -927 +927 @@
                                 }
                         } else {
-                                printf("Uknown option '%c'\n", arg[0]);
+                                printf("Uknown option '%s'\n", arg[0]);
                                 print_syntax();
                                 return -1;
@@ -984 +984 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %" PRIu64 ".\n", task_id);
+                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
                 return 1;
         }
 
-        printf("Connected to task %" PRIu64 ".\n", task_id);
+        printf("Connected to task %" PRIdTASKID ".\n", task_id);
 
         if (task_ldr != NULL)