Changes in uspace/app/trace/trace.c [6c34f587:1c635d6] 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 <bool.h>
+#include <stdbool.h>
 #include <loader/loader.h>
 #include <io/console.h>
@@ -136 +136 @@
         }
 
-        free(task_ldr);
         task_ldr = NULL;
 
@@ -348 +347 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall name and arguments */
-                printf("%s", syscall_desc[sc_id].name);
-                print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+                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);
+                }
         }
 }
@@ -372 +377 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall return value */
-                rv_type = syscall_desc[sc_id].rv_type;
+                if (syscall_desc_defined(sc_id))
+                        rv_type = syscall_desc[sc_id].rv_type;
+                else
+                        rv_type = V_PTR;
                 print_sc_retval(sc_rc, rv_type);
         }
@@ -497 +505 @@
         ldr = loader_connect();
         if (ldr == NULL)
-                return 0;
+                return NULL;
 
         /* Get task ID. */
@@ -557 +565 @@
 static int cev_fibril(void *arg)
 {
+        cons_event_t event;
+
         (void) arg;
         
@@ -567 +577 @@
                 fibril_mutex_unlock(&state_lock);
                 
-                if (!console_get_kbd_event(console, &cev))
+                if (!console_get_event(console, &event))
                         return -1;
                 
-                fibril_mutex_lock(&state_lock);
-                cev_valid = true;
-                fibril_condvar_broadcast(&state_cv);
-                fibril_mutex_unlock(&state_lock);
+                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);
+                }
         }
 }
@@ -711 +724 @@
         o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_STAT, o);
+        o = oper_new("statfs", 0, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_STATFS, o);
 
         proto_register(SERVICE_VFS, p);
@@ -861 +876 @@
                 printf("Waiting for task to exit.\n");
 
-                rc = task_wait(task_id, &texit, &retval);
+                rc = task_wait_task_id(task_id, &texit, &retval);
                 if (rc != EOK) {
                         printf("Failed waiting for task.\n");