Changeset 455a7d5 for libcfa/src/bits/locks.hfa

Timestamp:

Aug 9, 2018, 6:35:02 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea5b7d6

Parents:

fb975a50 (diff), 0c827019 (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' into jenkins-sandbox

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
@@ -16 +16 @@
 #pragma once
 
-#include "bits/debug.h"
-#include "bits/defs.h"
+#include "bits/debug.hfa"
+#include "bits/defs.hfa"
 #include <assert.h>
 
@@ -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
         }
 
@@ -71 +77 @@
                 this.lock = 0;
         }
-
-
-        #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