WebSVN – HelenOS – Diff – /branches/dynload/uspace/app/trace/ipcp.c

 #include "ipcp.h"
 #define IPCP_CALLID_SYNC 0
 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;
 } pending_call_t;
 typedef struct {
     pending_call_t *hs;
 //  printf("pending_call_compare\n");
     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;
+}
 static void pending_call_remove_callback(link_t *item)
+{
         /* Not a system method, try the user protocol. */
         oper = proto_get_oper(proto, method);
+    }
     if (oper != NULL) {
-        printf("%s (%d)", oper->name, method);
+        printf("%s (%ld)", oper->name, method);
         return;
+    }
-    printf("%d", method);
+    printf("%ld", method);
+}
 void ipcp_init(void)
+{
     ipc_m_desc_t *desc;
     oper_t *oper;
+    val_type_t arg_def[OPER_MAX_ARGS] = {
+        V_INTEGER,
+        V_INTEGER,
+        V_INTEGER,
+        V_INTEGER,
+        V_INTEGER
+    };
     /*
      * Create a pseudo-protocol 'unknown' that has no known methods.
      */
     proto_unknown = proto_new("unknown");
      */
     proto_system = proto_new("system");
     desc = ipc_methods;
     while (desc->number != 0) {
-        oper = oper_new(desc->name);
+        oper = oper_new(desc->name, OPER_MAX_ARGS, arg_def, V_INTEGER,
+            OPER_MAX_ARGS, arg_def);
         proto_add_oper(proto_system, desc->number, oper);
         ++desc;
+    }
+{
     pending_call_t *pcall;
     proto_t *proto;
     unsigned long key[1];
     oper_t *oper;
+    ipcarg_t *args;
+    int i;
     if (have_conn[phone]) proto = connections[phone].proto;
     else proto = NULL;
+    args = call->args;
     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",
+        printf(" args: (%lu, %lu, %lu, %lu, %lu)\n", args[1], args[2],
-            IPC_GET_ARG1(*call),
-            IPC_GET_ARG2(*call),
-            IPC_GET_ARG3(*call),
-            IPC_GET_ARG4(*call),
+            args[3], args[4], args[5]);
-            IPC_GET_ARG5(*call)
-        );
+    }
     if ((display_mask & DM_USER) != 0) {
         if (oper != NULL) {
             printf("%s(%d).%s", (proto ? proto->name : "n/a"),
                 phone, (oper ? oper->name : "unknown"));
+            putchar('(');
-            printf("(%u, %u, %u, %u, %u)\n",
+            for (i = 1; i <= oper->argc; ++i) {
-                IPC_GET_ARG1(*call),
+                if (i > 1) printf(", ");
+                val_print(args[i], oper->arg_type[i - 1]);
+            }
-                IPC_GET_ARG2(*call),
+            putchar(')');
+            if (oper->rv_type == V_VOID && oper->respc == 0) {
+                /*
+                 * No response data (typically the task will
-                IPC_GET_ARG3(*call),
+                 * not be interested in the response).
-                IPC_GET_ARG4(*call),
+                 * We will not display response.
+                 */
-                IPC_GET_ARG5(*call)
+                putchar('.');
-            );
+            }
+            putchar('\n');
+        }
+    } else {
+        oper = NULL;
+    }
     /* Store call in hash table for response matching */
     pcall = malloc(sizeof(pending_call_t));
     pcall->phone_hash = phone;
     pcall->question = *call;
     pcall->call_hash = hash;
+    pcall->oper = oper;
     key[0] = hash;
     hash_table_insert(&pending_calls, key, &pcall->link);
+}
 static void parse_answer(ipc_callid_t hash, pending_call_t *pcall,
     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;
+    ipcarg_t *resp;
+    oper_t *oper;
+    int i;
 //  printf("parse_answer\n");
     phone = pcall->phone_hash;
     method = IPC_GET_METHOD(pcall->question);
     retval = IPC_GET_RETVAL(*answer);
+    resp = answer->args;
     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),
             IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
+    }
     if ((display_mask & DM_USER) != 0) {
+        oper = pcall->oper;
+        if (oper != NULL && (oper->rv_type != V_VOID || oper->respc > 0)) {
-        printf("-> %d\n", retval);
+            printf("->");
+            if (oper->rv_type != V_VOID) {
+                putchar(' ');
+                val_print(retval, oper->rv_type);
+            }
+            if (oper->respc > 0) {
+                putchar(' ');
+                putchar('(');
+                for (i = 1; i <= oper->respc; ++i) {
+                    if (i > 1) printf(", ");
+                    val_print(resp[i], oper->resp_type[i - 1]);
+                }
+                putchar(')');
+            }
+            putchar('\n');
+        }
+    }
     if (phone == 0 && method == IPC_M_CONNECT_ME_TO && retval == 0) {
         /* Connected to a service (through NS) */
         service = IPC_GET_ARG1(pcall->question);
     link_t *item;
     pending_call_t *pcall;
     unsigned long key[1];
 //  printf("ipcp_call_in()\n");
-/*  printf("phone: %d, method: ", call->in_phone_hash);
-    ipc_m_print(IPC_GET_METHOD(*call));
-    printf(" args: (%u, %u, %u, %u, %u)\n",
-        IPC_GET_ARG1(*call),
-        IPC_GET_ARG2(*call),
-        IPC_GET_ARG3(*call),
-        IPC_GET_ARG4(*call),
-        IPC_GET_ARG5(*call)
-    );*/
     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 0x%lx)\n", hash);
+        }
         return;
+    }
     hash = hash & ~IPC_CALLID_ANSWERED;

Subversion Repositories HelenOS

(root)/branches/dynload/uspace/app/trace/ipcp.c – Rev 3448 → 3474