WebSVN – HelenOS – Diff – /branches/sparc/uspace/app/trace/trace.c

     sysarg_t val0, val1;
     thread_hash = (uintptr_t)thread_hash_arg;
     thread_id = next_thread_id++;
-    printf("Start tracing thread [%d] (hash 0x%lx)\n", thread_id, thread_hash);
+    printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash);
     while (!abort_trace) {
+        if (paused) {
+            printf("Press R to resume (and be patient).\n");
+            while (paused) {
+                usleep(1000000);
+                fibril_yield();
+                printf(".");
+            }
+            printf("Resumed\n");
+        }
         /* Run thread until an event occurs */
         rc = udebug_go(phoneid, thread_hash,
             &ev_type, &val0, &val1);
 //      printf("rc = %d, ev_type=%d\n", rc, ev_type);
             case UDEBUG_EVENT_SYSCALL_E:
                 event_syscall_e(thread_id, thread_hash, val0, (int)val1);
                 break;
             case UDEBUG_EVENT_STOP:
                 printf("Stop event\n");
-                printf("Waiting for resume\n");
-                while (paused) {
-                    usleep(1000000);
-                    fibril_yield();
-                    printf(".");
-                }
-                printf("Resumed\n");
                 break;
             case UDEBUG_EVENT_THREAD_B:
                 event_thread_b(val0);
                 break;
             case UDEBUG_EVENT_THREAD_E:
-                printf("Thread 0x%lx exited\n", val0);
+                printf("Thread 0x%lx 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;
+            }
+        }
+    }
-    printf("Finished tracing thread [%d]\n", thread_id);
+    printf("Finished tracing thread [%d].\n", thread_id);
     return 0;
+}
 void thread_trace_start(uintptr_t thread_hash)
+{
     while(1) {
         c = getchar();
         if (c == 'q') break;
         if (c == 'p') {
+            printf("Pause...\n");
             paused = 1;
             rc = udebug_stop(phoneid, thash);
             printf("stop -> %d\n", rc);
+        }
         if (c == 'r') {
             paused = 0;
+            printf("Resume...\n");
+        }
+    }
     printf("\nTerminate debugging session...\n");
     abort_trace = 1;
         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);
+            printf("Unexpected event type '%c'.\n", *c);
             exit(1);
+        }
         ++c;
+    }
 int main(int argc, char *argv[])
+{
     int rc;
     printf("System Call / IPC Tracer\n");
+    printf("Controls: Q - Quit, P - Pause, R - Resume\n");
     display_mask = DM_THREAD | DM_SYSTEM | DM_USER;
     if (parse_args(argc, argv) < 0)
         return 1;
     main_init();
     rc = connect_task(task_id);
     if (rc < 0) {
-        printf("Failed connecting to task %lld\n", task_id);
+        printf("Failed connecting to task %lld.\n", task_id);
         return 1;
+    }
-    printf("Connected to task %lld\n", task_id);
+    printf("Connected to task %lld.\n", task_id);
     if (task_ldr != NULL) {
         program_run();
+    }

Subversion Repositories HelenOS

(root)/branches/sparc/uspace/app/trace/trace.c @ 3682 – Rev 3593 → 3665