Changeset cdbab55 for libcfa/src/bits/locks.hfa

Timestamp:

Aug 21, 2018, 2:24:29 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6af (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• libcfa/src/bits/locks.hfa (moved) (moved from src/libcfa/bits/locks.h ) (4 diffs)

libcfa/src/bits/locks.hfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// bits/locks.h -- Fast internal locks.
+// bits/locks.hfa -- Fast internal locks.
 //
 // Author           : Thierry Delisle
 // Created On       : Tue Oct 31 15:14:38 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 18:18:13 2018
-// Update Count     : 9
+// Last Modified On : Sat Aug 11 15:42:24 2018
+// Update Count     : 10
 //
 
 #pragma once
 
-#include "bits/debug.h"
-#include "bits/defs.h"
+#include "bits/debug.hfa"
+#include "bits/defs.hfa"
 #include <assert.h>
 
@@ -50 +50 @@
         struct {
                 // Align lock on 128-bit boundary
-                __ALIGN__ volatile _Bool lock;
+                __ALIGN__ volatile bool lock;
         };
         #ifdef __CFA_DEBUG__
@@ -64 +64 @@
                 extern void disable_interrupts();
                 extern void enable_interrupts_noPoll();
+
+                #ifdef __CFA_DEBUG__
+                        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
+                #else
+                        #define __cfaabi_dbg_record(x, y)
+                #endif
         }
 
@@ -72 +78 @@
         }
 
-
-        #ifdef __CFA_DEBUG__
-                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
-        #else
-                #define __cfaabi_dbg_record(x, y)
-        #endif
-
         // Lock the spinlock, return false if already acquired
-        static inline _Bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
-                _Bool result = (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0);
+        static inline bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
+                bool result = (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0);
                 if( result ) {
                         disable_interrupts();