diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:31 -0600 |
| commit | 06227c5420ce8eeef7bd44406a395188c61e1703 (patch) | |
| tree | c18c25b31413479e63fec92f61067b95759fc3b0 /tdecore/malloc/README | |
| parent | ce5d3d7fd554b9832a69350cffa8d79c5002753e (diff) | |
| parent | 70d7c59d2ac9ad3718f92a20c07937d3b6cfb928 (diff) | |
| download | tdelibs-06227c5420ce8eeef7bd44406a395188c61e1703.tar.gz tdelibs-06227c5420ce8eeef7bd44406a395188c61e1703.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/malloc/README')
| -rw-r--r-- | tdecore/malloc/README | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/malloc/README b/tdecore/malloc/README index 6a24a39db..eed2c00ba 100644 --- a/tdecore/malloc/README +++ b/tdecore/malloc/README @@ -7,7 +7,7 @@ FreeBSD's libc. There's a new configure switch, --enable-fast-malloc. By default it's turned off, disabling the system libc one and using this one. Using --enable-fast-malloc=full enables this malloc unconditionally, aiming for the maximum performance. By using only --enable-fast-malloc, -it's possible to select both malloc implementations at runtime. When $KDE_MALLOC is set to 0, +it's possible to select both malloc implementations at runtime. When $TDE_MALLOC is set to 0, the system libc malloc is used, otherwise this malloc is used. For now, the requirements are : @@ -31,11 +31,11 @@ changes (against malloc-2.7.0): #define USE_MEMCPY 0 #define MMAP_CLEARS 1 made all functions INLINE -added #ifdef KDE_MALLOC_DEBUG -> #define DEBUG +added #ifdef TDE_MALLOC_DEBUG -> #define DEBUG reordered all functions in order to avoid 'warning: `XYZ' declared inline after being called' especially moved the public_* ones at the end of the file commented out #including malloc.h -added #include <config.h> at the top and enclosed whole file in #ifdef KDE_MALLOC +added #include <config.h> at the top and enclosed whole file in #ifdef TDE_MALLOC taken posix_memalign() from glibc removed public icalloc(),icomalloc(),mtrim(),musable() (they don't exist everywhere anyway) enclosed the pthreads part by #if 0 and replaced it with spinlock from glibc CVS (in x86.h) @@ -45,7 +45,7 @@ static mutex_t spinlock = MUTEX_INITIALIZER; #define MALLOC_PREACTION lock( &spinlock ) #define MALLOC_POSTACTION unlock( &spinlock ) ---------- -public functions call either functions in this malloc or in libc, depending on $KDE_MALLOC +public functions call either functions in this malloc or in libc, depending on $TDE_MALLOC the kde_malloc_is_used hack |