Changeset d46ed6e for src/libcfa/stdlib

Timestamp:

Jul 25, 2018, 6:20:35 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:

cf0de0e

Parents:

891790ef

Message:

first attempt for new thread-safe heap

File:

• src/libcfa/stdlib (modified) (10 diffs)

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 08:03:58 2018
-// Update Count     : 337
+// Last Modified On : Mon Jul 23 07:44:47 2018
+// Update Count     : 341
 //
 
 #pragma once
 
-#include <stdlib.h>                                                                             // allocation, strto*, ato*
+#include <stdlib.h>                                                                             // *alloc, strto*, ato*
 extern "C" {
         void * memalign( size_t align, size_t size );           // malloc.h
         void * memset( void * dest, int c, size_t size );       // string.h
         void * memcpy( void * dest, const void * src, size_t size ); // string.h
+    void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize ); // CFA
 } // extern "C"
 
@@ -36 +37 @@
 
         T * malloc( void ) {
-                // printf( "* malloc\n" );
                 return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
         } // malloc
@@ -48 +48 @@
 
         T * calloc( size_t dim ) {
-                //printf( "X2\n" );
                 return (T *)(void *)calloc( dim, sizeof(T) );   // C calloc
         } // calloc
 
         T * realloc( T * ptr, size_t size ) {
-                //printf( "X3\n" );
                 return (T *)(void *)realloc( (void *)ptr, size );
         } // realloc
 
         T * memalign( size_t align ) {
-                //printf( "X4\n" );
                 return (T *)memalign( align, sizeof(T) );
         } // memalign
 
         T * aligned_alloc( size_t align ) {
-                //printf( "X5\n" );
                 return (T *)aligned_alloc( align, sizeof(T) );
         } // aligned_alloc
 
         int posix_memalign( T ** ptr, size_t align ) {
-                //printf( "X6\n" );
                 return posix_memalign( (void **)ptr, align, sizeof(T) ); // C posix_memalign
         } // posix_memalign
@@ -76 +71 @@
 
         T * alloc( void ) {
-                //printf( "X7\n" );
                 return (T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
         } // alloc
 
         T * alloc( char fill ) {
-                //printf( "X8\n" );
                 T * ptr = (T *)(void *)malloc( (size_t)sizeof(T) );     // C malloc
                 return (T *)memset( ptr, (int)fill, sizeof(T) );        // initial with fill value
@@ -87 +80 @@
 
         T * alloc( size_t dim ) {
-                //printf( "X9\n" );
                 return (T *)(void *)malloc( dim * (size_t)sizeof(T) ); // C malloc
         } // alloc
 
         T * alloc( size_t dim, char fill ) {
-                //printf( "X10\n" );
                 T * ptr = (T *)(void *)malloc( dim * (size_t)sizeof(T) ); // C malloc
                 return (T *)memset( ptr, (int)fill, dim * sizeof(T) );    // initial with fill value
@@ -98 +89 @@
 
         T * alloc( T ptr[], size_t dim ) {
-                //printf( "X11\n" );
                 return (T *)(void *)realloc( (void *)ptr, dim * (size_t)sizeof(T) ); // C realloc
         } // alloc
@@ -109 +99 @@
 static inline forall( dtype T | sized(T) ) {
         T * align_alloc( size_t align ) {
-                //printf( "X13\n" );
                 return (T *)memalign( align, sizeof(T) );
         } // align_alloc
 
         T * align_alloc( size_t align, char fill ) {
-                //printf( "X14\n" );
                 T * ptr = (T *)memalign( align, sizeof(T) );
                 return (T *)memset( ptr, (int)fill, sizeof(T) );
@@ -120 +108 @@
 
         T * align_alloc( size_t align, size_t dim ) {
-                //printf( "X15\n" );
                 return (T *)memalign( align, dim * sizeof(T) );
         } // align_alloc
 
         T * align_alloc( size_t align, size_t dim, char fill ) {
-                //printf( "X16\n" );
-                T * ptr = (T *)memalign( align, dim * sizeof(T) );
-                return (T *)memset( ptr, (int)fill, dim * sizeof(T) );
+                T * ptr;
+                if ( fill == '\0' ) {
+                        ptr = (T *)cmemalign( align, dim, sizeof(T) );
+                } else {
+                        ptr = (T *)memalign( align, dim * sizeof(T) );
+                        return (T *)memset( ptr, (int)fill, dim * sizeof(T) );
+                } // if
+                return ptr;
         } // align_alloc
 } // distribution
@@ -136 +128 @@
 
         T * memset( T * dest, char c ) {
-                //printf( "X17\n" );
                 return (T *)memset( dest, c, sizeof(T) );
         } // memset
 
         T * memcpy( T * dest, const T * src ) {
-                //printf( "X18\n" );
                 return (T *)memcpy( dest, src, sizeof(T) );
         } // memcpy
@@ -150 +140 @@
 
         T * memset( T dest[], size_t dim, char c ) {
-                //printf( "X19\n" );
                 return (T *)(void *)memset( dest, c, dim * sizeof(T) ); // C memset
         } // memset
 
         T * memcpy( T dest[], const T src[], size_t dim ) {
-                //printf( "X20\n" );
                 return (T *)(void *)memcpy( dest, src, dim * sizeof(T) ); // C memcpy
         } // memcpy