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

Timestamp:

2008-09-17T18:04:01Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

e028660

Parents:

8c125ad

Message:

trace: Command-line options to select display mode. Skeleton 'protocol-level' mode (the default)

File:

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

uspace/app/trace/ipcp.c

@@ -39 +39 @@
 #include "ipc_desc.h"
 #include "proto.h"
+#include "trace.h"
 #include "ipcp.h"
 
@@ -178 +179 @@
         proto_t *proto;
         unsigned long key[1];
+        oper_t *oper;
 
         if (have_conn[phone]) proto = connections[phone].proto;
         else proto = NULL;
 
-//      printf("ipcp_call_out()\n");
-        printf("call id: 0x%x, 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",
-            IPC_GET_ARG1(*call),
-            IPC_GET_ARG2(*call),
-            IPC_GET_ARG3(*call),
-            IPC_GET_ARG4(*call),
-            IPC_GET_ARG5(*call)
-        );
+        if ((display_mask & DM_IPC) != 0) {
+                printf("Call ID: 0x%x, 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",
+                    IPC_GET_ARG1(*call),
+                    IPC_GET_ARG2(*call),
+                    IPC_GET_ARG3(*call),
+                    IPC_GET_ARG4(*call),
+                    IPC_GET_ARG5(*call)
+                );
+        }
+
+
+        if ((display_mask & DM_USER) != 0) {
+
+                if (proto != NULL) {
+                        oper = proto_get_oper(proto, IPC_GET_METHOD(*call));
+                } else {
+                        oper = NULL;
+                }
+
+                if (oper != NULL) {
+
+                        printf("%s(%d).%s", (proto ? proto->name : "n/a"),
+                            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)
+                        );
+                }
+        }
 
         /* Store call in hash table for response matching */
@@ -206 +233 @@
 }
 
-static void parse_answer(pending_call_t *pcall, ipc_call_t *answer)
+static void parse_answer(ipc_callid_t hash, pending_call_t *pcall,
+    ipc_call_t *answer)
 {
         int phone;
@@ -220 +248 @@
         method = IPC_GET_METHOD(pcall->question);
         retval = IPC_GET_RETVAL(*answer);
-        printf("phone=%d, method=%d, retval=%d\n",
-                phone, method, retval);
+
+        if ((display_mask & DM_IPC) != 0) {
+                printf("Response to 0x%x: retval=%d, args = (%u, %u, %u, %u, %u)\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) {
+                printf("-> %d\n", retval);
+        }
 
         if (phone == 0 && method == IPC_M_CONNECT_ME_TO && retval == 0) {
@@ -230 +267 @@
 
                 cphone = IPC_GET_ARG5(*answer);
-                printf("registering connection (phone %d, protocol: %s)\n", cphone,
-                        proto->name);
+                if ((display_mask & DM_SYSTEM) != 0) {
+                        printf("Registering connection (phone %d, protocol: %s)\n", cphone,
+                                proto->name);
+                }
                 ipcp_connection_set(cphone, 0, proto);
         }
@@ -255 +294 @@
         if ((hash & IPC_CALLID_ANSWERED) == 0 && hash != IPCP_CALLID_SYNC) {
                 /* Not a response */
-                printf("Not a response (hash %d)\n", hash);
+                if ((display_mask & DM_IPC) != 0) {
+                        printf("Not a response (hash %d)\n", hash);
+                }
                 return;
         }
@@ -264 +305 @@
         item = hash_table_find(&pending_calls, key);
         if (item == NULL) return; // No matching question found
+
+        /*
+         * Response matched to question.
+         */
         
         pcall = hash_table_get_instance(item, pending_call_t, link);
-
-        printf("response matched to question\n");
         hash_table_remove(&pending_calls, key, 1);
 
-        parse_answer(pcall, call);
+        parse_answer(hash, pcall, call);
         free(pcall);
 }
@@ -282 +325 @@
 void ipcp_hangup(int phone, int rc)
 {
-        printf("hangup phone %d -> %d\n", phone, rc);
-        ipcp_connection_clear(phone);
+        if ((display_mask & DM_SYSTEM) != 0) {
+                printf("Hang phone %d up -> %d\n", phone, rc);
+                ipcp_connection_clear(phone);
+        }
 }