Changeset 79edc36 in mainline for uspace/app/top/input.c

Timestamp:

2010-04-01T15:21:03Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

62550dce

Parents:

83a957a

Message:

System load echo fix, now it looks realistic
top echoes first values (uptime)
Several ps and uptime fixes

File:

• uspace/app/top/input.c (modified) (5 diffs)

uspace/app/top/input.c

@@ -62 +62 @@
 #include <ipc/console.h>
 
-#define READ_TIMEOUT 1000000
+#define USEC_COUNT 1000000
 
 /* return true iff the given timeval is positive */
@@ -154 +154 @@
  * Eat any input that might be available.
  */
-void tsleep(void)
+void tsleep(unsigned int sec)
 {
         struct timeval tv;
         
         tv.tv_sec = 0;
-        tv.tv_usec = READ_TIMEOUT;
+        tv.tv_usec = sec * USEC_COUNT;
         while (TV_POS(&tv))
                 if (rwait(&tv)) {
@@ -170 +170 @@
  * getchar with timeout.
  */
-int tgetchar(void)
+int tgetchar(unsigned int sec)
 {
         static struct timeval timeleft;
@@ -176 +176 @@
         
         /*
-         * Reset timeleft to READ_TIMEOUT whenever it is not positive.
+         * Reset timeleft to USEC_COUNT whenever it is not positive.
          * In any case, wait to see if there is any input.  If so,
          * take it, and update timeleft so that the next call to
@@ -186 +186 @@
         if (!TV_POS(&timeleft)) {
                 timeleft.tv_sec = 0;
-                timeleft.tv_usec = READ_TIMEOUT;
+                timeleft.tv_usec = sec * USEC_COUNT;
         }