Changeset 4e6fb8e for src/libcfa/concurrency/alarm.c

Timestamp:

Jun 16, 2017, 4:45:20 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ec35498

Parents:

70c2df8

Message:

Preemption with some bug fixes and much more debugging, still not working at 100%

File:

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

src/libcfa/concurrency/alarm.c

@@ -89 +89 @@
 }
 
+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 );
@@ -98 +107 @@
         }
         *p = n;
+
+        LIB_DEBUG_DO( assert( validate( this ) ) );
 }
 
@@ -107 +118 @@
 
         insert_at( this, n, it );
+
+        LIB_DEBUG_DO( assert( validate( this ) ) );
 }
 
@@ -118 +131 @@
                 head->next = NULL;
         }
+        LIB_DEBUG_DO( assert( validate( this ) ) );
         return head;
 }
@@ -123 +137 @@
 static inline void remove_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t it ) {
         assert( it );
-        assert( (*it)->next == n );
-
-        (*it)->next = n->next;
+        assert( (*it) == n );
+
+        (*it) = n->next;
         if( !n-> next ) {
                 this->tail = it;
         }
         n->next = NULL;
+
+        LIB_DEBUG_DO( assert( 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;
         }
 
+        LIB_DEBUG_DO( assert( validate( this ) ) );
+
         if( *it ) { remove_at( this, n, it ); }
+
+        LIB_DEBUG_DO( assert( validate( this ) ) );
 }
 
@@ -145 +165 @@
         assert( !systemProcessor->pending_alarm );
         lock( &systemProcessor->alarm_lock );
+        LIB_DEBUG_DO( assert( validate( &systemProcessor->alarms ) ) );
         {
                 bool first = !systemProcessor->alarms.head;
@@ -158 +179 @@
         unlock( &systemProcessor->alarm_lock );
         this->set = true;
-        enable_interrupts();
+        enable_interrupts( __PRETTY_FUNCTION__ );
 }
 
 void unregister_self( alarm_node_t * this ) {
+        LIB_DEBUG_DO(
+                char text[256];
+                __attribute__((unused)) int len = snprintf( text, 256, "Kernel : unregister %p start\n", this );
+                LIB_DEBUG_WRITE( STDERR_FILENO, text, len );
+        );
         disable_interrupts();
         lock( &systemProcessor->alarm_lock );
+        LIB_DEBUG_DO( assert( validate( &systemProcessor->alarms ) ) );
         remove( &systemProcessor->alarms, this );
         unlock( &systemProcessor->alarm_lock );
         disable_interrupts();
         this->set = false;
-}
+        LIB_DEBUG_DO(
+                len = snprintf( text, 256, "Kernel : unregister %p end\n", this );
+                LIB_DEBUG_WRITE( STDERR_FILENO, text, len );
+        );
+}