Changes in uspace/app/trace/ipcp.c [1569a9b:7354b5e] in mainline

File:

• uspace/app/trace/ipcp.c (modified) (9 diffs)

uspace/app/trace/ipcp.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <str_error.h>
 #include <inttypes.h>
 #include <adt/hash_table.h>
@@ -45 +44 @@
 #include "ipcp.h"
 
+#define IPCP_CALLID_SYNC 0
+
 typedef struct {
         sysarg_t phone_hash;
@@ -144 +145 @@
                 V_INTEGER,
                 V_INTEGER,
-                V_INTEGER
+                V_INTEGER               
         };
 
@@ -188 +189 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Call ID: %d, phone: %d, proto: %s, method: ",
-                    hash, phone,
+                printf("Call ID: %p, phone: %d, proto: %s, method: ",
+                    (void *) hash, phone,
                     (proto ? proto->name : "n/a"));
                 ipc_m_print(proto, IPC_GET_IMETHOD(*call));
@@ -250 +251 @@
         sysarg_t method;
         sysarg_t service;
-        int retval;
+        sysarg_t retval;
         proto_t *proto;
         int cphone;
@@ -265 +266 @@
         
         if ((display_mask & DM_IPC) != 0) {
-                printf("Response to %d: retval=%s, args = (%" PRIun ", "
+                printf("Response to %p: retval=%" PRIdn ", args = (%" PRIun ", "
                     "%" PRIun ", %" PRIun ", %" PRIun ", %" PRIun ")\n",
-                    hash, str_error_name(retval), IPC_GET_ARG1(*answer),
+                    (void *) hash, retval, IPC_GET_ARG1(*answer),
                     IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
                     IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
@@ -281 +282 @@
                         if (oper->rv_type != V_VOID) {
                                 putchar(' ');
-                                val_print((sysarg_t) retval, oper->rv_type);
+                                val_print(retval, oper->rv_type);
                         }
                         
@@ -322 +323 @@
         pending_call_t *pcall;
         
-        if ((call->flags & IPC_CALL_ANSWERED) == 0) {
+        if ((hash & IPC_CALLID_ANSWERED) == 0 && hash != IPCP_CALLID_SYNC) {
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash %d)\n", hash);
+                        printf("Not a response (hash %p)\n", (void *) hash);
                 }
                 return;
         }
+        
+        hash = hash & ~IPC_CALLID_ANSWERED;
         
         item = hash_table_find(&pending_calls, &hash);
@@ -345 +348 @@
 }
 
+void ipcp_call_sync(int phone, ipc_call_t *call, ipc_call_t *answer)
+{
+        ipcp_call_out(phone, call, IPCP_CALLID_SYNC);
+        ipcp_call_in(answer, IPCP_CALLID_SYNC);
+}
+
 void ipcp_hangup(int phone, int rc)
 {
         if ((display_mask & DM_SYSTEM) != 0) {
-                printf("Hang phone %d up -> %s\n", phone, str_error_name(rc));
+                printf("Hang phone %d up -> %d\n", phone, rc);
                 ipcp_connection_clear(phone);
         }