Changeset a5c3f73 in mainline for uspace/app/trace/ipcp.c

Timestamp:

2008-09-19T11:30:04Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

356acd0

Parents:

f7176b1

Message:

trace: 64-bit-related fixes

File:

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

uspace/app/trace/ipcp.c

@@ -45 +45 @@
 
 typedef struct {
-        int phone_hash;
+        ipcarg_t phone_hash;
         ipc_call_t question;
         oper_t *oper;
 
-        int call_hash;
+        ipc_callid_t call_hash;
 
         link_t link;
@@ -98 +98 @@
         hs = hash_table_get_instance(item, pending_call_t, link);
 
+        // FIXME: this will fail if sizeof(long) < sizeof(void *).
         return key[0] == hs->call_hash;
 }
@@ -135 +136 @@
 
         if (oper != NULL) {
-                printf("%s (%d)", oper->name, method);
+                printf("%s (%ld)", oper->name, method);
                 return;
         }
 
-        printf("%d", method);
+        printf("%ld", method);
 }
 
@@ -199 +200 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Call ID: 0x%x, phone: %d, proto: %s, method: ", hash,
+                printf("Call ID: 0x%lx, phone: %d, proto: %s, method: ", hash,
                         phone, (proto ? proto->name : "n/a"));
                 ipc_m_print(proto, IPC_GET_METHOD(*call));
-                printf(" args: (%u, %u, %u, %u, %u)\n", args[1], args[2],
+                printf(" args: (%lu, %lu, %lu, %lu, %lu)\n", args[1], args[2],
                     args[3], args[4], args[5]);
         }
@@ -258 +259 @@
     ipc_call_t *answer)
 {
-        int phone;
+        ipcarg_t phone;
         ipcarg_t method;
         ipcarg_t service;
-        int retval;
+        ipcarg_t retval;
         proto_t *proto;
         int cphone;
@@ -278 +279 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Response to 0x%x: retval=%d, args = (%u, %u, %u, %u, %u)\n",
+                printf("Response to 0x%lx: retval=%ld, args = (%lu, %lu, %lu, %lu, %lu)\n",
                         hash, retval, IPC_GET_ARG1(*answer),
                         IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
@@ -333 +334 @@
 /*      printf("phone: %d, method: ", call->in_phone_hash);
         ipc_m_print(IPC_GET_METHOD(*call));
-        printf(" args: (%u, %u, %u, %u, %u)\n",
+        printf(" args: (%lu, %lu, %lu, %lu, %lu)\n",
             IPC_GET_ARG1(*call),
             IPC_GET_ARG2(*call),
@@ -344 +345 @@
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash %d)\n", hash);
+                        printf("Not a response (hash 0x%lx)\n", hash);
                 }
                 return;