Changes in uspace/app/trace/trace.c [07b7c48:ce7676c] in mainline

File:

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

uspace/app/trace/trace.c

@@ -43 +43 @@
 #include <mem.h>
 #include <str.h>
-#include <stdbool.h>
+#include <bool.h>
 #include <loader/loader.h>
 #include <io/console.h>
@@ -136 +136 @@
         }
 
+        free(task_ldr);
         task_ldr = NULL;
 
@@ -317 +318 @@
 }
 
+static void sc_ipc_call_sync_fast(sysarg_t *sc_args)
+{
+        ipc_call_t question, reply;
+        int rc;
+        int phoneid;
+
+        phoneid = sc_args[0];
+
+        IPC_SET_IMETHOD(question, sc_args[1]);
+        IPC_SET_ARG1(question, sc_args[2]);
+        IPC_SET_ARG2(question, sc_args[3]);
+        IPC_SET_ARG3(question, sc_args[4]);
+        IPC_SET_ARG4(question, 0);
+        IPC_SET_ARG5(question, 0);
+
+        memset(&reply, 0, sizeof(reply));
+        rc = udebug_mem_read(sess, &reply.args, sc_args[5], sizeof(reply.args));
+        if (rc < 0)
+                return;
+        
+        ipcp_call_sync(phoneid, &question, &reply);
+}
+
+static void sc_ipc_call_sync_slow_b(unsigned thread_id, sysarg_t *sc_args)
+{
+        ipc_call_t question;
+        int rc;
+
+        memset(&question, 0, sizeof(question));
+        rc = udebug_mem_read(sess, &question.args, sc_args[1],
+            sizeof(question.args));
+
+        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 reply;
+        int rc;
+
+        memset(&reply, 0, sizeof(reply));
+        rc = udebug_mem_read(sess, &reply.args, sc_args[2],
+            sizeof(reply.args));
+
+        if (rc < 0) {
+                printf("Error: mem_read->%d\n", rc);
+                return;
+        }
+
+        ipcp_call_sync(sc_args[0], &thread_ipc_req[thread_id], &reply);
+}
+
 static void sc_ipc_wait(sysarg_t *sc_args, int sc_rc)
 {
@@ -347 +405 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall name and arguments */
-                if (syscall_desc_defined(sc_id)) {
-                        printf("%s", syscall_desc[sc_id].name);
-                        print_sc_args(sc_args, syscall_desc[sc_id].n_args);
-                }
-                else {
-                        printf("unknown_syscall<%d>", sc_id);
-                        print_sc_args(sc_args, 6);
-                }
+                printf("%s", syscall_desc[sc_id].name);
+                print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+        }
+
+        switch (sc_id) {
+        case SYS_IPC_CALL_SYNC_SLOW:
+                sc_ipc_call_sync_slow_b(thread_id, sc_args);
+                break;
+        default:
+                break;
         }
 }
@@ -377 +437 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall return value */
-                if (syscall_desc_defined(sc_id))
-                        rv_type = syscall_desc[sc_id].rv_type;
-                else
-                        rv_type = V_PTR;
+                rv_type = syscall_desc[sc_id].rv_type;
                 print_sc_retval(sc_rc, rv_type);
         }
@@ -390 +447 @@
         case SYS_IPC_CALL_ASYNC_SLOW:
                 sc_ipc_call_async_slow(sc_args, sc_rc);
+                break;
+        case SYS_IPC_CALL_SYNC_FAST:
+                sc_ipc_call_sync_fast(sc_args);
+                break;
+        case SYS_IPC_CALL_SYNC_SLOW:
+                sc_ipc_call_sync_slow_e(thread_id, sc_args);
                 break;
         case SYS_IPC_WAIT:
@@ -505 +568 @@
         ldr = loader_connect();
         if (ldr == NULL)
-                return NULL;
+                return 0;
 
         /* Get task ID. */
@@ -565 +628 @@
 static int cev_fibril(void *arg)
 {
-        cons_event_t event;
-
         (void) arg;
         
@@ -577 +638 @@
                 fibril_mutex_unlock(&state_lock);
                 
-                if (!console_get_event(console, &event))
+                if (!console_get_kbd_event(console, &cev))
                         return -1;
                 
-                if (event.type == CEV_KEY) {
-                        fibril_mutex_lock(&state_lock);
-                        cev = event.ev.key;
-                        cev_valid = true;
-                        fibril_condvar_broadcast(&state_cv);
-                        fibril_mutex_unlock(&state_lock);
-                }
+                fibril_mutex_lock(&state_lock);
+                cev_valid = true;
+                fibril_condvar_broadcast(&state_cv);
+                fibril_mutex_unlock(&state_lock);
         }
 }