Changeset 367 for trunk/kernel/kern/core.c

Timestamp:

Aug 14, 2017, 11:39:03 AM (7 years ago)

Author:

alain

Message:

Change Time unit from cycle to TICK (in millisecond).
Fix several bugs in VFS.

File:

• trunk/kernel/kern/core.c (modified) (5 diffs)

trunk/kernel/kern/core.c

@@ -47 +47 @@
         core->time_stamp        = 0;
         core->ticks_nr          = 0;
-        core->ticks_period      = CONFIG_SCHED_TICK_PERIOD;
         core->usage             = 0;
         core->spurious_irqs     = 0;
@@ -72 +71 @@
                     uint32_t * tm_us )
 {
-        uint64_t cycles = hal_get_cycles();
-
-        *tm_s  = (cycles / CONFIG_CYCLES_PER_MS);
-        *tm_us = (cycles % CONFIG_CYCLES_PER_MS) / (CONFIG_CYCLES_PER_MS / 1000000);
+        *tm_s  = (core->ticks_nr*CONFIG_SCHED_TICK_PERIOD)/1000;
+        *tm_us = (core->ticks_nr*CONFIG_SCHED_TICK_PERIOD*1000)%1000000;
 }
 
+/* deprecated 14/08/2017 [AG]
 //////////////////////////////////////
 void core_time_update( core_t * core )
@@ -99 +97 @@
         hal_fence();
 }
+*/
 
 ////////////////////////////////
@@ -105 +104 @@
         uint32_t ticks;
 
-        // update cycles and ticks counter
-        core_time_update( core );
-
-        // get current ticks number
-        ticks = core->ticks_nr;
+        // update ticks counter
+        ticks = core->ticks_nr++;
 
         // handle pending alarms TODO ??? [AG]
         // alarm_clock( &core->alarm_mgr , ticks );
 
-        // handle scheduler TODO  improve the scheduling condition ... AG
-        if( (ticks % 10) == 0 ) sched_yield( NULL );
-
-/*
-    // compute elapsed time, taking into account 32 bits register wrap
-    uint32_t elapsed;
-    uint32_t time_now   = hal_get_cycles();
-    uint32_t time_last  = this->time_last_check;
-    if( time_now < time_last ) elapsed = (0xFFFFFFFF - time_last) + time_now;
-        else                       elapsed = time_now - time_last;
-
-    // update thread time
-    this->time_last_check = time_now;
-
-        // check elapsed time
-        if( elapsed < CONFIG_CORE_CHECK_EVERY ) return false;
-    else                                    return true;
-*/
+        // handle scheduler
+        if( (ticks % CONFIG_SCHED_TICKS_PER_QUANTUM) == 0 ) sched_yield( NULL );
 
         // update DQDT TODO  This update should depend on the cluster identifier,
         // to avoid simultaneous updates from various clusters ... AG
-        if( ((ticks % CONFIG_DQDT_PERIOD) == 0) && (core->lid == 0) ) dqdt_global_update();
+        if( ((ticks % CONFIG_DQDT_TICKS_PER_QUANTUM) == 0) && (core->lid == 0) )
+        dqdt_global_update();
 }
 
@@ -171 +152 @@
 void core_reset_stats( core_t * core )
 {
-        core_time_update(core);
-
         core->ticks_nr              = 0;
         core->usage                 = 0;