Changes in libcfa/src/concurrency/alarm.cfa [d3ab183:2d8f7b0]

File:

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

libcfa/src/concurrency/alarm.cfa

@@ -51 +51 @@
         this.alarm = alarm;
         this.period = period;
+        next = 0;
         set = false;
         kernel_alarm = false;
@@ -59 +60 @@
         this.alarm = alarm;
         this.period = period;
+        next = 0;
         set = false;
         kernel_alarm = true;
@@ -69 +71 @@
 }
 
-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);
+#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;
         }
 
-        verify( validate( *this ) );
+        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 ) );
 }
 
 alarm_node_t * pop( alarm_list_t * this ) {
-        verify( validate( *this ) );
-        alarm_node_t * head = & (*this)`first;
+        alarm_node_t * head = this->head;
         if( head ) {
-                remove(*head);
+                this->head = head->next;
+                if( !head->next ) {
+                        this->tail = &this->head;
+                }
+                head->next = 0p;
         }
-        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();
@@ -100 +152 @@
         {
                 verify( validate( alarms ) );
-                bool first = ! & alarms`first;
+                bool first = !alarms->head;
 
-                insert( &alarms, this );
+                insert( alarms, this );
                 if( first ) {
-                        __kernel_set_timer( alarms`first.alarm - __kernel_get_time() );
+                        __kernel_set_timer( alarms->head->alarm - __kernel_get_time() );
                 }
         }
@@ -116 +168 @@
         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
         {
-                verify( validate( event_kernel->alarms ) );
-                remove( *this );
+                verify( validate( &event_kernel->alarms ) );
+                remove( &event_kernel->alarms, this );
         }
         unlock( event_kernel->lock );
@@ -135 +187 @@
 
         /* paranoid */ verify( !node.set );
-        /* paranoid */ verify( & node`next == 0p );
-        /* paranoid */ verify( & node`prev == 0p );
+        /* paranoid */ verify( node.next == 0p );
 }