Changes in libcfa/src/concurrency/locks.hfa [6a8882c:f4e35326]

File:

• libcfa/src/concurrency/locks.hfa (modified) (5 diffs)

libcfa/src/concurrency/locks.hfa

@@ -49 +49 @@
 //// Blocking Locks
 ///////////////////////////////////////////////////////////////////
-
 struct blocking_lock {
         // Spin lock used for mutual exclusion
@@ -73 +72 @@
 };
 
-struct single_acquisition_lock {
+struct mutex_lock {
         inline blocking_lock;
 };
@@ -81 +80 @@
 };
 
-struct multiple_acquisition_lock {
+struct recursive_mutex_lock {
         inline blocking_lock;
 };
@@ -88 +87 @@
 void ^?{}( blocking_lock & this );
 
-void ?{}( single_acquisition_lock & this );
-void ^?{}( single_acquisition_lock & this );
+void ?{}( mutex_lock & this );
+void ^?{}( mutex_lock & this );
 
 void ?{}( owner_lock & this );
 void ^?{}( owner_lock & this );
 
-void ?{}( multiple_acquisition_lock & this );
-void ^?{}( multiple_acquisition_lock & this );
+void ?{}( recursive_mutex_lock & this );
+void ^?{}( recursive_mutex_lock & this );
 
 void lock( blocking_lock & this );
@@ -106 +105 @@
 size_t get_recursion_count( blocking_lock & this );
 
-void lock( single_acquisition_lock & this );
-void unlock( single_acquisition_lock & this );
-void add_( single_acquisition_lock & this, struct $thread * t );
-void remove_( single_acquisition_lock & this );
-void set_recursion_count( single_acquisition_lock & this, size_t recursion );
-size_t get_recursion_count( single_acquisition_lock & this );
+void lock( mutex_lock & this );
+void unlock( mutex_lock & this );
+void add_( mutex_lock & this, struct $thread * t );
+void remove_( mutex_lock & this );
+void set_recursion_count( mutex_lock & this, size_t recursion );
+size_t get_recursion_count( mutex_lock & this );
 
-void lock( owner_lock & this );
-void unlock( owner_lock & this );
-void add_( owner_lock & this, struct $thread * t );
-void remove_( owner_lock & this );
-void set_recursion_count( owner_lock & this, size_t recursion );
-size_t get_recursion_count( owner_lock & this );
-
-void lock( multiple_acquisition_lock & this );
-void unlock( multiple_acquisition_lock & this );
-void add_( multiple_acquisition_lock & this, struct $thread * t );
-void remove_( multiple_acquisition_lock & this );
-void set_recursion_count( multiple_acquisition_lock & this, size_t recursion );
-size_t get_recursion_count( multiple_acquisition_lock & this );
+void lock( recursive_mutex_lock & this );
+void unlock( recursive_mutex_lock & this );
+void add_( recursive_mutex_lock & this, struct $thread * t );
+void remove_( recursive_mutex_lock & this );
+void set_recursion_count( recursive_mutex_lock & this, size_t recursion );
+size_t get_recursion_count( recursive_mutex_lock & this );
 
 ///////////////////////////////////////////////////////////////////