Changeset 1643855 in mainline for uspace/app/trace/trace.c

Timestamp:

2008-09-17T18:04:01Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

e028660

Parents:

8c125ad

Message:

trace: Command-line options to select display mode. Skeleton 'protocol-level' mode (the default)

File:

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

uspace/app/trace/trace.c

@@ -52 +52 @@
 #include "ipcp.h"
 #include "errors.h"
+#include "trace.h"
 
 #define THBUF_SIZE 64
@@ -68 +69 @@
 
 static proto_t *proto_console;
+static task_id_t task_id;
+
+/** Combination of events/data to print. */
+display_mask_t display_mask;
 
 static int task_connect(task_id_t task_id)
@@ -287 +292 @@
         }
 
-        /* Print syscall name, id and arguments */
-        printf("%s", syscall_desc[sc_id].name);
-        print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+        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);
+        }
 
         async_serialize_end();
@@ -313 +320 @@
         }
 
-        rv_type = syscall_desc[sc_id].rv_type;
-        print_sc_retval(sc_rc, rv_type);
+        if ((display_mask & DM_SYSCALL) != 0) {
+                /* Print syscall return value */
+                rv_type = syscall_desc[sc_id].rv_type;
+                print_sc_retval(sc_rc, rv_type);
+        }
 
         switch (sc_id) {
@@ -429 +439 @@
         int c;
 
-        printf("Syscall Tracer\n");
-
         rc = task_connect(task_id);
         if (rc < 0) {
@@ -533 +541 @@
 static void print_syntax()
 {
-        printf("Syntax: trace <task_id>\n");
-}
-
-int main(int argc, char *argv[])
-{
-        task_id_t task_id;
+        printf("Syntax: trace [+<events>] <task_id>\n");
+        printf("Events: (default is +tp)\n");
+        printf("\n");
+        printf("\tt ... Thread creation and termination\n");
+        printf("\ts ... System calls\n");
+        printf("\ti ... Low-level IPC\n");
+        printf("\tp ... Protocol level\n");
+        printf("\n");
+        printf("Example: trace +tsip 12\n");
+}
+
+static display_mask_t parse_display_mask(char *text)
+{
+        display_mask_t dm;
+        char *c;
+
+        c = text;
+
+        while (*c) {
+                switch (*c) {
+                case 't': dm = dm | DM_THREAD; break;
+                case 's': dm = dm | DM_SYSCALL; break;
+                case 'i': dm = dm | DM_IPC; break;
+                case 'p': dm = dm | DM_SYSTEM | DM_USER; break;
+                default:
+                        printf("Unexpected event type '%c'\n", *c);
+                        exit(1);
+                }
+
+                ++c;
+        }
+
+        return dm;
+}
+
+static int parse_args(int argc, char *argv[])
+{
+        char *arg;
         char *err_p;
 
-        if (argc != 2) {
-                printf("Mising argument\n");
+        --argc; ++argv;
+
+        while (argc > 1) {
+                arg = *argv;
+                if (arg[0] == '+') {
+                        display_mask = parse_display_mask(&arg[1]);
+                } else {
+                        printf("Unexpected argument '%s'\n", arg);
+                        print_syntax();
+                        return -1;
+                }
+
+                --argc; ++argv;
+        }
+
+        if (argc != 1) {
+                printf("Missing argument\n");
                 print_syntax();
                 return 1;
         }
 
-        task_id = strtol(argv[1], &err_p, 10);
+        task_id = strtol(*argv, &err_p, 10);
 
         if (*err_p) {
                 printf("Task ID syntax error\n");
                 print_syntax();
+                return -1;
+        }
+
+        return 0;
+}
+
+int main(int argc, char *argv[])
+{
+        printf("System Call / IPC Tracer\n");
+
+        display_mask = DM_THREAD | DM_SYSTEM | DM_USER;
+
+        if (parse_args(argc, argv) < 0)
                 return 1;
-        }
 
         main_init();
         trace_active_task(task_id);
+
+        return 0;
 }