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

Timestamp:

2008-09-17T14:12:18Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

8c125ad

Parents:

0108984a

Message:

trace: Prettier startup/shutdown messages.

File:

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

uspace/app/trace/trace.c

@@ -73 +73 @@
         int rc;
 
-        printf("ipc_connect_task(%lld)... ", task_id);
         rc = ipc_connect_kbox(task_id);
-        printf("-> %d\n", rc);
 
         if (rc == ENOTSUP) {
@@ -82 +80 @@
                 printf("Compile kernel with 'Support for userspace debuggers' "
                     "(CONFIG_UDEBUG) enabled.\n");
+                return rc;
+        }
+
+        if (rc < 0) {
+                printf("Error connecting\n");
+                printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
+                return rc;
         }
 
         phoneid = rc;
-        if (rc < 0) return rc;
-
-        printf("udebug_begin()... ");
+
         rc = udebug_begin(phoneid);
-        printf("-> %d\n", rc);
-        if (rc < 0) return rc;
-
-        printf("udebug_set_evmask(0x%x)... ", UDEBUG_EM_ALL);
+        if (rc < 0) {
+                printf("udebug_begin() -> %d\n", rc);
+                return rc;
+        }
+
         rc = udebug_set_evmask(phoneid, UDEBUG_EM_ALL);
-        printf("-> %d\n", rc);
-        if (rc < 0) return rc;
+        if (rc < 0) {
+                printf("udebug_set_evmask(0x%x) -> %d\n ", UDEBUG_EM_ALL, rc);
+                return rc;
+        }
 
         return 0;
@@ -107 +113 @@
         int i;
 
-        printf("send IPC_M_DEBUG_THREAD_READ message\n");
         rc = udebug_thread_read(phoneid, thread_hash_buf,
                 THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed);
-        printf("-> %d\n", rc);
-        if (rc < 0) return rc;
+        if (rc < 0) {
+                printf("udebug_thread_read() -> %d\n", rc);
+                return rc;
+        }
 
         n_threads = tb_copied / sizeof(unsigned);
 
-        printf("thread IDs:");
-        for (i=0; i<n_threads; i++) {
-                printf(" %u", thread_hash_buf[i]);
+        printf("Threads:");
+        for (i = 0; i < n_threads; i++) {
+                printf(" [%d] (hash 0x%u)", 1+i, thread_hash_buf[i]);
         }
         printf("\ntotal of %u threads\n", tb_needed/sizeof(unsigned));
@@ -335 +342 @@
 {
         async_serialize_start();
-        printf("new thread, hash 0x%x\n", hash);
+        printf("New thread, hash 0x%x\n", hash);
         async_serialize_end();
 
@@ -352 +359 @@
         thread_id = next_thread_id++;
 
-        printf("trace_loop(%d)\n", thread_id);  
+        printf("Start tracing thread [%d] (hash 0x%x)\n", thread_id, thread_hash);
 
         while (!abort_trace) {
@@ -362 +369 @@
 //              printf("rc = %d, ev_type=%d\n", rc, ev_type);
                 if (ev_type == UDEBUG_EVENT_FINISHED) {
-                        printf("thread %u debugging finished\n", thread_id);
+                        /* Done tracing this thread */
                         break;
                 }
@@ -375 +382 @@
                                 break;
                         case UDEBUG_EVENT_STOP:
-                                printf("stop event\n");
-                                printf("waiting for resume\n");
+                                printf("Stop event\n");
+                                printf("Waiting for resume\n");
                                 while (paused) {
                                         usleep(1000000);
@@ -382 +389 @@
                                         printf(".");
                                 }
-                                printf("resumed\n");
+                                printf("Resumed\n");
                                 break;
                         case UDEBUG_EVENT_THREAD_B:
@@ -388 +395 @@
                                 break;
                         case UDEBUG_EVENT_THREAD_E:
-                                printf("thread 0x%x exited\n", val0);
+                                printf("Thread 0x%x exited\n", val0);
                                 abort_trace = 1;
                                 break;
                         default:
-                                printf("unknown event type %d\n", ev_type);
+                                printf("Unknown event type %d\n", ev_type);
                                 break;
                         }
@@ -399 +406 @@
         }
 
-        printf("trace_loop(%d) exiting\n", thread_id);
+        printf("Finished tracing thread [%d]\n", thread_id);
         return 0;
 }
@@ -433 +440 @@
 
         ipcp_init();
-        ipcp_connection_set(1, 0, proto_console);
+
+        /* 
+         * User apps now typically have console on phone 3.
+         * (Phones 1 and 2 are used by the loader).
+         */
+        ipcp_connection_set(3, 0, proto_console);
 
         rc = get_thread_list();
@@ -460 +472 @@
         }
 
-        printf("terminate debugging session...\n");
+        printf("\nTerminate debugging session...\n");
         abort_trace = 1;
         udebug_end(phoneid);
@@ -467 +479 @@
         ipcp_cleanup();
 
-        printf("done\n");
+        printf("Done\n");
         return;
 }
@@ -521 +533 @@
 static void print_syntax()
 {
-        printf("syntax: trace <task_id>\n");
+        printf("Syntax: trace <task_id>\n");
 }