Changeset 7048773 in mainline

Timestamp:

2006-03-19T12:43:37Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

4c61e60

Parents:

0a862b65

Message:

More IPC added syscall for hangup and some tests.

Files:

• init/init.c (modified) (4 diffs)
• libipc/generic/ipc.c (modified) (1 diff)
• libipc/include/ipc.h (modified) (2 diffs)
• libipc/include/ns.h (modified) (1 diff)
• ns/ns.c (modified) (2 diffs)

init/init.c

@@ -35 +35 @@
 #include <thread.h>
 
+int a;
+
 extern void utest(void *arg);
 void utest(void *arg)
@@ -170 +172 @@
                 ipc_answer(callid, 0, 0, 0);
         }
-        callid = ipc_wait_for_call(&data, NULL);
+//      callid = ipc_wait_for_call(&data, NULL);
 }
 
@@ -183 +185 @@
         printf("pinging.\n");
         res = ipc_call_sync(res, NS_PING, 0xbeef,&result);
-        printf("Retval: %d - received: %zd\n", res, result);
+        printf("Retval: %d - received: %X\n", res, result);
         
+}
+
+static void test_hangup(void)
+{
+        int phoneid;
+        ipc_call_t data;
+        ipc_callid_t callid;
+        int i;
+
+        printf("Starting connect...\n");
+        phoneid = ipc_connect_me_to(PHONE_NS, 10, 20);
+        printf("Phoneid: %d, pinging\n", phoneid);
+        ipc_call_async_2(PHONE_NS, NS_PING, 1, 0xbeefbee2,
+                         "Pong1", got_answer);
+        printf("Hangin up\n");
+        ipc_hangup(phoneid);
+        printf("Connecting\n");
+        phoneid = ipc_connect_me_to(PHONE_NS, 10, 20);
+        printf("Newphid: %d\n", phoneid);
+        for (i=0; i < 1000; i++) {
+                if ((callid=ipc_wait_for_call(&data, IPC_WAIT_NONBLOCKING)))
+                        printf("callid: %d\n");
+        }
+        printf("New new phoneid: %d\n", ipc_connect_me_to(PHONE_NS, 10, 20));
+}
+
+static void test_slam(void)
+{
+        int i;
+        ipc_call_t data;
+        ipc_callid_t callid;
+
+        printf("ping");
+        ipc_call_async_2(PHONE_NS, NS_PING, 1, 0xbeefbee2,
+                         "Pong1", got_answer);
+        printf("slam");
+        ipc_call_async_2(PHONE_NS, NS_HANGUP, 1, 0xbeefbee2,
+                         "Hang", got_answer);
+        printf("ping2\n");
+        ipc_call_async_2(PHONE_NS, NS_PING, 1, 0xbeefbee2,
+                         "Ping2", got_answer);
+        
+        for (i=0; i < 1000; i++) {
+                if ((callid=ipc_wait_for_call(&data, IPC_WAIT_NONBLOCKING)))
+                        printf("callid: %d\n");
+        }
+        ipc_call_async_2(PHONE_NS, NS_PING, 1, 0xbeefbee2,
+                         "Pong1", got_answer);
+        printf("Closing file\n");
+        ipc_hangup(PHONE_NS);
+        ipc_call_async_2(PHONE_NS, NS_PING, 1, 0xbeefbee2,
+                         "Pong1", got_answer);
+        ipc_wait_for_call(&data, 0);
 }
 
@@ -196 +251 @@
 //      test_async_ipc();
 //      test_advanced_ipc();
-        test_connection_ipc();
-        
-        if ((tid = thread_create(utest, NULL, "utest") != -1)) {
-                printf("Created thread tid=%d\n", tid);
-        }
-        
+//      test_connection_ipc();
+//      test_hangup();
+        test_slam();
+
+//      if ((tid = thread_create(utest, NULL, "utest") != -1)) {
+//              printf("Created thread tid=%d\n", tid);
+//      }
         return 0;
 }

libipc/generic/ipc.c

@@ -253 +253 @@
 }
 
+/* Hang up specified phone */
+int ipc_hangup(int phoneid)
+{
+        return __SYSCALL1(SYS_IPC_HANGUP, phoneid);
+}

libipc/include/ipc.h

@@ -35 +35 @@
 
 typedef sysarg_t ipcarg_t;
-typedef sysarg_t ipc_data_t[IPC_CALL_LEN];
+typedef struct {
+        sysarg_t args[IPC_CALL_LEN];
+        sysarg_t phoneid;
+} ipc_data_t ;
 typedef struct {
         unsigned long long taskid;
@@ -66 +69 @@
                       unsigned long long *taskid);
 int ipc_connect_me_to(int phoneid, int arg1, int arg2);
+int ipc_hangup(int phoneid);
 
 #endif

libipc/include/ns.h

@@ -32 +32 @@
 #define NS_PING      1024
 #define NS_PING_SVC  1025
+#define NS_HANGUP    1026
 
 #endif

ns/ns.c

@@ -15 +15 @@
         ipcarg_t retval, arg1, arg2;
 
-        printf("Name service started.\n");
+        printf("NS:Name service started.\n");
         while (1) {
+                call.taskid = -1;
                 callid = ipc_wait_for_call(&call, 0);
-                printf("Received call from: %P..%llX\n", &call.taskid,call.taskid);
+                printf("NS:Call task=%llX,phone=%lX..", 
+                       call.taskid,call.data.phoneid);
                 switch (IPC_GET_METHOD(call.data)) {
-                case IPC_M_CONNECTTOME:
-                        printf("Somebody wants to connect with phoneid %zd...accepting\n", IPC_GET_ARG3(call.data));
+                case IPC_M_PHONE_HUNGUP:
+                        printf("Phone hung up.\n");
+                        retval = 0;
+                        break;
+                case IPC_M_CONNECT_TO_ME:
+                        printf("Somebody connecting phid=%zd.\n", IPC_GET_ARG3(call.data));
                         service = IPC_GET_ARG3(call.data);
                         retval = 0;
                         break;
-                case IPC_M_CONNECTMETO:
-                        printf("Somebody wants to connect to: %zd\n",
+                case IPC_M_CONNECT_ME_TO:
+                        printf("Connectmeto: %zd\n",
                                IPC_GET_ARG1(call.data));
                         retval = 0;
@@ -37 +43 @@
                         arg2 = 0xbeef;
                         break;
+                case NS_HANGUP:
+                        printf("Closing connection.\n");
+                        retval = EHANGUP;
+                        break;
                 case NS_PING_SVC:
-                        printf("Pinging service %d\n", service);
+                        printf("NS:Pinging service %d\n", service);
                         ipc_call_sync(service, NS_PING, 0xbeef, 0);
-                        printf("Got pong\n");
+                        printf("NS:Got pong\n");
                         break;
                 default: