Changeset 7cd8827 for libcfa/src/heap.cfa

Timestamp:

Aug 14, 2018, 4:10:58 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

636e1b9

Parents:

c3a8ecd (diff), 5a5d31a (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 plg2:software/cfa/cfa-cc

File:

• libcfa/src/heap.cfa (moved) (moved from src/libcfa/heap.c ) (7 diffs)

libcfa/src/heap.cfa

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// heap.c -- 
-// 
+//
+// heap.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Dec 19 21:58:35 2017
@@ -12 +12 @@
 // Last Modified On : Sat Aug 11 08:22:16 2018
 // Update Count     : 495
-// 
+//
 
 #include <unistd.h>                                                                             // sbrk, sysconf
@@ -22 +22 @@
 } // extern "C"
 
-#include "bits/align.h"                                                                 // libPow2
-#include "bits/defs.h"                                                                  // likely, unlikely
-#include "bits/locks.h"                                                                 // __spinlock_t
-#include "startup.h"                                                                    // STARTUP_PRIORITY_MEMORY
-#include "stdlib"                                                                               // bsearchl
+#include "bits/align.hfa"                                                                       // libPow2
+#include "bits/defs.hfa"                                                                        // likely, unlikely
+#include "bits/locks.hfa"                                                                       // __spinlock_t
+#include "startup.hfa"                                                                  // STARTUP_PRIORITY_MEMORY
+#include "stdlib.hfa"                                                                           // bsearchl
 #include "malloc.h"
 
@@ -282 +282 @@
 static void ?{}( HeapManager & manager ) with ( manager ) {
     pageSize = sysconf( _SC_PAGESIZE );
-    
+
     for ( unsigned int i = 0; i < NoBucketSizes; i += 1 ) { // initialize the free lists
                 freeLists[i].blockSize = bucketSizes[i];
@@ -758 +758 @@
                 bool mapped __attribute__(( unused )) = headers( "calloc", area, header, freeElem, asize, alignment );
                 #ifndef __CFA_DEBUG__
-                // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero. 
+                // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero.
                 if ( ! mapped )
                 #endif // __CFA_DEBUG__
@@ -781 +781 @@
                 bool mapped __attribute__(( unused )) = headers( "cmemalign", area, header, freeElem, asize, alignment );
                 #ifndef __CFA_DEBUG__
-                // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero. 
+                // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero.
                 if ( ! mapped )
                 #endif // __CFA_DEBUG__
@@ -826 +826 @@
                         bool mapped __attribute__(( unused )) = headers( "realloc", area, header, freeElem, asize, alignment );
                         #ifndef __CFA_DEBUG__
-                        // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero. 
+                        // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero.
                         if ( ! mapped )
                         #endif // __CFA_DEBUG__