Changeset 87822ce in mainline for uspace/app/tester/ipc/starve.c

Timestamp:

2021-03-04T19:14:30Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d6c4d40

Parents:

760a392

Message:

Avoid infinite loop when console communication is broken

Need to make sure callers of console_get_event_timeout() can distinguish
between timeout and I/O error. Fix all callers of console_get_event()
and console_get_event_timeout() not to enter infinite loop when console
connection is broken. Also avoid setting of errno variable.

File:

• uspace/app/tester/ipc/starve.c (modified) (1 diff)

uspace/app/tester/ipc/starve.c

@@ -57 +57 @@
                 cons_event_t ev;
                 usec_t timeout = 0;
-                bool has_event = console_get_event_timeout(console, &ev, &timeout);
-                if (has_event && ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
-                        TPRINTF("Key %d pressed, terminating.\n", ev.ev.key.key);
+                errno_t rc = console_get_event_timeout(console, &ev, &timeout);
+                if (rc == EOK) {
+                        if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                                TPRINTF("Key %d pressed, terminating.\n", ev.ev.key.key);
+                                break;
+                        }
+                } else if (rc != ETIMEOUT) {
+                        TPRINTF("Got rc=%d, terminating.\n", rc);
                         break;
                 }