Changeset cbff4c2 in mainline

Timestamp:

2009-06-03T19:31:07Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0c25c10

Parents:

73878c1

Message:

update for latest I/O changes
(some tests are not 100% working yet, will be solved soon)

Location:

uspace/app/tester

Files:

• console/console1.c (modified) (5 diffs)
• ipc/ping_pong.c (modified) (1 diff)
• tester.c (modified) (1 diff)

uspace/app/tester/console/console1.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <io/stream.h>
+#include <io/console.h>
+#include <io/color.h>
+#include <io/style.h>
 #include <async.h>
 #include "../tester.h"
-
-#include <console.h>
 
 const char *color_name[] = {
@@ -51 +51 @@
 
         printf("Style test: ");
-        console_set_style(STYLE_NORMAL);
+        console_set_style(fphone(stdout), STYLE_NORMAL);
         printf("normal ");
-        console_set_style(STYLE_EMPHASIS);
+        console_set_style(fphone(stdout), STYLE_EMPHASIS);
         printf("emphasized");
-        console_set_style(STYLE_NORMAL);
+        console_set_style(fphone(stdout), STYLE_NORMAL);
         printf(".\n");
 
@@ -61 +61 @@
         for (j = 0; j < 2; j++) {
                 for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
-                        console_set_color(i, COLOR_WHITE,
+                        console_set_color(fphone(stdout), i, COLOR_WHITE,
                             j ? CATTR_BRIGHT : 0);
                         printf(" %s ", color_name[i]);
                 }
-                console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+                console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
                 putchar('\n');
         }
@@ -72 +72 @@
         for (j = 0; j < 2; j++) {
                 for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
-                        console_set_color(COLOR_WHITE, i,
+                        console_set_color(fphone(stdout), COLOR_WHITE, i,
                             j ? CATTR_BRIGHT : 0);
                         printf(" %s ", color_name[i]);
                 }
-                console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+                console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
                 putchar('\n');
         }
@@ -83 +83 @@
 
         for (i = 0; i < 255; i += 16) {
-                console_set_rgb_color(0xffffff, i << 16);
+                console_set_rgb_color(fphone(stdout), 0xffffff, i << 16);
                 putchar('X');
         }
-        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
         putchar('\n');
 
         for (i = 0; i < 255; i += 16) {
-                console_set_rgb_color(0xffffff, i << 8);
+                console_set_rgb_color(fphone(stdout), 0xffffff, i << 8);
                 putchar('X');
         }
-        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
         putchar('\n');
 
         for (i = 0; i < 255; i += 16) {
-                console_set_rgb_color(0xffffff, i);
+                console_set_rgb_color(fphone(stdout), 0xffffff, i);
                 putchar('X');
         }
-        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
         putchar('\n');
 

uspace/app/tester/ipc/ping_pong.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <console.h>
 #include <sys/time.h>
+#include <ipc/ns.h>
+#include <async.h>
+#include <errno.h>
 #include "../tester.h"
 
-#define DURATION_SECS            10
-#define COUNT_GRANULARITY       100
+#define DURATION_SECS      10
+#define COUNT_GRANULARITY  100
 
-char * test_ping_pong(bool quiet)
+char *test_ping_pong(bool quiet)
 {
-        int i;
-        int w, h;
-        struct timeval start, now;
-        long count;
-
-        printf("Pinging console server for %d seconds...\n", DURATION_SECS);
-
+        printf("Pinging ns server for %d seconds...\n", DURATION_SECS);
+        
+        struct timeval start;
         if (gettimeofday(&start, NULL) != 0)
                 return "Failed getting the time.";
-
-        count = 0;
-
+        
+        uint64_t count = 0;
+        
         while (true) {
+                struct timeval now;
                 if (gettimeofday(&now, NULL) != 0)
                         return "Failed getting the time.";
-
+                
                 if (tv_sub(&now, &start) >= DURATION_SECS * 1000000L)
                         break;
-
-                for (i = 0; i < COUNT_GRANULARITY; i++)
-                        console_get_size(&w, &h);
+                
+                size_t i;
+                for (i = 0; i < COUNT_GRANULARITY; i++) {
+                        int retval = async_req_0_0(PHONE_NS, NS_PING);
+                        
+                        if (retval != EOK)
+                                return "Failed to send ping message.";
+                }
+                
                 count += COUNT_GRANULARITY;
         }
-
-        printf("Completed %ld round trips in %d seconds, %ld RT/s.\n", count,
-            DURATION_SECS, count / DURATION_SECS);
-
+        
+        printf("Completed %lu round trips in %u seconds, %lu RT/s.\n",
+            count, DURATION_SECS, count / DURATION_SECS);
+        
         return NULL;
 }

uspace/app/tester/tester.c

@@ -131 +131 @@
                 list_tests();
                 printf("> ");
+                fflush(stdout);
                 
                 c = getchar();