Changeset 87822ce in mainline for uspace/app/top/top.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/top/top.c (modified) (3 diffs)

uspace/app/top/top.c

@@ -583 +583 @@
         data_t data_prev;
         const char *ret = NULL;
+        errno_t rc;
+        int c;
 
         screen_init();
@@ -595 +597 @@
         /* And paint screen until death */
         while (true) {
-                int c = tgetchar(UPDATE_INTERVAL);
-
-                if (c < 0) { /* timeout */
+                rc = tgetchar(UPDATE_INTERVAL, &c);
+
+                if (rc == ETIMEOUT) { /* timeout */
                         data_prev = data;
                         if ((ret = read_data(&data)) != NULL) {
@@ -608 +610 @@
 
                         c = -1;
+                } else if (rc != EOK) {
+                        /* Error (e.g. communication with console lost) */
+                        goto out;
                 }