Changes in src/libcfa/stdlib [b9c04946:0fc52b6]

File:

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

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 27 07:21:36 2018
-// Update Count     : 345
+// Last Modified On : Thu Jul 12 08:03:58 2018
+// Update Count     : 337
 //
 
 #pragma once
 
-#include <stdlib.h>                                                                             // *alloc, strto*, ato*
+#include <stdlib.h>                                                                             // allocation, strto*, ato*
 extern "C" {
         void * memalign( size_t align, size_t size );           // malloc.h
-        void * memset( void * dest, int fill, size_t size ); // string.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"
 
@@ -37 +36 @@
 
         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
@@ -71 +76 @@
 
         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
@@ -80 +87 @@
 
         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
@@ -89 +98 @@
 
         T * alloc( T ptr[], size_t dim ) {
+                //printf( "X11\n" );
                 return (T *)(void *)realloc( (void *)ptr, dim * (size_t)sizeof(T) ); // C realloc
         } // alloc
@@ -99 +109 @@
 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) );
@@ -108 +120 @@
 
         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 ) {
-                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;
+                //printf( "X16\n" );
+                T * ptr = (T *)memalign( align, dim * sizeof(T) );
+                return (T *)memset( ptr, (int)fill, dim * sizeof(T) );
         } // align_alloc
 } // distribution
@@ -127 +135 @@
         // data, non-array types
 
-        T * memset( T * dest, char fill ) {
-                return (T *)memset( dest, fill, sizeof(T) );
+        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
@@ -139 +149 @@
         // data, array types
 
-        T * amemset( T dest[], char fill, size_t dim ) {
-                return (T *)(void *)memset( dest, fill, dim * sizeof(T) ); // C memset
-        } // amemset
-
-        T * amemcpy( T dest[], const T src[], size_t dim ) {
+        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
-        } // amemcpy
+        } // memcpy
 } // distribution
 
@@ -203 +215 @@
         E * bsearchu( E key, const E * vals, size_t dim );
         size_t bsearchu( E key, const E * vals, size_t dim );
+
+        void qsort( E * vals, size_t dim );
 } // distribution
 
@@ -212 +226 @@
         E * bsearchu( K key, const E * vals, size_t dim );
         size_t bsearchu( K key, const E * vals, size_t dim );
-} // distribution
-
-forall( otype E | { int ?<?( E, E ); } ) {
-        void qsort( E * vals, size_t dim );
 } // distribution