Changeset 2d11a7d8 in mainline for uspace/app/tester/ipc

Timestamp:

2009-06-30T15:54:14Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9c40f883

Parents:

db24058

Message:

tester framework rewrite (go from a menu-driven interface to command-line interface)

Location:

uspace/app/tester/ipc

Files:

• answer.c (deleted)
• answer.def (deleted)
• connect.c (modified) (1 diff)
• hangup.def (deleted)
• ping_pong.c (modified) (3 diffs)
• register.c (modified) (1 diff)
• send_async.c (deleted)
• send_async.def (deleted)
• send_sync.c (deleted)
• send_sync.def (deleted)

uspace/app/tester/ipc/connect.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <atomic.h>
 #include "../tester.h"
 
-char * test_connect(bool quiet)
+static atomic_t finish;
+
+static void callback(void *priv, int retval, ipc_call_t *data)
 {
-        char c;
-        int svc;
-        int phid;
+        atomic_set(&finish, 1);
+}
 
-        printf("Choose one service: 0:10000....9:10009 (q to skip)\n");
-        do {
-                c = getchar();
-                if ((c == 'Q') || (c == 'q'))
-                        return TEST_SKIPPED;
-        } while (c < '0' || c > '9');
+char *test_connect(void)
+{
+        TPRINTF("Connecting to %u...", IPC_TEST_SERVICE);
+        int phone = ipc_connect_me_to(PHONE_NS, IPC_TEST_SERVICE, 0, 0);
+        if (phone > 0) {
+                TPRINTF("phoneid %d\n", phone);
+        } else {
+                TPRINTF("\n");
+                return "ipc_connect_me_to() failed";
+        }
         
-        svc = IPC_TEST_START + c - '0';
-        if (svc == myservice)
-                return "Currently cannot connect to myself, update test";
+        printf("Sending synchronous message...\n");
+        int retval = ipc_call_sync_0_0(phone, IPC_TEST_METHOD);
+        TPRINTF("Received response to synchronous message\n");
         
-        printf("Connecting to %d..", svc);
-        phid = ipc_connect_me_to(PHONE_NS, svc, 0, 0);
-        if (phid > 0) {
-                printf("phoneid: %d\n", phid);
-                phones[phid] = 1;
-        } else
-                return "Error";
+        TPRINTF("Sending asynchronous message...\n");
+        atomic_set(&finish, 0);
+        ipc_call_async_0(phone, IPC_TEST_METHOD, NULL, callback, 1);
+        while (atomic_get(&finish) != 1)
+                TPRINTF(".");
+        TPRINTF("Received response to asynchronous message\n");
+        
+        TPRINTF("Hanging up...");
+        retval = ipc_hangup(phone);
+        if (retval == 0) {
+                TPRINTF("OK\n");
+        } else {
+                TPRINTF("\n");
+                return "ipc_hangup() failed";
+        }
         
         return NULL;

uspace/app/tester/ipc/ping_pong.c

@@ -38 +38 @@
 #define COUNT_GRANULARITY  100
 
-char *test_ping_pong(bool quiet)
+char *test_ping_pong(void)
 {
-        printf("Pinging ns server for %d seconds...\n", DURATION_SECS);
+        TPRINTF("Pinging ns server for %d seconds...", DURATION_SECS);
         
         struct timeval start;
-        if (gettimeofday(&start, NULL) != 0)
-                return "Failed getting the time.";
+        if (gettimeofday(&start, NULL) != 0) {
+                TPRINTF("\n");
+                return "Failed getting the time";
+        }
         
         uint64_t count = 0;
-        
         while (true) {
                 struct timeval now;
-                if (gettimeofday(&now, NULL) != 0)
-                        return "Failed getting the time.";
+                if (gettimeofday(&now, NULL) != 0) {
+                        TPRINTF("\n");
+                        return "Failed getting the time";
+                }
                 
                 if (tv_sub(&now, &start) >= DURATION_SECS * 1000000L)
@@ -60 +63 @@
                         int retval = async_req_0_0(PHONE_NS, NS_PING);
                         
-                        if (retval != EOK)
-                                return "Failed to send ping message.";
+                        if (retval != EOK) {
+                                TPRINTF("\n");
+                                return "Failed to send ping message";
+                        }
                 }
                 
@@ -67 +72 @@
         }
         
-        printf("Completed %lu round trips in %u seconds, %lu RT/s.\n",
+        TPRINTF("OK\nCompleted %llu round trips in %u seconds, %llu rt/s.\n",
             count, DURATION_SECS, count / DURATION_SECS);
         

uspace/app/tester/ipc/register.c

@@ -33 +33 @@
 #include "../tester.h"
 
+#define MAX_CONNECTIONS  50
+
+static int connections[MAX_CONNECTIONS];
+
 static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-        ipc_callid_t callid;
-        ipc_call_t call;
-        ipcarg_t phonehash = icall->in_phone_hash;
-        int retval;
-        int i;
-
-        printf("Connected phone: %P, accepting\n", icall->in_phone_hash);
+        unsigned int i;
+        
+        TPRINTF("Connected phone %#x accepting\n", icall->in_phone_hash);
         ipc_answer_0(iid, EOK);
-        for (i = 0; i < 1024; i++)
+        for (i = 0; i < MAX_CONNECTIONS; i++) {
                 if (!connections[i]) {
-                        connections[i] = phonehash;
+                        connections[i] = icall->in_phone_hash;
                         break;
                 }
+        }
         
-        while (1) {
-                callid = async_get_call(&call);
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                int retval;
+                
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        printf("Phone (%P) hung up.\n", phonehash);
+                        TPRINTF("Phone %#x hung up\n", icall->in_phone_hash);
                         retval = 0;
                         break;
+                case IPC_TEST_METHOD:
+                        TPRINTF("Received well known message from %#x: %#x\n",
+                            icall->in_phone_hash, callid);
+                        ipc_answer_0(callid, EOK);
+                        break;
                 default:
-                        printf("Received message from %P: %X\n", phonehash,
-                            callid);
-                        for (i = 0; i < 1024; i++)
-                                if (!callids[i]) {
-                                        callids[i] = callid;
-                                        break;
-                                }
-                        continue;
+                        TPRINTF("Received unknown message from %#x: %#x\n",
+                            icall->in_phone_hash, callid);
+                        ipc_answer_0(callid, ENOENT);
+                        break;
                 }
-                ipc_answer_0(callid, retval);
         }
 }
 
-char * test_register(bool quiet)
+char *test_register(void)
 {
-        int i;
+        async_set_client_connection(client_connection);
         
-        async_set_client_connection(client_connection);
-
-        for (i = IPC_TEST_START; i < IPC_TEST_START + 10; i++) {
-                ipcarg_t phonead;
-                int res = ipc_connect_to_me(PHONE_NS, i, 0, 0, &phonead);
-                if (!res)
-                        break;
-                printf("Failed registering as %d..:%d\n", i, res);
-        }
-        printf("Registered as service: %d\n", i);
-        myservice = i;
+        ipcarg_t phonead;
+        int res = ipc_connect_to_me(PHONE_NS, IPC_TEST_SERVICE, 0, 0, &phonead);
+        if (res != 0)
+                return "Failed registering IPC service";
+        
+        TPRINTF("Registered as service %u, accepting connections\n", IPC_TEST_SERVICE);
+        async_manager();
         
         return NULL;