Changeset a3b339b4 in mainline

Timestamp:

2013-04-03T20:14:16Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

220210c8

Parents:

c8830a2

Message:

Fix /app/trace

Location:

uspace/app/trace

Files:

• ipc_desc.c (modified) (1 diff)
• ipc_desc.h (modified) (1 diff)
• ipcp.c (modified) (2 diffs)
• syscalls.c (modified) (2 diffs)
• syscalls.h (modified) (2 diffs)
• trace.c (modified) (4 diffs)

uspace/app/trace/ipc_desc.c

@@ -49 +49 @@
         { IPC_M_DATA_READ,        "DATA_READ" },
         { IPC_M_DEBUG,            "DEBUG" },
-        
-        /* Terminating entry */
-        { 0, NULL }
 };
+
+size_t ipc_methods_len = sizeof(ipc_methods) / sizeof(ipc_m_desc_t);
 
 /** @}

uspace/app/trace/ipc_desc.h

@@ -42 +42 @@
 
 extern ipc_m_desc_t ipc_methods[];
+extern size_t ipc_methods_len;
 
 #endif

uspace/app/trace/ipcp.c

@@ -140 +140 @@
 void ipcp_init(void)
 {
-        ipc_m_desc_t *desc;
-        oper_t *oper;
-
         val_type_t arg_def[OPER_MAX_ARGS] = {
                 V_INTEGER,
@@ -162 +159 @@
         proto_system = proto_new("system");
 
-        desc = ipc_methods;
-        while (desc->number != 0) {
-                oper = oper_new(desc->name, OPER_MAX_ARGS, arg_def, V_INTEGER,
-                        OPER_MAX_ARGS, arg_def);
-                proto_add_oper(proto_system, desc->number, oper);
-
-                ++desc;
+        for (size_t i = 0; i < ipc_methods_len; i++) {
+                oper_t *oper = oper_new(ipc_methods[i].name, OPER_MAX_ARGS,
+                    arg_def, V_INTEGER, OPER_MAX_ARGS, arg_def);
+                proto_add_oper(proto_system, ipc_methods[i].number, oper);
         }
 

uspace/app/trace/syscalls.c

@@ -46 +46 @@
 
     [SYS_TASK_GET_ID] = { "task_get_id",                1,      V_ERRNO },
+    [SYS_TASK_SET_NAME] = { "task_set_name",            2,      V_ERRNO },
     [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout",        3,      V_ERRNO },
     [SYS_FUTEX_WAKEUP] = { "futex_wakeup",              1,      V_ERRNO },
@@ -82 +83 @@
 };
 
+const size_t syscall_desc_len = (sizeof(syscall_desc) / sizeof(sc_desc_t));
+
 /** @}
  */

uspace/app/trace/syscalls.h

@@ -36 +36 @@
 #define SYSCALLS_H_
 
+#include <stdbool.h>
+#include <unistd.h>
+
 #include "trace.h"
 
@@ -45 +48 @@
 
 extern const sc_desc_t syscall_desc[];
+extern const size_t syscall_desc_len;
+
+static inline bool syscall_desc_defined(unsigned sc_id)
+{
+        return (sc_id < syscall_desc_len && syscall_desc[sc_id].name != NULL);
+}
 
 #endif

uspace/app/trace/trace.c

@@ -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. */