Changeset 6119f24 in mainline for uspace/lib/c/generic/time.c

Timestamp:

2011-01-29T18:58:24Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

10477601, 6aef742

Parents:

d7533c7

Message:

map klog area and clock page directly in tasks which require them (do not use the memory sharing from naming service via IPC)
this avoids the circular dependency between gettimeofday() and the async framework (as reported by Jakub Jermar)
it also simplifies the code of the naming service (the memory sharing was never strictly necessary, it was only a demonstrator)

File:

• uspace/lib/c/generic/time.c (modified) (2 diffs)

uspace/lib/c/generic/time.c

@@ -34 +34 @@
 
 #include <sys/time.h>
-#include <unistd.h>
+#include <time.h>
 #include <bool.h>
-#include <ipc/ns.h>
 #include <arch/barrier.h>
 #include <macros.h>
+#include <errno.h>
+#include <sysinfo.h>
+#include <as.h>
+#include <ddi.h>
 #include <libc.h>
-#include <time.h>
 
 /** Pointer to kernel shared variables with time */
@@ -137 +139 @@
 int gettimeofday(struct timeval *tv, struct timezone *tz)
 {
-        if (!ktime) {
-                ktime = service_realtime_share_in();
-                if (!ktime)
+        if (ktime == NULL) {
+                uintptr_t faddr;
+                int rc = sysinfo_get_value("clock.faddr", &faddr);
+                if (rc != EOK) {
+                        errno = rc;
                         return -1;
+                }
+                
+                void *addr = as_get_mappable_page(PAGE_SIZE);
+                if (addr == NULL) {
+                        errno = ENOMEM;
+                        return -1;
+                }
+                
+                rc = physmem_map((void *) faddr, addr, 1,
+                    AS_AREA_READ | AS_AREA_CACHEABLE);
+                if (rc != EOK) {
+                        as_area_destroy(addr);
+                        errno = rc;
+                        return -1;
+                }
+                
+                ktime = addr;
         }