Changeset c13e8dc8 for src/libcfa/concurrency/alarm.c

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

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

src/libcfa/concurrency/alarm.c

@@ -23 +23 @@
 }
 
-#include "libhdr.h"
-
 #include "alarm.h"
 #include "kernel_private.h"
@@ -110 +108 @@
 }
 
-LIB_DEBUG_DO( bool validate( alarm_list_t * this ) {
+__cfaabi_dbg_debug_do( bool validate( alarm_list_t * this ) {
         alarm_node_t ** it = &this->head;
         while( (*it) ) {
@@ -186 +184 @@
 
         disable_interrupts();
-        lock( event_kernel->lock DEBUG_CTX2 );
+        lock( event_kernel->lock __cfaabi_dbg_ctx2 );
         {
                 verify( validate( alarms ) );
@@ -198 +196 @@
         unlock( event_kernel->lock );
         this->set = true;
-        enable_interrupts( DEBUG_CTX );
+        enable_interrupts( __cfaabi_dbg_ctx );
 }
 
 void unregister_self( alarm_node_t * this ) {
         disable_interrupts();
-        lock( event_kernel->lock DEBUG_CTX2 );
+        lock( event_kernel->lock __cfaabi_dbg_ctx2 );
         {
                 verify( validate( &event_kernel->alarms ) );
@@ -209 +207 @@
         }
         unlock( event_kernel->lock );
-        enable_interrupts( DEBUG_CTX );
+        enable_interrupts( __cfaabi_dbg_ctx );
         this->set = false;
 }