Changeset d6e5cbc in mainline for generic/src

Timestamp:

2006-05-28T18:17:36Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

5552d60

Parents:

3bf5976

Message:

Added 'realtime' clock interface.
Added some asm macros as memory barriers.
Added drift computing for mips platform.

Location:

generic/src

Files:

• ipc/sysipc.c (modified) (2 diffs)
• main/main.c (modified) (2 diffs)
• mm/as.c (modified) (1 diff)
• time/clock.c (modified) (2 diffs)

generic/src/ipc/sysipc.c

@@ -152 +152 @@
                         ipl_t ipl;
                         as_t *as;
+                        int rc;
                         
                         ipl = interrupts_disable();
@@ -159 +160 @@
                         interrupts_restore(ipl);
                         
-                        return as_area_share(AS, IPC_GET_ARG1(answer->data), IPC_GET_ARG2(*olddata),
-                                             as, IPC_GET_ARG1(*olddata), IPC_GET_ARG3(*olddata));
+                        rc = as_area_share(AS, IPC_GET_ARG1(answer->data), IPC_GET_ARG2(*olddata),
+                                           as, IPC_GET_ARG1(*olddata), IPC_GET_ARG3(*olddata));
+                        IPC_SET_RETVAL(answer->data, rc);
                 }
         }

generic/src/main/main.c

@@ -198 +198 @@
         tlb_init();
         config.mm_initialized = true;
-        arch_post_mm_init();    
+        arch_post_mm_init();
 
         version_print();
@@ -213 +213 @@
         
         calibrate_delay_loop();
+        clock_counter_init();
         timeout_init();
         scheduler_init();

generic/src/mm/as.c

@@ -478 +478 @@
         mem_backend_t *src_backend;
         mem_backend_data_t src_backend_data;
-
+        
         ipl = interrupts_disable();
         mutex_lock(&src_as->lock);

generic/src/time/clock.c

@@ -49 +49 @@
 #include <atomic.h>
 #include <proc/thread.h>
+#include <sysinfo/sysinfo.h>
+#include <arch/barrier.h>
+
+/* Pointers to public variables with time */
+struct ptime {
+        __native seconds;
+        __native useconds;
+        __native useconds2;
+};
+struct ptime *public_time;
+/* Variable holding fragment of second, so that we would update
+ * seconds correctly
+ */
+static __native secfrag = 0;
+
+/** Initialize realtime clock counter
+ *
+ * The applications (and sometimes kernel) need to access accurate
+ * information about realtime data. We allocate 1 page with these 
+ * data and update it periodically.
+ *
+ * 
+ */
+void clock_counter_init(void)
+{
+        void *faddr;
+
+        faddr = (void *)PFN2ADDR(frame_alloc(0, FRAME_ATOMIC));
+        if (!faddr)
+                panic("Cannot allocate page for clock");
+        
+        public_time = (struct ptime *)PA2KA(faddr);
+
+        /* TODO: We would need some arch dependent settings here */
+        public_time->seconds = 0;
+        public_time->useconds = 0; 
+
+        sysinfo_set_item_val("clock.faddr", NULL, (__native)faddr);
+}
+
+
+/** Update public counters
+ *
+ * Update it only on first processor
+ * TODO: Do we really need so many write barriers? 
+ */
+static void clock_update_counters(void)
+{
+        if (CPU->id == 0) {
+                secfrag += 1000000/HZ;
+                if (secfrag >= 1000000) {
+                        public_time->useconds = 0;
+                        write_barrier();
+                        public_time->seconds++;
+                        secfrag = 0;
+                } else
+                        public_time->useconds += 1000000/HZ;
+                write_barrier();
+                public_time->useconds2 = public_time->useconds;
+                write_barrier();
+        }
+}
 
 /** Clock routine
@@ -70 +132 @@
          */
         for (i = 0; i <= CPU->missed_clock_ticks; i++) {
+                clock_update_counters();
                 spinlock_lock(&CPU->timeoutlock);
                 while ((l = CPU->timeout_active_head.next) != &CPU->timeout_active_head) {