Changeset 7bdcc45 in mainline for uspace/app/tester

Timestamp:

2010-12-16T16:38:49Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/app/tester

Files:

• Makefile (modified) (2 diffs)
• hw/serial/serial1.c (moved) (moved from uspace/app/test_serial/test_serial.c ) (4 diffs)
• hw/serial/serial1.def (added)
• ipc/ping_pong.c (modified) (1 diff)
• ipc/register.c (modified) (4 diffs)
• print/print1.c (modified) (1 diff)
• print/print2.c (modified) (1 diff)
• print/print4.c (modified) (2 diffs)
• print/print5.c (added)
• print/print5.def (added)
• stdio/stdio1.c (modified) (1 diff)
• tester.c (modified) (3 diffs)
• tester.h (modified) (2 diffs)
• thread/thread1.c (modified) (2 diffs)
• vfs/vfs1.c (modified) (2 diffs)

uspace/app/tester/Makefile

@@ -38 +38 @@
         print/print3.c \
         print/print4.c \
+        print/print5.c \
         console/console1.c \
         stdio/stdio1.c \
@@ -49 +50 @@
         ipc/connect.c \
         loop/loop1.c \
-        mm/malloc1.c
+        mm/malloc1.c \
+        hw/serial/serial1.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tester/hw/serial/serial1.c

@@ -27 +27 @@
  */
 
-/** @addtogroup test_serial
- * @brief       test the serial port driver - read from the serial port
+/** @addtogroup tester
+ * @brief Test the serial port driver - loopback test
  * @{
  */
@@ -35 +35 @@
  */
 
+#include <inttypes.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -47 +48 @@
 #include <str.h>
 #include <ipc/serial_ctl.h>
-
-#define NAME            "test serial"
-
-
-static void print_usage(void)
+#include "../../tester.h"
+
+#define DEFAULT_COUNT  1024
+#define DEFAULT_SLEEP  100000
+#define EOT            "####> End of transfer <####\n"
+
+const char *test_serial1(void)
 {
-        printf("Usage: \n test_serial count \n where count is the number of "
-            "characters to be read\n");
-}
-
-int main(int argc, char *argv[])
-{
-        if (argc != 2) {
-                printf(NAME ": incorrect number of arguments.\n");
-                print_usage();
-                return 0;
-        }
-        
-        long int cnt = strtol(argv[1], NULL, 10);
-        
-        int res;
-        res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
+        size_t cnt;
+        
+        if (test_argc < 1)
+                cnt = DEFAULT_COUNT;
+        else
+                switch (str_size_t(test_argv[0], NULL, 0, true, &cnt)) {
+                case EOK:
+                        break;
+                case EINVAL:
+                        return "Invalid argument, unsigned integer expected";
+                case EOVERFLOW:
+                        return "Argument size overflow";
+                default:
+                        return "Unexpected argument error";
+                }
+        
+        int res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
+        
         devman_handle_t handle;
-        
         res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,
             IPC_FLAG_BLOCKING);
-        if (EOK != res) {
-                printf(NAME ": could not get the device handle, errno = %d.\n",
-                    -res);
-                return 1;
-        }
-        
-        printf(NAME ": trying to read %d characters from device with handle "
-            "%d.\n", cnt, handle);
+        if (res != EOK)
+                return "Could not get serial device handle";
         
         int phone = devman_device_connect(handle, IPC_FLAG_BLOCKING);
-        if (0 > phone) {
-                printf(NAME ": could not connect to the device, errno = %d.\n",
-                    -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
-                return 2;
+        if (phone < 0) {
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Unable to connect to serial device";
         }
         
         char *buf = (char *) malloc(cnt + 1);
-        if (NULL == buf) {
-                printf(NAME ": failed to allocate the input buffer\n");
+        if (buf == NULL) {
                 ipc_hangup(phone);
                 devman_hangup_phone(DEVMAN_CLIENT);
-                return 3;
-        }
-        
-        ipcarg_t old_baud, old_par, old_stop, old_word_size;
+                return "Failed to allocate input buffer";
+        }
+        
+        sysarg_t old_baud;
+        sysarg_t old_par;
+        sysarg_t old_stop;
+        sysarg_t old_word_size;
         
         res = ipc_call_sync_0_4(phone, SERIAL_GET_COM_PROPS, &old_baud,
             &old_par, &old_word_size, &old_stop);
-        if (EOK != res) {
-                printf(NAME ": failed to get old communication parameters, "
-                    "errno = %d.\n", -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
+        if (res != EOK) {
+                free(buf);
                 ipc_hangup(phone);
-                free(buf);
-                return 4;
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Failed to get old serial communication parameters";
         }
         
@@ -114 +110 @@
             SERIAL_NO_PARITY, 8, 1);
         if (EOK != res) {
-                printf(NAME ": failed to set communication parameters, errno = "
-                    "%d.\n", -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
+                free(buf);
                 ipc_hangup(phone);
-                free(buf);
-                return 4;
-        }
-        
-        int total = 0;
-        int read = 0;
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Failed to set serial communication parameters";
+        }
+        
+        TPRINTF("Trying to read %zu characters from serial device "
+            "(handle=%" PRIun ")\n", cnt, handle);
+        
+        size_t total = 0;
         while (total < cnt) {
-                read = read_dev(phone, buf, cnt - total);
-                if (0 > read) {
-                        printf(NAME ": failed read from device, errno = %d.\n",
-                            -read);
+                ssize_t read = read_dev(phone, buf, cnt - total);
+                
+                if (read < 0) {
                         ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
                             old_par, old_word_size, old_stop);
+                        free(buf);
                         ipc_hangup(phone);
                         devman_hangup_phone(DEVMAN_CLIENT);
+                        return "Failed read from serial device";
+                }
+                
+                if ((size_t) read > cnt - total) {
+                        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                            old_par, old_word_size, old_stop);
                         free(buf);
-                        return 5;
-                }
-                total += read;
-                if (read > 0) {
+                        ipc_hangup(phone);
+                        devman_hangup_phone(DEVMAN_CLIENT);
+                        return "Read more data than expected";
+                }
+                
+                TPRINTF("Read %zd bytes\n", read);
+                
+                if (read == 0)
+                        usleep(DEFAULT_SLEEP);
+                else {
                         buf[read] = 0;
-                        printf(buf);
+                        
                         /*
                          * Write data back to the device to test the opposite
                          * direction of data transfer.
                          */
-                        write_dev(phone, buf, read);
-                } else {
-                        usleep(100000);
-                }       
-        }
-        
-        const char *the_end = "\n---------\nTHE END\n---------\n";
-        write_dev(phone, (void *)the_end, str_size(the_end));
-        
-        /* restore original communication settings */
-        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, old_par,
-            old_word_size, old_stop);
+                        ssize_t written = write_dev(phone, buf, read);
+                        
+                        if (written < 0) {
+                                ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                                    old_par, old_word_size, old_stop);
+                                free(buf);
+                                ipc_hangup(phone);
+                                devman_hangup_phone(DEVMAN_CLIENT);
+                                return "Failed write to serial device";
+                        }
+                        
+                        if (written != read) {
+                                ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                                    old_par, old_word_size, old_stop);
+                                free(buf);
+                                ipc_hangup(phone);
+                                devman_hangup_phone(DEVMAN_CLIENT);
+                                return "Written less data than read from serial device";
+                        }
+                        
+                        TPRINTF("Written %zd bytes\n", written);
+                }
+                
+                total += read;
+        }
+        
+        TPRINTF("Trying to write EOT banner to the serial device\n");
+        
+        size_t eot_size = str_size(EOT);
+        ssize_t written = write_dev(phone, (void *) EOT, eot_size);
+        
+        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+            old_par, old_word_size, old_stop);
+        free(buf);
+        ipc_hangup(phone);
         devman_hangup_phone(DEVMAN_CLIENT);
-        ipc_hangup(phone);
-        free(buf);
-        
-        return 0;
+        
+        if (written < 0)
+                return "Failed to write EOT banner to serial device";
+        
+        if ((size_t) written != eot_size)
+                return "Written less data than the size of the EOT banner "
+                    "to serial device";
+        
+        return NULL;
 }
 

uspace/app/tester/ipc/ping_pong.c

@@ -72 +72 @@
         }
         
