Changeset 0b99e40 in mainline

Timestamp:

2006-05-28T18:22:10Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

2d1fde3b

Parents:

7f5b37a

Message:

Rough implementation of gettimeofday.
IPC_M_RECV_AS doesn't allow us to specify additional user parametrs. That
doesn't seem to be very configurable :-/

Files:

• init/init.c (modified) (3 diffs)
• libc/Makefile (modified) (1 diff)
• libc/generic/async.c (modified) (4 diffs)
• libc/generic/time.c (added)
• libc/include/ipc/services.h (modified) (1 diff)
• libc/include/time.h (added)
• ns/ns.c (modified) (3 diffs)

init/init.c

@@ -45 +45 @@
 #include <ipc/fb.h>
 #include <async.h>
+#include <time.h>
 
 int a;
@@ -402 +403 @@
 }
 
+static void test_time(void)
+{
+        int rc;
+        struct timeval tv;
+        struct timezone tz;
+
+        while (1) {
+                rc = gettimeofday(&tv, &tz);
+                printf("Rc: %d, Secs: %d, Usecs: %d\n", rc, tv.tv_sec,
+                       tv.tv_usec);
+        }
+}
 
 int main(int argc, char *argv[])
@@ -421 +434 @@
 //      test_pci();
 //      test_kbd();
-        test_async_kbd();
+        test_time();
+//      test_async_kbd();
 //      test_fb();
 

libc/Makefile

@@ -66 +66 @@
         generic/async.c \
         generic/libadt/list.o \
-        generic/libadt/hash_table.o
+        generic/libadt/hash_table.o \
+        generic/time.c
 
 ARCH_SOURCES += \

libc/generic/async.c

@@ -332 +332 @@
         ipc_call_t call;
         ipc_callid_t callid;
+        int timeout;
 
         while (1) {
@@ -340 +341 @@
                         continue;
                 }
-                callid = ipc_wait_cycle(&call,SYNCH_NO_TIMEOUT,SYNCH_BLOCKING);
+/*
+                if (expires)
+                        timeout = .... ;
+                else
+*/
+                        timeout = SYNCH_NO_TIMEOUT;
+                callid = ipc_wait_cycle(&call, timeout, SYNCH_BLOCKING);
+
+                if (!callid) {
+//                      handle_expired_timeouts.......;
+                        continue;
+                }
 
                 if (callid & IPC_CALLID_ANSWERED)
@@ -405 +417 @@
         if (msg->dataptr)
                 *msg->dataptr = *data; 
-        
+
+        /* TODO: memory barrier?? */
         msg->done = 1;
         if (! msg->active) {
@@ -461 +474 @@
         free(msg);
 }
+
+
+/* int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, int timeout) */
+/* { */
+/*      amsg_t *msg = (amsg_t *) amsgid; */
+/*      connection_t *conn; */
+
+/*      futex_down(&async_futex); */
+/*      if (msg->done) { */
+/*              futex_up(&async_futex); */
+/*              goto done; */
+/*      } */
+
+/*      msg->ptid = psthread_get_id(); */
+/*      msg->active = 0; */
+/*      msg->expires = gettime() + timeout; */
+/*      setup_timeouts_etc...(); */
+
+/*      /\* Leave locked async_futex when entering this function *\/ */
+/*      psthread_schedule_next_adv(PS_TO_MANAGER); */
+/*      /\* futex is up automatically after psthread_schedule_next...*\/ */
+
+/*      if (!msg->done) */
+/*              return casy-casy; */
+
+/*      /\* TODO: When memory barrier in reply_received, we can skip this *\/ */
+/*      futex_down(&async_futex); */
+/*      futex_up(&async_futex); */
+/* done: */
+        
+/*      if (retval) */
+/*              *retval = msg->retval; */
+/*      free(msg); */
+/* } */
+

libc/include/ipc/services.h

@@ -38 +38 @@
 #define SERVICE_FRAME_BUFFER    2
 #define SERVICE_KEYBOARD        3
-#define SERVICE_VIDEO   4
+#define SERVICE_VIDEO           4
+
+/* Memory area to be received from NS */
+#define SERVICE_MEM_REALTIME    1
 
 #endif

ns/ns.c

@@ -41 +41 @@
 #include <libadt/list.h>
 #include <libadt/hash_table.h>
+#include <sysinfo.h>
+#include <ddi.h>
+#include <as.h>
 
 #define NAME    "NS"
@@ -73 +76 @@
 
 int static ping_phone;
+
+static void get_realtime_as(ipc_callid_t callid, ipc_call_t *call)
+{
+        static void *addr = NULL;
+        void *ph_addr;
+
+        if (IPC_GET_ARG3(*call) != (AS_AREA_READ | AS_AREA_CACHEABLE)) {
+                ipc_answer_fast(callid, EPERM, 0, 0);
+                return;
+        }
+        if (!addr) {
+                ph_addr = (void *)sysinfo_value("clock.faddr");
+                if (!ph_addr) {
+                        ipc_answer_fast(callid, ENOENT, 0, 0);
+                        return;
+                }
+                addr = (void *)(200*1024*1024); /* TODO: intelligent freemem space */
+                map_physmem(task_get_id(), ph_addr, addr, 1,
+                            AS_AREA_READ | AS_AREA_CACHEABLE);
+        }
+        ipc_answer_fast(callid, 0, (ipcarg_t)addr, 0);
+}
 
 int main(int argc, char **argv)
@@ -103 +128 @@
 //                              printf("Failed answer: %d\n", retval);
                         continue;
-                        break;
+                case IPC_M_AS_AREA_RECV:
+                        get_realtime_as(callid, &call);
+                        continue;
                 case IPC_M_INTERRUPT:
-//                      printf("GOT INTERRUPT: %c\n", IPC_GET_ARG2(call));
                         break;
                 case IPC_M_PHONE_HUNGUP:
-//                      printf("Phone hung up.\n");
                         retval = 0;
                         break;