Changeset 3d560060 for src/libcfa/concurrency/alarm.c
- Timestamp:
- Nov 30, 2017, 3:05:25 PM (7 years ago)
- 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:
- 557435e, 5da9d6a
- Parents:
- dd9b59e (diff), c2b9f21 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/libcfa/concurrency/alarm.c
rdd9b59e r3d560060 23 23 } 24 24 25 #include "libhdr.h"26 27 25 #include "alarm.h" 28 26 #include "kernel_private.h" … … 110 108 } 111 109 112 LIB_DEBUG_DO( bool validate( alarm_list_t * this ) {110 __cfaabi_dbg_debug_do( bool validate( alarm_list_t * this ) { 113 111 alarm_node_t ** it = &this->head; 114 112 while( (*it) ) { … … 186 184 187 185 disable_interrupts(); 188 lock( event_kernel->lock DEBUG_CTX2 );186 lock( event_kernel->lock __cfaabi_dbg_ctx2 ); 189 187 { 190 188 verify( validate( alarms ) ); … … 198 196 unlock( event_kernel->lock ); 199 197 this->set = true; 200 enable_interrupts( DEBUG_CTX);198 enable_interrupts( __cfaabi_dbg_ctx ); 201 199 } 202 200 203 201 void unregister_self( alarm_node_t * this ) { 204 202 disable_interrupts(); 205 lock( event_kernel->lock DEBUG_CTX2 );203 lock( event_kernel->lock __cfaabi_dbg_ctx2 ); 206 204 { 207 205 verify( validate( &event_kernel->alarms ) ); … … 209 207 } 210 208 unlock( event_kernel->lock ); 211 enable_interrupts( DEBUG_CTX);209 enable_interrupts( __cfaabi_dbg_ctx ); 212 210 this->set = false; 213 211 }
Note: See TracChangeset
for help on using the changeset viewer.