Changes in src/libcfa/concurrency/alarm.c [4aa2fb2:1c273d0]

File:

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

src/libcfa/concurrency/alarm.c

@@ -16 +16 @@
 
 extern "C" {
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
 #include <time.h>
+#include <unistd.h>
 #include <sys/time.h>
 }
@@ -22 +26 @@
 #include "alarm.h"
 #include "kernel_private.h"
+#include "libhdr.h"
 #include "preemption.h"
 
@@ -31 +36 @@
         timespec curr;
         clock_gettime( CLOCK_REALTIME, &curr );
-        return ((__cfa_time_t)curr.tv_sec * TIMEGRAN) + curr.tv_nsec;
+        __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 ) {
+        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
@@ -71 +79 @@
 }
 
+LIB_DEBUG_DO( bool validate( alarm_list_t * this ) {
+        alarm_node_t ** it = &this->head;
+        while( (*it) ) {
+                it = &(*it)->next;
+        }
+
+        return it == this->tail;
+})
+
 static inline void insert_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t p ) {
-        assert( !n->next );
+        verify( !n->next );
         if( p == this->tail ) {
                 this->tail = &n->next;
@@ -80 +97 @@
         }
         *p = n;
+
+        verify( validate( this ) );
 }
 
@@ -89 +108 @@
 
         insert_at( this, n, it );
+
+        verify( validate( this ) );
 }
 
@@ -100 +121 @@
                 head->next = NULL;
         }
+        verify( validate( this ) );
         return head;
 }
@@ -105 +127 @@
 static inline void remove_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t it ) {
         verify( it );
-        verify( (*it)->next == n );
+        verify( (*it) == n );
 
-        (*it)->next = n->next;
+        (*it) = n->next;
         if( !n-> next ) {
                 this->tail = it;
         }
         n->next = NULL;
+
+        verify( validate( this ) );
 }
 
 static inline void remove( alarm_list_t * this, alarm_node_t * n ) {
         alarm_node_t ** it = &this->head;
-        while( (*it) && (*it)->next != n ) {
+        while( (*it) && (*it) != n ) {
                 it = &(*it)->next;
         }
 
+        verify( validate( this ) );
+
         if( *it ) { remove_at( this, n, it ); }
+
+        verify( validate( this ) );
 }
 
 void register_self( alarm_node_t * this ) {
         disable_interrupts();
-        assert( !systemProcessor->pending_alarm );
-        lock( &systemProcessor->alarm_lock );
+        verify( !systemProcessor->pending_alarm );
+        lock( &systemProcessor->alarm_lock, __PRETTY_FUNCTION__ );
         {
+                verify( validate( &systemProcessor->alarms ) );
+                bool first = !systemProcessor->alarms.head;
+
                 insert( &systemProcessor->alarms, this );
                 if( systemProcessor->pending_alarm ) {
                         tick_preemption();
                 }
+                if( first ) {
+                        __kernel_set_timer( systemProcessor->alarms.head->alarm - __kernel_get_time() );
+                }
         }
         unlock( &systemProcessor->alarm_lock );
         this->set = true;
-        enable_interrupts();
+        enable_interrupts( __PRETTY_FUNCTION__ );
 }
 
 void unregister_self( alarm_node_t * this ) {
+        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : unregister %p start\n", this );
         disable_interrupts();
-        lock( &systemProcessor->alarm_lock );
-        remove( &systemProcessor->alarms, this );
+        lock( &systemProcessor->alarm_lock, __PRETTY_FUNCTION__ );
+        {
+                verify( validate( &systemProcessor->alarms ) );
+                remove( &systemProcessor->alarms, this );
+        }
         unlock( &systemProcessor->alarm_lock );
         disable_interrupts();
         this->set = false;
+        // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Kernel : unregister %p end\n", this );
 }