Ignore:
Timestamp:
Nov 11, 2020, 2:39:48 PM (12 months ago)
Author:
Colby Alexander Parsons <caparsons@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
2125567
Parents:
836c992
Message:

fixed some bugs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/locks.hfa

    r836c992 r6a8882c  
    4949//// Blocking Locks
    5050///////////////////////////////////////////////////////////////////
     51
    5152struct blocking_lock {
    5253        // Spin lock used for mutual exclusion
     
    7273};
    7374
    74 struct mutex_lock {
     75struct single_acquisition_lock {
    7576        inline blocking_lock;
    7677};
     
    8081};
    8182
    82 struct recursive_mutex_lock {
     83struct multiple_acquisition_lock {
    8384        inline blocking_lock;
    8485};
     
    8788void ^?{}( blocking_lock & this );
    8889
    89 void ?{}( mutex_lock & this );
    90 void ^?{}( mutex_lock & this );
     90void ?{}( single_acquisition_lock & this );
     91void ^?{}( single_acquisition_lock & this );
    9192
    9293void ?{}( owner_lock & this );
    9394void ^?{}( owner_lock & this );
    9495
    95 void ?{}( recursive_mutex_lock & this );
    96 void ^?{}( recursive_mutex_lock & this );
     96void ?{}( multiple_acquisition_lock & this );
     97void ^?{}( multiple_acquisition_lock & this );
    9798
    9899void lock( blocking_lock & this );
     
    105106size_t get_recursion_count( blocking_lock & this );
    106107
    107 void lock( mutex_lock & this );
    108 void unlock( mutex_lock & this );
    109 void add_( mutex_lock & this, struct $thread * t );
    110 void remove_( mutex_lock & this );
    111 void set_recursion_count( mutex_lock & this, size_t recursion );
    112 size_t get_recursion_count( mutex_lock & this );
     108void lock( single_acquisition_lock & this );
     109void unlock( single_acquisition_lock & this );
     110void add_( single_acquisition_lock & this, struct $thread * t );
     111void remove_( single_acquisition_lock & this );
     112void set_recursion_count( single_acquisition_lock & this, size_t recursion );
     113size_t get_recursion_count( single_acquisition_lock & this );
    113114
    114 void lock( recursive_mutex_lock & this );
    115 void unlock( recursive_mutex_lock & this );
    116 void add_( recursive_mutex_lock & this, struct $thread * t );
    117 void remove_( recursive_mutex_lock & this );
    118 void set_recursion_count( recursive_mutex_lock & this, size_t recursion );
    119 size_t get_recursion_count( recursive_mutex_lock & this );
     115void lock( owner_lock & this );
     116void unlock( owner_lock & this );
     117void add_( owner_lock & this, struct $thread * t );
     118void remove_( owner_lock & this );
     119void set_recursion_count( owner_lock & this, size_t recursion );
     120size_t get_recursion_count( owner_lock & this );
     121
     122void lock( multiple_acquisition_lock & this );
     123void unlock( multiple_acquisition_lock & this );
     124void add_( multiple_acquisition_lock & this, struct $thread * t );
     125void remove_( multiple_acquisition_lock & this );
     126void set_recursion_count( multiple_acquisition_lock & this, size_t recursion );
     127size_t get_recursion_count( multiple_acquisition_lock & this );
    120128
    121129///////////////////////////////////////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.