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

Timestamp:

2008-09-18T22:19:42Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

f7176b1

Parents:

073c9e6

Message:

trace: Decode protocol-level call arguments, response retvals and arguments.

File:

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

uspace/app/trace/ipcp.c

@@ -47 +47 @@
         int phone_hash;
         ipc_call_t question;
+        oper_t *oper;
 
         int call_hash;
@@ -146 +147 @@
         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.
@@ -159 +168 @@
         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);
 
@@ -180 +190 @@
         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) {
@@ -188 +202 @@
                         phone, (proto ? proto->name : "n/a"));
                 ipc_m_print(proto, 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)
-                );
+                printf(" args: (%u, %u, %u, %u, %u)\n", args[1], args[2],
+                    args[3], args[4], args[5]);
         }
 
@@ -211 +220 @@
                             phone, (oper ? oper->name : "unknown"));
 
-                        printf("(%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)
-                        );
-                }
+                        putchar('(');
+                        for (i = 1; i <= oper->argc; ++i) {
+                                if (i > 1) printf(", ");
+                                val_print(args[i], oper->arg_type[i - 1]);
+                        }
+                        putchar(')');
+
+                        if (oper->rv_type == V_VOID && oper->respc == 0) {
+                                /*
+                                 * No response data (typically the task will
+                                 * not be interested in the response).
+                                 * We will not display response.
+                                 */
+                                putchar('.');
+                        }
+
+                        putchar('\n');
+                }
+        } else {
+                oper = NULL;
         }
 
@@ -227 +248 @@
         pcall->question = *call;
         pcall->call_hash = hash;
+        pcall->oper = oper;
 
         key[0] = hash;
@@ -243 +265 @@
         int cphone;
 
+        ipcarg_t *resp;
+        oper_t *oper;
+        int i;
+
 //      printf("parse_answer\n");
 
@@ -248 +274 @@
         method = IPC_GET_METHOD(pcall->question);
         retval = IPC_GET_RETVAL(*answer);
+
+        resp = answer->args;
 
         if ((display_mask & DM_IPC) != 0) {
@@ -257 +285 @@
 
         if ((display_mask & DM_USER) != 0) {
-                printf("-> %d\n", retval);
+                oper = pcall->oper;
+
+                if (oper->rv_type != V_VOID || oper->respc > 0) {
+                        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');
+                }
         }