Changes in libcfa/src/concurrency/locks.cfa [ab1b971:454f478]

File:

• libcfa/src/concurrency/locks.cfa (modified) (3 diffs)

libcfa/src/concurrency/locks.cfa

@@ -1 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2021 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// locks.hfa -- LIBCFATHREAD
-// Runtime locks that used with the runtime thread system.
-//
-// Author           : Colby Alexander Parsons
-// Created On       : Thu Jan 21 19:46:50 2021
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
-//
-
-#define __cforall_thread__
-
 #include "locks.hfa"
 #include "kernel_private.hfa"
@@ -74 +56 @@
 
 void ^?{}( blocking_lock & this ) {}
-
+void  ?{}( single_acquisition_lock & this ) {((blocking_lock &)this){ false, false };}
+void ^?{}( single_acquisition_lock & this ) {}
+void  ?{}( owner_lock & this ) {((blocking_lock &)this){ true, true };}
+void ^?{}( owner_lock & this ) {}
+void  ?{}( multiple_acquisition_lock & this ) {((blocking_lock &)this){ true, false };}
+void ^?{}( multiple_acquisition_lock & this ) {}
 
 void lock( blocking_lock & this ) with( this ) {
@@ -181 +168 @@
         unlock( lock );
 }
+
+//-----------------------------------------------------------------------------
+// Overloaded routines for traits
+// These routines are temporary until an inheritance bug is fixed
+void   lock      ( single_acquisition_lock & this ) { lock   ( (blocking_lock &)this ); }
+void   unlock    ( single_acquisition_lock & this ) { unlock ( (blocking_lock &)this ); }
+void   on_wait   ( single_acquisition_lock & this ) { on_wait( (blocking_lock &)this ); }
+void   on_notify ( single_acquisition_lock & this, struct $thread * t ) { on_notify( (blocking_lock &)this, t ); }
+void   set_recursion_count( single_acquisition_lock & this, size_t recursion ) { set_recursion_count( (blocking_lock &)this, recursion ); }
+size_t get_recursion_count( single_acquisition_lock & this ) { return get_recursion_count( (blocking_lock &)this ); }
+
+void   lock     ( owner_lock & this ) { lock   ( (blocking_lock &)this ); }
+void   unlock   ( owner_lock & this ) { unlock ( (blocking_lock &)this ); }
+void   on_wait  ( owner_lock & this ) { on_wait( (blocking_lock &)this ); }
+void   on_notify( owner_lock & this, struct $thread * t ) { on_notify( (blocking_lock &)this, t ); }
+void   set_recursion_count( owner_lock & this, size_t recursion ) { set_recursion_count( (blocking_lock &)this, recursion ); }
+size_t get_recursion_count( owner_lock & this ) { return get_recursion_count( (blocking_lock &)this ); }
+
+void   lock     ( multiple_acquisition_lock & this ) { lock   ( (blocking_lock &)this ); }
+void   unlock   ( multiple_acquisition_lock & this ) { unlock ( (blocking_lock &)this ); }
+void   on_wait  ( multiple_acquisition_lock & this ) { on_wait( (blocking_lock &)this ); }
+void   on_notify( multiple_acquisition_lock & this, struct $thread * t ){ on_notify( (blocking_lock &)this, t ); }
+void   set_recursion_count( multiple_acquisition_lock & this, size_t recursion ){ set_recursion_count( (blocking_lock &)this, recursion ); }
+size_t get_recursion_count( multiple_acquisition_lock & this ){ return get_recursion_count( (blocking_lock &)this ); }
 
 //-----------------------------------------------------------------------------