Changeset 6119f24 in mainline for uspace/srv/ns/ns.c

Timestamp:

2011-01-29T18:58:24Z (13 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/srv/ns/ns.c (modified) (2 diffs)

uspace/srv/ns/ns.c

@@ -37 +37 @@
 
 #include <ipc/ipc.h>
-#include <ipc/services.h>
 #include <ipc/ns.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
-#include <as.h>
-#include <ddi.h>
-#include <event.h>
 #include <macros.h>
-#include <sysinfo.h>
 #include "ns.h"
 #include "service.h"
 #include "clonable.h"
 #include "task.h"
-
-static void *clockaddr = NULL;
-static void *klogaddr = NULL;
-
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *faddr,
-    size_t pages, void **addr)
-{
-        if ((faddr == NULL) || (pages == 0)) {
-                ipc_answer_0(callid, ENOENT);
-                return;
-        }
-        
-        if (*addr == NULL) {
-                *addr = as_get_mappable_page(pages * PAGE_SIZE);
-                
-                if (*addr == NULL) {
-                        ipc_answer_0(callid, ENOENT);
-                        return;
-                }
-                
-                if (physmem_map(faddr, *addr, pages,
-                    AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
-                        ipc_answer_0(callid, ENOENT);
-                        return;
-                }
-        }
-        
-        ipc_answer_2(callid, EOK, (sysarg_t) *addr, AS_AREA_READ);
-}
-
-static void setup_clock_area(ipc_callid_t callid, ipc_call_t *call, void **addr)
-{
-        uintptr_t faddr;
-        int err = sysinfo_get_value("clock.faddr", &faddr);
-        
-        if (err != EOK)
-                ipc_answer_0(callid, err);
-        
-        get_as_area(callid, call, (void *) faddr, 1, addr);
-}
-
-static void setup_klog_area(ipc_callid_t callid, ipc_call_t *call, void **addr)
-{
-        uintptr_t faddr;
-        int err = sysinfo_get_value("klog.faddr", &faddr);
-        
-        if (err != EOK)
-                ipc_answer_0(callid, err);
-        
-        size_t pages;
-        err = sysinfo_get_value("klog.pages", &pages);
-        
-        if (err != EOK)
-                ipc_answer_0(callid, err);
-        
-        get_as_area(callid, call, (void *) faddr, pages, addr);
-}
 
 int main(int argc, char **argv)
@@ -138 +75 @@
                 
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_SHARE_IN:
-                        switch (IPC_GET_ARG3(call)) {
-                        case SERVICE_MEM_REALTIME:
-                                setup_clock_area(callid, &call, &clockaddr);
-                                break;
-                        case SERVICE_MEM_KLOG:
-                                setup_klog_area(callid, &call, &klogaddr);
-                                break;
-                        default:
-                                ipc_answer_0(callid, ENOENT);
-                        }
-                        continue;
                 case IPC_M_PHONE_HUNGUP:
                         retval = ns_task_disconnect(&call);