Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/monitor.c

    r0c78741 r9c59cd4  
    144144
    145145        unsigned short count = this->monitor_count;
    146         unsigned int blarg_recursions[ count ];         //Save the current recursion levels to restore them later
    147         spinlock *   blarg_locks     [ count ];         //We need to pass-in an array of locks to ScheduleInternal
     146        unsigned int recursions[ count ];               //Save the current recursion levels to restore them later
     147        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to ScheduleInternal
    148148
    149149        LIB_DEBUG_PRINT_SAFE("count %i\n", count);
     
    166166        append( &this->blocked, &waiter );
    167167
    168         lock_all( this->monitors, blarg_locks, count );
    169         save_recursion( this->monitors, blarg_recursions, count );
     168        lock_all( this->monitors, locks, count );
     169        save_recursion( this->monitors, recursions, count );
    170170        //DON'T unlock, ask the kernel to do it
    171171
     
    185185        LIB_DEBUG_PRINT_SAFE("\n");
    186186
    187         //Everything is ready to go to sleep
    188         ScheduleInternal( blarg_locks, count, threads, thread_count );
     187        // Everything is ready to go to sleep
     188        ScheduleInternal( locks, count, threads, thread_count );
    189189
    190190
     
    193193
    194194        //We are back, restore the owners and recursions
    195         lock_all( blarg_locks, count );
    196         restore_recursion( this->monitors, blarg_recursions, count );
    197         unlock_all( blarg_locks, count );
     195        lock_all( locks, count );
     196        restore_recursion( this->monitors, recursions, count );
     197        unlock_all( locks, count );
    198198}
    199199
Note: See TracChangeset for help on using the changeset viewer.