Changeset 51dbadf3 in mainline

Timestamp:

2006-06-06T07:42:20Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

1890e312

Parents:

e9073f2

Message:

Added basic klog.
Added ipc tester.
TODO add serializing functions to psthread, so that the lines in klog won't intermix.

Files:

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

Makefile

@@ -40 +40 @@
         fb \
         console \
-        tetris
+        tetris \
+        ipcc \
+        klog
 
 ifeq ($(ARCH), amd64)

libc/generic/async.c

@@ -139 +139 @@
 
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
+static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call);
 static async_client_conn_t client_connection = default_client_connection;
+static async_client_conn_t interrupt_received = default_interrupt_received;
 
 /** Add microseconds to give timeval */
@@ -342 +344 @@
         ipc_answer_fast(callid, ENOENT, 0, 0);
 }
-
-/** Function that gets called on interrupt receival
- *
- * This function is defined as a weak symbol - to be redefined in
- * user code.
- */
-void interrupt_received(ipc_call_t *call)
-{
-}
-
+static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call)
+{
+}
 
 /** Wrapper for client connection thread
@@ -441 +436 @@
         switch (IPC_GET_METHOD(*call)) {
         case IPC_M_INTERRUPT:
-                interrupt_received(call);
+                (*interrupt_received)(callid,call);
                 return;
         case IPC_M_CONNECT_ME_TO:
@@ -758 +753 @@
         client_connection = conn;
 }
+void async_set_interrupt_received(async_client_conn_t conn)
+{
+        interrupt_received = conn;
+}

libc/generic/time.c

@@ -35 +35 @@
 #include <atomic.h>
 #include <futex.h>
+#include <ipc/services.h>
 
 #include <sysinfo.h>
@@ -68 +69 @@
                 /* Get the mapping of kernel clock */
                 res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, 
-                                      mapping, PAGE_SIZE, 0,
+                                      mapping, PAGE_SIZE, SERVICE_MEM_REALTIME,
                                       NULL,&rights,NULL);
                 if (res) {

libc/include/async.h

@@ -99 +99 @@
 void async_destroy_manager(void);
 void async_set_client_connection(async_client_conn_t conn);
+void async_set_interrupt_received(async_client_conn_t conn);
 int _async_init(void);
-
-/* Should be defined by application */
-void interrupt_received(ipc_call_t *call)  __attribute__((weak));
 
 

libc/include/ipc/services.h

@@ -42 +42 @@
 /* Memory area to be received from NS */
 #define SERVICE_MEM_REALTIME    1
+#define SERVICE_MEM_KLOG        2
 
 #endif

ns/ns.c

@@ -34 +34 @@
 #include <ipc/ipc.h>
 #include <ipc/ns.h>
+#include <ipc/services.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -77 +78 @@
 int static ping_phone;
 
-static void get_realtime_as(ipc_callid_t callid, ipc_call_t *call)
-{
-        static void *addr = NULL;
+static void *clockaddr = NULL;
+static void *klogaddr = NULL;
+
+static void get_as(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr)
+{
         void *ph_addr;
 
-        if (!addr) {
-                ph_addr = (void *)sysinfo_value("clock.faddr");
+        if (!*addr) {
+                ph_addr = (void *)sysinfo_value(name);
                 if (!ph_addr) {
                         ipc_answer_fast(callid, ENOENT, 0, 0);
                         return;
                 }
-                addr = as_get_mappable_page(PAGE_SIZE);
-                map_physmem(ph_addr, addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
-        }
-        ipc_answer_fast(callid, 0, (ipcarg_t)addr, AS_AREA_READ);
+                *addr = as_get_mappable_page(PAGE_SIZE);
+                map_physmem(ph_addr, *addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
+        }
+        ipc_answer_fast(callid, 0, (ipcarg_t)*addr, AS_AREA_READ);
 }
 
@@ -110 +113 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_AS_AREA_RECV:
-                        get_realtime_as(callid, &call);
+                        switch (IPC_GET_ARG3(call)) {
+                        case SERVICE_MEM_REALTIME:
+                                get_as(callid, &call, "clock.faddr", &clockaddr);
+                                break;
+                        case SERVICE_MEM_KLOG:
+                                get_as(callid, &call, "klog.faddr", &klogaddr);
+                                break;
+                        default:
+                                ipc_answer_fast(callid, ENOENT, 0, 0);
+                        }
                         continue;
                 case IPC_M_PHONE_HUNGUP: