Changeset cfbc703d for libcfa/src/stdlib.hfa

Timestamp:

Apr 1, 2020, 9:32:21 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6d43cdde

Parents:

5137f9f

Message:

add resize and more "alloc" routines

File:

• libcfa/src/stdlib.hfa (modified) (7 diffs)

libcfa/src/stdlib.hfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  5 11:29:06 2020
-// Update Count     : 407
+// Last Modified On : Wed Apr  1 18:38:41 2020
+// Update Count     : 429
 //
 
@@ -24 +24 @@
 extern "C" {
         void * memalign( size_t align, size_t size );           // malloc.h
-    void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize ); // CFA heap
+        size_t malloc_usable_size( void * ptr );                        // malloc.h
+        void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize ); // CFA heap
         void * memset( void * dest, int fill, size_t size ); // string.h
         void * memcpy( void * dest, const void * src, size_t size ); // string.h
+        void * resize( void * oaddr, size_t size );                     // CFA heap
 } // extern "C"
 
+void * resize( void * oaddr, size_t nalign, size_t size ); // CFA heap
 void * realloc( void * oaddr, size_t nalign, size_t size ); // CFA heap
 
@@ -72 +75 @@
                 return posix_memalign( (void **)ptr, align, sizeof(T) ); // C posix_memalign
         } // posix_memalign
-
+} // distribution
+
+static inline forall( dtype T | sized(T) ) {
         // Cforall safe general allocation, fill, resize, array
 
@@ -84 +89 @@
         } // alloc
 
-        T * alloc( T ptr[], size_t dim ) {                                      // realloc
-                return (T *)(void *)realloc( (void *)ptr, dim * sizeof(T) ); // C realloc
+        forall( dtype S | sized(S) )
+        T * alloc( S ptr[], size_t dim = 1 ) {                          // singleton/array resize
+                size_t len = malloc_usable_size( ptr );                 // current bucket size
+                if ( sizeof(T) * dim > len ) {                                  // not enough space ?
+                        T * temp = alloc( dim );                                        // new storage
+                        free( ptr );                                                            // free old storage
+                        return temp;
+                } else {
+                        return (T *)ptr;
+                } // if
+        } // alloc
+
+        T * alloc( T ptr[], size_t dim, bool copy = true ) {
+                if ( copy ) {                                                                   // realloc
+                        return (T *)(void *)realloc( (void *)ptr, dim * sizeof(T) ); // C realloc
+                } else {
+                        struct __Unknown {};
+                        return alloc( (__Unknown *)ptr, dim );          // reuse, cheat making T/S different types
+                } // if
         } // alloc
 
@@ -113 +135 @@
 forall( dtype T | sized(T) ) {
         T * alloc_set( T ptr[], size_t dim, char fill );        // realloc array with fill
+        T * alloc_set( T ptr[], size_t dim, T fill );           // realloc array with fill
 } // distribution
 
@@ -126 +149 @@
         T * alloc_align( T ptr[], size_t align ) {                      // aligned realloc array
                 return (T *)(void *)realloc( (void *)ptr, align, sizeof(T) ); // CFA realloc
+        } // alloc_align
+
+        forall( dtype S | sized(S) )
+        T * alloc_align( S ptr[], size_t align ) {                      // aligned reuse array
+                return (T *)(void *)resize( (void *)ptr, align, sizeof(T) ); // CFA realloc
         } // alloc_align
 
@@ -156 +184 @@
 
 forall( dtype T | sized(T) ) {
+        T * alloc_align_set( T ptr[], size_t align, char fill ); // aligned realloc with fill
+        T * alloc_align_set( T ptr[], size_t align, T fill ); // aligned realloc with fill
         T * alloc_align_set( T ptr[], size_t align, size_t dim, char fill ); // aligned realloc array with fill
+        T * alloc_align_set( T ptr[], size_t align, size_t dim, T fill ); // aligned realloc array with fill
 } // distribution