Changeset 371bd7d in mainline for uspace/app/trace/trace.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/app/trace/trace.c

@@ -43 +43 @@
 #include <task.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 #include <bool.h>
 #include <loader/loader.h>
 #include <io/console.h>
 #include <io/keycode.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
 
 #include <libc.h>
@@ -159 +161 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -198 +200 @@
         printf("Threads:");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] (hash 0x%lx)", 1+i, thread_hash_buf[i]);
+                printf(" [%d] (hash %p)", 1+i, thread_hash_buf[i]);
         }
         printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t));
@@ -222 +224 @@
         case V_HASH:
         case V_PTR:
-                printf("0x%08lx", val);
+                printf("%p", val);
                 break;
 
@@ -275 +277 @@
 
         putchar('(');
-        if (n > 0) printf("%ld", sc_args[0]);
+        if (n > 0) printf("%" PRIdSYSARG, sc_args[0]);
         for (i = 1; i < n; i++) {
-                printf(", %ld", sc_args[i]);
+                printf(", %" PRIdSYSARG, sc_args[i]);
         }
         putchar(')');
@@ -508 +510 @@
         }
 
-        printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash);
+        printf("Start tracing thread [%d] (hash %p).\n", thread_id, thread_hash);
 
         while (!abort_trace) {
@@ -552 +554 @@
                                 break;
                         case UDEBUG_EVENT_THREAD_E:
-                                printf("Thread 0x%lx exited.\n", val0);
+                                printf("Thread %p exited.\n", val0);
                                 fibril_mutex_lock(&state_lock);
                                 abort_trace = true;
@@ -583 +585 @@
 }
 
-static loader_t *preload_task(const char *path, char *const argv[],
+static loader_t *preload_task(const char *path, char **argv,
     task_id_t *task_id)
 {
@@ -589 +591 @@
         int rc;
 
-        /* Spawn a program loader */    
+        /* Spawn a program loader */
         ldr = loader_connect();
         if (ldr == NULL)
@@ -605 +607 @@
 
         /* Send arguments */
-        rc = loader_set_args(ldr, argv);
+        rc = loader_set_args(ldr, (const char **) argv);
         if (rc != EOK)
                 goto error;
@@ -868 +870 @@
 }
 
-static display_mask_t parse_display_mask(char *text)
+static display_mask_t parse_display_mask(const char *text)
 {
         display_mask_t dm;
-        char *c;
-
-        c = text;
-
+        const char *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;
+                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;
 }
@@ -894 +902 @@
 static int parse_args(int argc, char *argv[])
 {
-        char *arg;
         char *err_p;
 
         task_id = 0;
 
-        --argc; ++argv;
+        --argc;
+        ++argv;
 
         while (argc > 0) {
-                arg = *argv;
+                char *arg = *argv;
                 if (arg[0] == '+') {
                         display_mask = parse_display_mask(&arg[1]);
@@ -908 +916 @@
                         if (arg[1] == 't') {
                                 /* Trace an already running task */
-                                --argc; ++argv;
+                                --argc;
+                                ++argv;
                                 task_id = strtol(*argv, &err_p, 10);
                                 task_ldr = NULL;
@@ -925 +934 @@
                         break;
                 }
-
-                --argc; ++argv;
+                
+                --argc;
+                ++argv;
         }
 
         if (task_id != 0) {
-                if (argc == 0) return 0;
+                if (argc == 0)
+                        return 0;
                 printf("Extra arguments\n");
                 print_syntax();
@@ -944 +955 @@
         /* Preload the specified program file. */
         printf("Spawning '%s' with arguments:\n", *argv);
-        {
-                char **cp = argv;
-                while (*cp) printf("'%s'\n", *cp++);
-        }
+        
+        char **cp = argv;
+        while (*cp)
+                printf("'%s'\n", *cp++);
+        
         task_ldr = preload_task(*argv, argv, &task_id);
         task_wait_for = true;
@@ -972 +984 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %lld.\n", task_id);
+                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
                 return 1;
         }
 
-        printf("Connected to task %lld.\n", task_id);
+        printf("Connected to task %" PRIdTASKID ".\n", task_id);
 
         if (task_ldr != NULL)