Changeset e78782b for libcfa/src

Timestamp:

Jan 6, 2023, 1:59:06 PM (16 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c130165

Parents:

243d998 (diff), a20be49 (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:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• heap.cfa (modified) (5 diffs)
• interpose.cfa (modified) (2 diffs)
• limits.cfa (modified) (1 diff)

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 28 12:37:38 2022
-// Update Count     : 1597
+// Last Modified On : Fri Dec 30 08:37:37 2022
+// Update Count     : 1605
 //
 
@@ -805 +805 @@
 
         ptrdiff_t rem = heapRemaining - size;
-        if ( unlikely( rem < 0 ) ) {
+        if ( unlikely( rem < 0 ) ) {                                            // negative ?
                 // If the size requested is bigger than the current remaining storage, increase the size of the heap.
 
@@ -841 +841 @@
         ptrdiff_t rem = heapReserve - size;
 
-        if ( unlikely( rem < 0 ) ) {                                            // negative
+        if ( unlikely( rem < 0 ) ) {                                            // negative ?
                 // If the size requested is bigger than the current remaining reserve, use the current reserve to populate
                 // smaller freeLists, and increase the reserve.
@@ -847 +847 @@
                 rem = heapReserve;                                                              // positive
 
-                if ( rem >= bucketSizes[0] ) {                                  // minimal size ? otherwise ignore
+                if ( (unsigned int)rem >= bucketSizes[0] ) {    // minimal size ? otherwise ignore
                         size_t bucket;
                         #ifdef FASTLOOKUP
@@ -856 +856 @@
                         Heap.FreeHeader * freeHead = &(freeLists[bucket]);
 
-                        // The remaining storage many not be bucket size, whereas all other allocations are. Round down to previous
+                        // The remaining storage may not be bucket size, whereas all other allocations are. Round down to previous
                         // bucket size in this case.
                         if ( unlikely( freeHead->blockSize > (size_t)rem ) ) freeHead -= 1;

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 13 17:35:37 2020
-// Update Count     : 178
+// Last Modified On : Thu Jan  5 22:23:57 2023
+// Update Count     : 180
 //
 
@@ -18 +18 @@
 #include <string.h>                                                                             // strlen
 #include <unistd.h>                                                                             // _exit, getpid
-#define __USE_GNU
 #include <signal.h>
-#undef __USE_GNU
 extern "C" {
 #include <dlfcn.h>                                                                              // dlopen, dlsym

libcfa/src/limits.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr  6 18:06:52 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  1 16:22:51 2018
-// Update Count     : 74
+// Last Modified On : Thu Jan  5 22:27:40 2023
+// Update Count     : 84
 //
 
+#define _GNU_SOURCE                                                                             // access long double M_*l in math.h
 #include <limits.h>
 #include <float.h>
-#define __USE_GNU                                                                               // get M_* constants
 #include <math.h>
 #include <complex.h>