Changeset 41811af in mainline for uspace/app/trace/ipcp.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

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

uspace/app/trace/ipcp.c

@@ -37 +37 @@
 #include <adt/hash_table.h>
 #include <sys/typefmt.h>
-
+#include <kernel/ipc/ipc_methods.h>
 #include "ipc_desc.h"
 #include "proto.h"
@@ -268 +268 @@
         proto_t *proto;
         int cphone;
-
+        
         sysarg_t *resp;
         oper_t *oper;
         int i;
-
-//      printf("parse_answer\n");
-
+        
         phone = pcall->phone_hash;
         method = IPC_GET_IMETHOD(pcall->question);
         retval = IPC_GET_RETVAL(*answer);
-
+        
         resp = answer->args;
-
+        
         if ((display_mask & DM_IPC) != 0) {
                 printf("Response to %p: retval=%" PRIdn ", args = (%" PRIun ", "
@@ -288 +286 @@
                     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)) {
+                
+                if ((oper != NULL) &&
+                    ((oper->rv_type != V_VOID) || (oper->respc > 0))) {
                         printf("->");
-
+                        
                         if (oper->rv_type != V_VOID) {
                                 putchar(' ');
@@ -304 +303 @@
                                 putchar('(');
                                 for (i = 1; i <= oper->respc; ++i) {
-                                        if (i > 1) printf(", ");
+                                        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) {
+        
+        if ((phone == PHONE_NS) && (method == IPC_M_CONNECT_ME_TO) &&
+            (retval == 0)) {
                 /* Connected to a service (through NS) */
                 service = IPC_GET_ARG1(pcall->question);
                 proto = proto_get_by_srv(service);
-                if (proto == NULL) proto = proto_unknown;
-
+                if (proto == NULL)
+                        proto = proto_unknown;
+                
                 cphone = IPC_GET_ARG5(*answer);
                 if ((display_mask & DM_SYSTEM) != 0) {
                         printf("Registering connection (phone %d, protocol: %s)\n", cphone,
-                                proto->name);
-                }
+                    proto->name);
+                }
+                
                 ipcp_connection_set(cphone, 0, proto);
         }
@@ -334 +337 @@
         pending_call_t *pcall;
         unsigned long key[1];
-
-//      printf("ipcp_call_in()\n");
-
+        
         if ((hash & IPC_CALLID_ANSWERED) == 0 && hash != IPCP_CALLID_SYNC) {
                 /* Not a response */
@@ -344 +345 @@
                 return;
         }
-
+        
         hash = hash & ~IPC_CALLID_ANSWERED;
         key[0] = hash;
-
+        
         item = hash_table_find(&pending_calls, key);
-        if (item == NULL) return; // No matching question found
-
+        if (item == NULL)
+                return; /* No matching question found */
+        
         /*
          * Response matched to question.
@@ -357 +359 @@
         pcall = hash_table_get_instance(item, pending_call_t, link);
         hash_table_remove(&pending_calls, key, 1);
-
+        
         parse_answer(hash, pcall, call);
         free(pcall);