- File:
-
- 1 edited
-
src/libcfa/concurrency/monitor.c (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/libcfa/concurrency/monitor.c
r66298de r4cc9b13 23 23 //----------------------------------------------------------------------------- 24 24 // Forward declarations 25 static inline void set_owner ( monitor_desc * this, thread_desc * owner ); 26 static inline void set_owner ( monitor_desc ** storage, short count, thread_desc * owner ); 27 static inline void set_mask ( monitor_desc ** storage, short count, const __waitfor_mask_t & mask ); 28 static inline void reset_mask( monitor_desc * this ); 25 static inline void set_owner( monitor_desc * this, thread_desc * owner ); 26 static inline void set_owner( monitor_desc ** storage, short count, thread_desc * owner ); 27 static inline void set_mask ( monitor_desc ** storage, short count, const __waitfor_mask_t & mask ); 29 28 30 29 static inline thread_desc * next_thread( monitor_desc * this ); … … 73 72 #define monitor_restore restore( monitors, count, locks, recursions, masks ) 74 73 74 #define blockAndWake( thrd, cnt ) /* Create the necessary information to use the signaller stack */ \ 75 monitor_save; /* Save monitor states */ \ 76 BlockInternal( locks, count, thrd, cnt ); /* Everything is ready to go to sleep */ \ 77 monitor_restore; /* We are back, restore the owners and recursions */ \ 78 75 79 76 80 //----------------------------------------------------------------------------- … … 94 98 } 95 99 else if( this->owner == thrd) { 96 // We already have the monitor, just not ehow many times we took it100 // We already have the monitor, just not how many times we took it 97 101 verify( this->recursion > 0 ); 98 102 this->recursion += 1; … … 104 108 set_owner( this, thrd ); 105 109 106 // Reset mask107 reset_mask( this );108 109 110 LIB_DEBUG_PRINT_SAFE("Kernel : mon accepts \n"); 110 111 } … … 127 128 unlock( &this->lock ); 128 129 return; 129 }130 131 static void __enter_monitor_dtor( monitor_desc * this, fptr_t func ) {132 // Lock the monitor spinlock, lock_yield to reduce contention133 lock_yield( &this->lock DEBUG_CTX2 );134 thread_desc * thrd = this_thread;135 136 LIB_DEBUG_PRINT_SAFE("Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);137 138 139 if( !this->owner ) {140 LIB_DEBUG_PRINT_SAFE("Kernel : Destroying free mon %p\n", this);141 142 // No one has the monitor, just take it143 set_owner( this, thrd );144 145 unlock( &this->lock );146 return;147 }148 else if( this->owner == thrd) {149 // We already have the monitor... but where about to destroy it so the nesting will fail150 // Abort!151 abortf("Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.");152 }153 154 int count = 1;155 monitor_desc ** monitors = &this;156 __monitor_group_t group = { &this, 1, func };157 if( is_accepted( this, group) ) {158 LIB_DEBUG_PRINT_SAFE("Kernel : mon accepts dtor, block and signal it \n");159 160 // Wake the thread that is waiting for this161 __condition_criterion_t * urgent = pop( &this->signal_stack );162 verify( urgent );163 164 // Reset mask165 reset_mask( this );166 167 // Create the node specific to this wait operation168 wait_ctx_primed( this_thread, 0 )169 170 // Some one else has the monitor, wait for him to finish and then run171 BlockInternal( &this->lock, urgent->owner->waiting_thread );172 173 // Some one was waiting for us, enter174 set_owner( this, thrd );175 }176 else {177 LIB_DEBUG_PRINT_SAFE("Kernel : blocking \n");178 179 wait_ctx( this_thread, 0 )180 this->dtor_node = &waiter;181 182 // Some one else has the monitor, wait in line for it183 append( &this->entry_queue, thrd );184 BlockInternal( &this->lock );185 186 // BlockInternal will unlock spinlock, no need to unlock ourselves187 return;188 }189 190 LIB_DEBUG_PRINT_SAFE("Kernel : Destroying %p\n", this);191 192 130 } 193 131 … … 221 159 } 222 160 223 // Leave single monitor for the last time224 void __leave_dtor_monitor_desc( monitor_desc * this ) {225 LIB_DEBUG_DO(226 if( this_thread != this->owner ) {227 abortf("Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);228 }229 if( this->recursion != 1 ) {230 abortf("Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);231 }232 )233 }234 235 161 // Leave the thread monitor 236 162 // last routine called by a thread. … … 285 211 // Ctor for monitor guard 286 212 // Sorts monitors before entering 287 void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, fptr_t func) {213 void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() ) { 288 214 // Store current array 289 215 this.m = m; … … 303 229 this_thread->monitors.func = func; 304 230 305 //LIB_DEBUG_PRINT_SAFE("MGUARD : enter %d\n", count);231 LIB_DEBUG_PRINT_SAFE("MGUARD : enter %d\n", count); 306 232 307 233 // Enter the monitors in order … … 309 235 enter( group ); 310 236 311 //LIB_DEBUG_PRINT_SAFE("MGUARD : entered\n");237 LIB_DEBUG_PRINT_SAFE("MGUARD : entered\n"); 312 238 } 313 239 … … 315 241 // Dtor for monitor guard 316 242 void ^?{}( monitor_guard_t & this ) { 317 //LIB_DEBUG_PRINT_SAFE("MGUARD : leaving %d\n", this.count);243 LIB_DEBUG_PRINT_SAFE("MGUARD : leaving %d\n", this.count); 318 244 319 245 // Leave the monitors in order 320 246 leave( this.m, this.count ); 321 247 322 // LIB_DEBUG_PRINT_SAFE("MGUARD : left\n"); 323 324 // Restore thread context 325 this_thread->monitors.list = this.prev_mntrs; 326 this_thread->monitors.size = this.prev_count; 327 this_thread->monitors.func = this.prev_func; 328 } 329 330 331 // Ctor for monitor guard 332 // Sorts monitors before entering 333 void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, fptr_t func ) { 334 // Store current array 335 this.m = *m; 336 337 // Save previous thread context 338 this.prev_mntrs = this_thread->monitors.list; 339 this.prev_count = this_thread->monitors.size; 340 this.prev_func = this_thread->monitors.func; 341 342 // Update thread context (needed for conditions) 343 this_thread->monitors.list = m; 344 this_thread->monitors.size = 1; 345 this_thread->monitors.func = func; 346 347 __enter_monitor_dtor( this.m, func ); 348 } 349 350 351 // Dtor for monitor guard 352 void ^?{}( monitor_dtor_guard_t & this ) { 353 // Leave the monitors in order 354 __leave_dtor_monitor_desc( this.m ); 248 LIB_DEBUG_PRINT_SAFE("MGUARD : left\n"); 355 249 356 250 // Restore thread context … … 409 303 short thread_count = 0; 410 304 thread_desc * threads[ count ]; 411 __builtin_memset( threads, 0, sizeof( threads ) ); 305 for(int i = 0; i < count; i++) { 306 threads[i] = 0; 307 } 412 308 413 309 // Save monitor states … … 533 429 short max = count_max( mask ); 534 430 monitor_desc * mon_storage[max]; 535 __builtin_memset( mon_storage, 0, sizeof( mon_storage ) );536 431 short actual_count = aggregate( mon_storage, mask ); 537 432 538 LIB_DEBUG_PRINT_SAFE("Kernel : waitfor %d (s: %d, m: %d)\n", actual_count, mask.size, (short)max);539 540 433 if(actual_count == 0) return; 541 542 LIB_DEBUG_PRINT_SAFE("Kernel : waitfor internal proceeding\n");543 434 544 435 // Create storage for monitor context … … 554 445 555 446 if( next ) { 556 *mask.accepted = index;557 447 if( mask.clauses[index].is_dtor ) { 558 LIB_DEBUG_PRINT_SAFE("Kernel : dtor already there\n"); 559 verifyf( mask.clauses[index].size == 1 , "ERROR: Accepted dtor has more than 1 mutex parameter." ); 560 561 monitor_desc * mon2dtor = mask.clauses[index].list[0]; 562 verifyf( mon2dtor->dtor_node, "ERROR: Accepted monitor has no dtor_node." ); 563 564 __condition_criterion_t * dtor_crit = mon2dtor->dtor_node->criteria; 565 push( &mon2dtor->signal_stack, dtor_crit ); 566 567 unlock_all( locks, count ); 448 #warning case not implemented 568 449 } 569 450 else { 570 LIB_DEBUG_PRINT_SAFE("Kernel : thread present, baton-passing\n"); 571 572 // Create the node specific to this wait operation 573 wait_ctx_primed( this_thread, 0 ); 574 575 // Save monitor states 576 monitor_save; 577 578 // Set the owners to be the next thread 579 set_owner( monitors, count, next ); 580 581 // Everything is ready to go to sleep 582 BlockInternal( locks, count, &next, 1 ); 583 584 // We are back, restore the owners and recursions 585 monitor_restore; 586 587 LIB_DEBUG_PRINT_SAFE("Kernel : thread present, returned\n"); 451 blockAndWake( &next, 1 ); 588 452 } 589 453 590 LIB_DEBUG_PRINT_SAFE("Kernel : accepted %d\n", *mask.accepted); 591 592 return; 454 return index; 593 455 } 594 456 } … … 596 458 597 459 if( duration == 0 ) { 598 LIB_DEBUG_PRINT_SAFE("Kernel : non-blocking, exiting\n");599 600 460 unlock_all( locks, count ); 601 602 LIB_DEBUG_PRINT_SAFE("Kernel : accepted %d\n", *mask.accepted);603 461 return; 604 462 } … … 607 465 verifyf( duration < 0, "Timeout on waitfor statments not supported yet."); 608 466 609 LIB_DEBUG_PRINT_SAFE("Kernel : blocking waitfor\n");610 611 // Create the node specific to this wait operation612 wait_ctx_primed( this_thread, 0 );613 467 614 468 monitor_save; 615 469 set_mask( monitors, count, mask ); 616 470 617 for(int i = 0; i < count; i++) { 618 verify( monitors[i]->owner == this_thread ); 619 } 620 621 //Everything is ready to go to sleep 622 BlockInternal( locks, count ); 623 624 625 // WE WOKE UP 626 627 628 //We are back, restore the masks and recursions 629 monitor_restore; 630 631 LIB_DEBUG_PRINT_SAFE("Kernel : exiting\n"); 632 633 LIB_DEBUG_PRINT_SAFE("Kernel : accepted %d\n", *mask.accepted); 471 BlockInternal( locks, count ); // Everything is ready to go to sleep 472 //WE WOKE UP 473 monitor_restore; //We are back, restore the masks and recursions 634 474 } 635 475 … … 638 478 639 479 static inline void set_owner( monitor_desc * this, thread_desc * owner ) { 640 //LIB_DEBUG_PRINT_SAFE("Kernal : Setting owner of %p to %p ( was %p)\n", this, owner, this->owner );480 LIB_DEBUG_PRINT_SAFE("Kernal : Setting owner of %p to %p ( was %p)\n", this, owner, this->owner ); 641 481 642 482 //Pass the monitor appropriately … … 657 497 storage[i]->mask = mask; 658 498 } 659 }660 661 static inline void reset_mask( monitor_desc * this ) {662 this->mask.accepted = NULL;663 this->mask.clauses = NULL;664 this->mask.size = 0;665 499 } 666 500 … … 750 584 } 751 585 752 static inline void save ( monitor_desc ** ctx, short count, __attribute((unused)) spinlock ** locks, unsigned int * /*out*/ recursions, __waitfor_mask_t * /*out*/ masks ) {586 static inline void save ( monitor_desc ** ctx, short count, __attribute((unused)) spinlock ** locks, unsigned int * /*out*/ recursions, __waitfor_mask_t * /*out*/ masks ) { 753 587 for( int i = 0; i < count; i++ ) { 754 588 recursions[i] = ctx[i]->recursion;
Note:
See TracChangeset
for help on using the changeset viewer.