-        TPRINTF("OK\nCompleted %llu round trips in %u seconds, %llu rt/s.\n",
+        TPRINTF("OK\nCompleted %" PRIu64 " round trips in %u seconds, %" PRIu64 " rt/s.\n",
             count, DURATION_SECS, count / DURATION_SECS);
         

uspace/app/tester/ipc/register.c

@@ -27 +27 @@
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -41 +42 @@
         unsigned int i;
         
-        TPRINTF("Connected phone %#x accepting\n", icall->in_phone_hash);
+        TPRINTF("Connected phone %" PRIun " accepting\n", icall->in_phone_hash);
         ipc_answer_0(iid, EOK);
         for (i = 0; i < MAX_CONNECTIONS; i++) {
@@ -55 +56 @@
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        TPRINTF("Phone %#x hung up\n", icall->in_phone_hash);
+                        TPRINTF("Phone %" PRIun " hung up\n", icall->in_phone_hash);
                         retval = 0;
                         break;
                 case IPC_TEST_METHOD:
-                        TPRINTF("Received well known message from %#x: %#x\n",
+                        TPRINTF("Received well known message from %" PRIun ": %" PRIun "\n",
                             icall->in_phone_hash, callid);
                         ipc_answer_0(callid, EOK);
                         break;
                 default:
-                        TPRINTF("Received unknown message from %#x: %#x\n",
+                        TPRINTF("Received unknown message from %" PRIun ": %" PRIun "\n",
                             icall->in_phone_hash, callid);
                         ipc_answer_0(callid, ENOENT);
@@ -78 +79 @@
         async_set_client_connection(client_connection);
         
-        ipcarg_t phonead;
+        sysarg_t phonead;
         int res = ipc_connect_to_me(PHONE_NS, IPC_TEST_SERVICE, 0, 0, &phonead);
         if (res != 0)

uspace/app/tester/print/print1.c

@@ -49 +49 @@
         TPRINTF("Real output:     \"%8.10s\"\n\n", "very long text");
         
-        TPRINTF("Testing printf(\"%%s\", NULL):\n");
-        TPRINTF("Expected output: \"(NULL)\"\n");
-        TPRINTF("Real output:     \"%s\"\n\n", NULL);
-        
         return NULL;
 }

uspace/app/tester/print/print2.c

@@ -33 +33 @@
 const char *test_print2(void)
 {
-        TPRINTF("Testing printf(\"%%c %%3.2c %%-3.2c %%2.3c %%-2.3c\", 'a', 'b', 'c', 'd', 'e'):\n");
-        TPRINTF("Expected output: [a] [  b] [c  ] [ d] [e ]\n");
-        TPRINTF("Real output:     [%c] [%3.2c] [%-3.2c] [%2.3c] [%-2.3c]\n\n", 'a', 'b', 'c', 'd', 'e');
+        TPRINTF("Testing printf(\"%%c\", 'a'):\n");
+        TPRINTF("Expected output: [a]\n");
+        TPRINTF("Real output:     [%c]\n\n", 'a');
         
         TPRINTF("Testing printf(\"%%d %%3.2d %%-3.2d %%2.3d %%-2.3d\", 1, 2, 3, 4, 5):\n");

uspace/app/tester/print/print4.c

@@ -45 +45 @@
                 TPRINTF("  ");
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wchar_t) ((group << 5) + index));
+                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
                 
                 TPRINTF("\n");
@@ -57 +57 @@
                 uint8_t index;
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wchar_t) ((group << 5) + index));
+                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
                 
                 TPRINTF("\n");

uspace/app/tester/stdio/stdio1.c

@@ -60 +60 @@
         
         buf[cnt] = '\0';
-        TPRINTF("Read %u bytes, string \"%s\"\n", cnt, buf);
+        TPRINTF("Read %zu bytes, string \"%s\"\n", cnt, buf);
         
         TPRINTF("Seek to beginning...");

uspace/app/tester/tester.c

@@ -51 +51 @@
 #include "print/print3.def"
 #include "print/print4.def"
+#include "print/print5.def"
 #include "console/console1.def"
 #include "stdio/stdio1.def"
@@ -63 +64 @@
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
+#include "hw/serial/serial1.def"
         {NULL, NULL, NULL, false}
 };
@@ -110 +112 @@
         }
         
+        unsigned int _len = (unsigned int) len;
+        if ((_len != len) || (((int) _len) < 0)) {
+                printf("Command length overflow\n");
+                return;
+        }
+        
         for (test = tests; test->name != NULL; test++)
-                printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+                printf("%-*s %s%s\n", _len, test->name, test->desc,
+                    (test->safe ? "" : " (unsafe)"));
         
-        printf("%-*s Run all safe tests\n", len, "*");
+        printf("%-*s Run all safe tests\n", _len, "*");
 }
 

uspace/app/tester/tester.h

@@ -68 +68 @@
 extern const char *test_print3(void);
 extern const char *test_print4(void);
+extern const char *test_print5(void);
 extern const char *test_console1(void);
 extern const char *test_stdio1(void);
@@ -80 +81 @@
 extern const char *test_loop1(void);
 extern const char *test_malloc1(void);
+extern const char *test_serial1(void);
 
 extern test_t tests[];

uspace/app/tester/thread/thread1.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include "../tester.h"
 
@@ -74 +75 @@
         atomic_set(&finish, 0);
         while (atomic_get(&threads_finished) < total) {
-                TPRINTF("Threads left: %u\n", total - atomic_get(&threads_finished));
+                TPRINTF("Threads left: %" PRIua "\n",
+                    total - atomic_get(&threads_finished));
                 sleep(1);
         }

uspace/app/tester/vfs/vfs1.c

@@ -105 +105 @@
         if (cnt < 0)
                 return "write() failed";
-        TPRINTF("Written %d bytes\n", cnt);
+        TPRINTF("Written %zd bytes\n", cnt);
         
         if (lseek(fd0, 0, SEEK_SET) != 0)
@@ -116 +116 @@
                         return "read() failed";
                 
-                TPRINTF("Read %d bytes: \".*s\"\n", cnt, cnt, buf);
+                int _cnt = (int) cnt;
+                if (_cnt != cnt) {
+                        /* Count overflow, just to be sure. */
+                        TPRINTF("Read %zd bytes\n", cnt);
+                } else {
+                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, _cnt, buf);
+                }
         }