Changes in src/libcfa/concurrency/alarm.c [6b0b624:47ecf2b]

File:

• src/libcfa/concurrency/alarm.c (modified) (8 diffs)

src/libcfa/concurrency/alarm.c

@@ +1 @@
+//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -9 +10 @@
 // Author           : Thierry Delisle
 // Created On       : Fri Jun 2 11:31:25 2017
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:35:18 2017
-// Update Count     : 1
+// Last Modified By : Thierry Delisle
+// Last Modified On : --
+// Update Count     : 0
 //
 
@@ -30 +31 @@
 
 //=============================================================================================
-// time type
-//=============================================================================================
-
-#define one_second         1_000_000_000ul
-#define one_milisecond         1_000_000ul
-#define one_microsecond            1_000ul
-#define one_nanosecond                 1ul
-
-__cfa_time_t zero_time = { 0 };
-
-void ?{}( __cfa_time_t * this ) { this->val = 0; }
-void ?{}( __cfa_time_t * this, zero_t zero ) { this->val = 0; }
-
-void ?{}( itimerval * this, __cfa_time_t * alarm ) {
-        this->it_value.tv_sec = alarm->val / one_second;                        // seconds
-        this->it_value.tv_usec = max( (alarm->val % one_second) / one_microsecond, 1000 ); // microseconds
-        this->it_interval.tv_sec = 0;
-        this->it_interval.tv_usec = 0;
-}
-
-
-void ?{}( __cfa_time_t * this, timespec * curr ) {
-        uint64_t secs  = curr->tv_sec;
-        uint64_t nsecs = curr->tv_nsec;
-        this->val = (secs * one_second) + nsecs;
-}
-
-__cfa_time_t ?=?( __cfa_time_t * this, zero_t rhs ) {
-        this->val = 0;
-        return *this;
-}
-
-__cfa_time_t from_s ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000_000ul; return ret; }
-__cfa_time_t from_ms( uint64_t val ) { __cfa_time_t ret; ret.val = val *     1_000_000ul; return ret; }
-__cfa_time_t from_us( uint64_t val ) { __cfa_time_t ret; ret.val = val *         1_000ul; return ret; }
-__cfa_time_t from_ns( uint64_t val ) { __cfa_time_t ret; ret.val = val *             1ul; return ret; }
-
-//=============================================================================================
 // Clock logic
 //=============================================================================================
@@ -74 +37 @@
         timespec curr;
         clock_gettime( CLOCK_REALTIME, &curr );
-        return (__cfa_time_t){ &curr };
+        __cfa_time_t curr_time = ((__cfa_time_t)curr.tv_sec * TIMEGRAN) + curr.tv_nsec;
+        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : current time is %lu\n", curr_time );
+        return curr_time;
 }
 
 void __kernel_set_timer( __cfa_time_t alarm ) {
-        itimerval val = { &alarm };
+        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : set timer to %lu\n", (__cfa_time_t)alarm );
+        itimerval val;
+        val.it_value.tv_sec = alarm / TIMEGRAN;                 // seconds
+        val.it_value.tv_usec = (alarm % TIMEGRAN) / ( TIMEGRAN / 1_000_000L ); // microseconds
+        val.it_interval.tv_sec = 0;
+        val.it_interval.tv_usec = 0;
         setitimer( ITIMER_REAL, &val, NULL );
 }
@@ -86 +56 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t * this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
+void ?{}( alarm_node_t * this, thread_desc * thrd, __cfa_time_t alarm = 0, __cfa_time_t period = 0 ) {
         this->thrd = thrd;
         this->alarm = alarm;
@@ -95 +65 @@
 }
 
-void ?{}( alarm_node_t * this, processor   * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
+void ?{}( alarm_node_t * this, processor   * proc, __cfa_time_t alarm = 0, __cfa_time_t period = 0 ) {
         this->proc = proc;
         this->alarm = alarm;
@@ -183 +153 @@
 
 void register_self( alarm_node_t * this ) {
-        alarm_list_t * alarms = &event_kernel->alarms;
+        disable_interrupts();
+        verify( !systemProcessor->pending_alarm );
+        lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
+        {
+                verify( validate( &systemProcessor->alarms ) );
+                bool first = !systemProcessor->alarms.head;
 
-        disable_interrupts();
-        lock( &event_kernel->lock DEBUG_CTX2 );
-        {
-                verify( validate( alarms ) );
-                bool first = !alarms->head;
-
-                insert( alarms, this );
+                insert( &systemProcessor->alarms, this );
+                if( systemProcessor->pending_alarm ) {
+                        tick_preemption();
+                }
                 if( first ) {
-                        __kernel_set_timer( alarms->head->alarm - __kernel_get_time() );
+                        __kernel_set_timer( systemProcessor->alarms.head->alarm - __kernel_get_time() );
                 }
         }
-        unlock( &event_kernel->lock );
+        unlock( &systemProcessor->alarm_lock );
         this->set = true;
         enable_interrupts( DEBUG_CTX );
@@ -202 +174 @@
 
 void unregister_self( alarm_node_t * this ) {
+        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : unregister %p start\n", this );
         disable_interrupts();
-        lock( &event_kernel->lock DEBUG_CTX2 );
+        lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
         {
-                verify( validate( &event_kernel->alarms ) );
-                remove( &event_kernel->alarms, this );
+                verify( validate( &systemProcessor->alarms ) );
+                remove( &systemProcessor->alarms, this );
         }
-        unlock( &event_kernel->lock );
+        unlock( &systemProcessor->alarm_lock );
         enable_interrupts( DEBUG_CTX );
         this->set = false;
+        // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Kernel : unregister %p end\n", this );
 }
-
-// Local Variables: //
-// mode: c //
-// tab-width: 4 //
-// End: //