1*4882a593SmuzhiyunFrom: Otavio Salvador <otavio@ossystems.com.br> 2*4882a593SmuzhiyunSubject: [PATCH] Avoid aligned allocation function name clashes 3*4882a593Smuzhiyun 4*4882a593Smuzhiyunglibc added new methods for aligned allocation and it clashes with the 5*4882a593Smuzhiyunlocal version used by 'tiobench'. To fix it, we prefix the methods 6*4882a593Smuzhiyunwith '_'. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream-Status: Pending 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Otavio Salvador <otavio@ossystems.com.br> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun tiotest.c | 8 ++++---- 13*4882a593Smuzhiyun 1 files changed, 4 insertions(+), 4 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/tiotest.c b/tiotest.c 16*4882a593Smuzhiyunindex 38f54e7..6b3d0c3 100644 17*4882a593Smuzhiyun--- a/tiotest.c 18*4882a593Smuzhiyun+++ b/tiotest.c 19*4882a593Smuzhiyun@@ -31,7 +31,7 @@ static const char* versionStr = "tiotest v0.3.3 (C) 1999-2000 Mika Kuoppala <mik 20*4882a593Smuzhiyun */ 21*4882a593Smuzhiyun ArgumentOptions args; 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun-static void * aligned_alloc(ssize_t size) 24*4882a593Smuzhiyun+static void * _aligned_alloc(ssize_t size) 25*4882a593Smuzhiyun { 26*4882a593Smuzhiyun caddr_t a; 27*4882a593Smuzhiyun a = mmap((caddr_t )0, size, 28*4882a593Smuzhiyun@@ -41,7 +41,7 @@ static void * aligned_alloc(ssize_t size) 29*4882a593Smuzhiyun return a; 30*4882a593Smuzhiyun } 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun-static int aligned_free(caddr_t a, ssize_t size) 33*4882a593Smuzhiyun+static int _aligned_free(caddr_t a, ssize_t size) 34*4882a593Smuzhiyun { 35*4882a593Smuzhiyun return munmap(a, size); 36*4882a593Smuzhiyun } 37*4882a593Smuzhiyun@@ -281,7 +281,7 @@ void initialize_test( ThreadTest *d ) 38*4882a593Smuzhiyun pthread_attr_setscope(&(d->threads[i].thread_attr), 39*4882a593Smuzhiyun PTHREAD_SCOPE_SYSTEM); 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun- d->threads[i].buffer = aligned_alloc( d->threads[i].blockSize ); 42*4882a593Smuzhiyun+ d->threads[i].buffer = _aligned_alloc( d->threads[i].blockSize ); 43*4882a593Smuzhiyun if( d->threads[i].buffer == NULL ) 44*4882a593Smuzhiyun { 45*4882a593Smuzhiyun perror("Error allocating memory"); 46*4882a593Smuzhiyun@@ -383,7 +383,7 @@ void cleanup_test( ThreadTest *d ) 47*4882a593Smuzhiyun { 48*4882a593Smuzhiyun if (!args.rawDrives) 49*4882a593Smuzhiyun unlink(d->threads[i].fileName); 50*4882a593Smuzhiyun- aligned_free( d->threads[i].buffer, d->threads[i].blockSize ); 51*4882a593Smuzhiyun+ _aligned_free( d->threads[i].buffer, d->threads[i].blockSize ); 52*4882a593Smuzhiyun d->threads[i].buffer = 0; 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun pthread_attr_destroy( &(d->threads[i].thread_attr) ); 55*4882a593Smuzhiyun-- 56*4882a593Smuzhiyun1.7.7 57*4882a593Smuzhiyun 58