Changes in libcfa/src/concurrency/alarm.cfa [e0c235c:4aeaee5]

File:

• libcfa/src/concurrency/alarm.cfa (modified) (6 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -10 +10 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  5 08:41:36 2020
-// Update Count     : 69
+// Last Modified On : Wed Jun 17 16:11:35 2020
+// Update Count     : 75
 //
 
 #define __cforall_thread__
 
-extern "C" {
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/time.h>
-}
 
 #include "alarm.hfa"
-#include "kernel_private.hfa"
+#include "kernel/fwd.hfa"
 #include "preemption.hfa"
 
@@ -47 +45 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t & this, thread_desc * thrd, Time alarm, Duration period ) with( this ) {
+void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period) with( this ) {
         this.thrd = thrd;
         this.alarm = alarm;
         this.period = period;
-        next = 0;
         set = false;
-        kernel_alarm = false;
+        type = User;
 }
 
-void ?{}( alarm_node_t & this, processor   * proc, Time alarm, Duration period ) with( this ) {
+void ?{}( alarm_node_t & this, processor * proc, Time alarm, Duration period ) with( this ) {
         this.proc = proc;
         this.alarm = alarm;
         this.period = period;
-        next = 0;
         set = false;
-        kernel_alarm = true;
+        type = Kernel;
+}
+void ?{}( alarm_node_t & this, Alarm_Callback callback, Time alarm, Duration period ) with( this ) {
+        this.alarm = alarm;
+        this.period = period;
+        this.callback = callback;
+        set = false;
+        type = Callback;
 }
 
@@ -71 +74 @@
 }
 
-#if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__))
-bool validate( alarm_list_t * this ) {
-        alarm_node_t ** it = &this->head;
-        while( (*it) ) {
-                it = &(*it)->next;
+void insert( alarm_list_t * this, alarm_node_t * n ) {
+        alarm_node_t * it = & (*this)`first;
+        while( it && (n->alarm > it->alarm) ) {
+                it = & (*it)`next;
+        }
+        if ( it ) {
+                insert_before( *it, *n );
+        } else {
+                insert_last(*this, *n);
         }
 
-        return it == this->tail;
-}
-#endif
-
-static inline void insert_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t p ) {
-        verify( !n->next );
-        if( p == this->tail ) {
-                this->tail = &n->next;
-        }
-        else {
-                n->next = *p;
-        }
-        *p = n;
-
-        verify( validate( this ) );
-}
-
-void insert( alarm_list_t * this, alarm_node_t * n ) {
-        alarm_node_t ** it = &this->head;
-        while( (*it) && (n->alarm > (*it)->alarm) ) {
-                it = &(*it)->next;
-        }
-
-        insert_at( this, n, it );
-
-        verify( validate( this ) );
+        verify( validate( *this ) );
 }
 
 alarm_node_t * pop( alarm_list_t * this ) {
-        alarm_node_t * head = this->head;
+        verify( validate( *this ) );
+        alarm_node_t * head = & (*this)`first;
         if( head ) {
-                this->head = head->next;
-                if( !head->next ) {
-                        this->tail = &this->head;
-                }
-                head->next = 0p;
+                remove(*head);
         }
-        verify( validate( this ) );
+        verify( validate( *this ) );
         return head;
 }
 
-static inline void remove_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t it ) {
-        verify( it );
-        verify( (*it) == n );
-
-        (*it) = n->next;
-        if( !n-> next ) {
-                this->tail = it;
-        }
-        n->next = 0p;
-
-        verify( validate( this ) );
-}
-
-static inline void remove( alarm_list_t * this, alarm_node_t * n ) {
-        alarm_node_t ** it = &this->head;
-        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 ) {
-        alarm_list_t * alarms = &event_kernel->alarms;
+        alarm_list_t & alarms = event_kernel->alarms;
 
         disable_interrupts();
@@ -152 +105 @@
         {
                 verify( validate( alarms ) );
-                bool first = !alarms->head;
+                bool first = ! & alarms`first;
 
-                insert( alarms, this );
+                insert( &alarms, this );
                 if( first ) {
-                        __kernel_set_timer( alarms->head->alarm - __kernel_get_time() );
+                        __kernel_set_timer( alarms`first.alarm - __kernel_get_time() );
                 }
         }
@@ -168 +121 @@
         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
         {
-                verify( validate( &event_kernel->alarms ) );
-                remove( &event_kernel->alarms, this );
+                verify( validate( event_kernel->alarms ) );
+                remove( *this );
         }
         unlock( event_kernel->lock );
@@ -176 +129 @@
 }
 
+//=============================================================================================
+// Utilities
+//=============================================================================================
+
+void sleep( Duration duration ) {
+        alarm_node_t node = { active_thread(), __kernel_get_time() + duration, 0`s };
+
+        register_self( &node );
+        park();
+
+        /* paranoid */ verify( !node.set );
+        /* paranoid */ verify( & node`next == 0p );
+        /* paranoid */ verify( & node`prev == 0p );
+}
+
 // Local Variables: //
 // mode: c //