Changeset c8404d4 in mainline

Timestamp:

2009-07-22T18:31:10Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

a5facfb

Parents:

9ad5b5cc

Message:

Cope with ipc_call_sync_slow() overwriting input argument with output argument. This fixes the tracer not understanding connect_to_me_blocking().

File:

• uspace/app/trace/trace.c (modified) (6 diffs)

uspace/app/trace/trace.c

@@ -69 +69 @@
 int next_thread_id;
 
+ipc_call_t thread_ipc_req[THBUF_SIZE];
+
 int phoneid;
 bool abort_trace;
@@ -340 +342 @@
 }
 
-static void sc_ipc_call_sync_slow(sysarg_t *sc_args)
+static void sc_ipc_call_sync_slow_b(unsigned thread_id, sysarg_t *sc_args)
 {
         ipc_call_t question, reply;
@@ -347 +349 @@
         memset(&question, 0, sizeof(question));
         rc = udebug_mem_read(phoneid, &question.args, sc_args[1], sizeof(question.args));
-        printf("dmr->%d\n", rc);
-        if (rc < 0) return;
+        if (rc < 0) {
+                printf("Error: mem_read->%d\n", rc);
+                return;
+        }
+
+        thread_ipc_req[thread_id] = question;
+}
+
+static void sc_ipc_call_sync_slow_e(unsigned thread_id, sysarg_t *sc_args)
+{
+        ipc_call_t question, reply;
+        int rc;
 
         memset(&reply, 0, sizeof(reply));
         rc = udebug_mem_read(phoneid, &reply.args, sc_args[2], sizeof(reply.args));
-        printf("dmr->%d\n", rc);
-        if (rc < 0) return;
-
-        ipcp_call_sync(sc_args[0], &question, &reply);
+        if (rc < 0) {
+                printf("Error: mem_read->%d\n", rc);
+                return;
+        }
+
+        ipcp_call_sync(sc_args[0], &thread_ipc_req[thread_id], &reply);
 }
 
@@ -400 +414 @@
         }
 
+        switch (sc_id) {
+        case SYS_IPC_CALL_SYNC_SLOW:
+                sc_ipc_call_sync_slow_b(thread_id, sc_args);
+                break;
+        default:
+                break;
+        }
+
         async_serialize_end();
 }
@@ -440 +462 @@
                 break;
         case SYS_IPC_CALL_SYNC_SLOW:
-                sc_ipc_call_sync_slow(sc_args);
+                sc_ipc_call_sync_slow_e(thread_id, sc_args);
                 break;
         case SYS_IPC_WAIT:
@@ -471 +493 @@
         thread_hash = (uintptr_t)thread_hash_arg;
         thread_id = next_thread_id++;
+        if (thread_id >= THBUF_SIZE) {
+                printf("Too many threads.\n");
+                return ELIMIT;
+        }
 
         printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash);