Changeset 9d8a1ed in mainline

Timestamp:

2009-07-21T18:34:05Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

654a30a

Parents:

986c24c

Message:

Read keys directly from console in tracer. This works around the current inability to write to stdout while blocked in getchar().

File:

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

uspace/app/trace/trace.c

@@ -45 +45 @@
 #include <string.h>
 #include <loader/loader.h>
+#include <io/console.h>
+#include <io/keycode.h>
 
 #include <libc.h>
@@ -453 +455 @@
 
                 if (paused) {
-                        printf("Press R to resume (and be patient).\n");
+                        printf("Press R to resume.\n");
                         while (paused) {
-                                usleep(1000000);
-                                fibril_yield();
-                                printf(".");
+                                async_usleep(1000000);
                         }
                         printf("Resumed\n");
@@ -558 +558 @@
 static void trace_task(task_id_t task_id)
 {
+        console_event_t ev;
+        bool done;
         int i;
         int rc;
-        int c;
 
         ipcp_init();
@@ -582 +583 @@
         }
 
-        while(1) {
-                c = getchar();
-                if (c == 'q') break;
-                if (c == 'p') {
+        done = false;
+
+        while (!done) {
+                if (!console_get_event(fphone(stdin), &ev))
+                        return;
+
+                if (ev.type != KEY_PRESS)
+                        continue;
+
+                switch (ev.key) {
+                case KC_Q:
+                        done = true;
+                        break;
+                case KC_P:
                         printf("Pause...\n");
-                        paused = 1;
                         rc = udebug_stop(phoneid, thash);
-                        printf("stop -> %d\n", rc);
-                }
-                if (c == 'r') {
+                        if (rc == EOK)
+                                paused = 1;
+                        else
+                                printf("stop -> %d\n", rc);
+                        break;
+                case KC_R:
                         paused = 0;
                         printf("Resume...\n");
+                        break;
                 }
         }