# HG changeset patch # User Me@portablequad # Date 1329039819 28800 # Node ID 59781a4c9cf1cd6760fc70561324177e504a4dc9 # Parent b5ae7fbb1f014a59c983f52ea16b7b73def66e1a updated VMS__malloc to VMS_int__malloc diff -r b5ae7fbb1f01 -r 59781a4c9cf1 BlockingQueue.c --- a/BlockingQueue.c Sat Feb 11 20:37:52 2012 -0800 +++ b/BlockingQueue.c Sun Feb 12 01:43:39 2012 -0800 @@ -34,7 +34,7 @@ CASQueueStruc* makeCASQ() { CASQueueStruc* retQ; - retQ = (CASQueueStruc *) VMS__malloc( sizeof( CASQueueStruc ) ); + retQ = (CASQueueStruc *) VMS_int__malloc( sizeof( CASQueueStruc ) ); retQ->insertLock = UNLOCKED; retQ->extractLock= UNLOCKED; @@ -159,7 +159,7 @@ SRSWQueueStruc* makeSRSWQ() { SRSWQueueStruc* retQ; - retQ = (SRSWQueueStruc *) VMS__malloc( sizeof( SRSWQueueStruc ) ); + retQ = (SRSWQueueStruc *) VMS_int__malloc( sizeof( SRSWQueueStruc ) ); memset( retQ->startOfData, 0, 1024 * sizeof(void *) ); retQ->extractPos = &(retQ->startOfData[0]); //side by side == empty @@ -172,7 +172,7 @@ void freeSRSWQ( SRSWQueueStruc* Q ) { - VMS__free( Q ); + VMS_int__free( Q ); } void* readSRSWQ( SRSWQueueStruc* Q ) @@ -298,11 +298,11 @@ SRMWQueueStruc* makeSRMWQ() { SRMWQueueStruc* retQ; - retQ = (SRMWQueueStruc *) VMS__malloc( sizeof( SRMWQueueStruc ) ); + retQ = (SRMWQueueStruc *) VMS_int__malloc( sizeof( SRMWQueueStruc ) ); retQ->numInternalQs = 0; retQ->internalQsSz = 10; - retQ->internalQs = VMS__malloc( retQ->internalQsSz * sizeof(SRSWQueueStruc *)); + retQ->internalQs = VMS_int__malloc( retQ->internalQsSz * sizeof(SRSWQueueStruc *)); retQ->lastQReadFrom = 0; @@ -328,11 +328,11 @@ oldSz = Q->internalQsSz; oldArray = Q->internalQs; Q->internalQsSz *= 2; - Q->internalQs = VMS__malloc( Q->internalQsSz * sizeof(SRSWQueueStruc *)); + Q->internalQs = VMS_int__malloc( Q->internalQsSz * sizeof(SRSWQueueStruc *)); for( i = 0; i < oldSz; i++ ) { Q->internalQs[i] = oldArray[i]; } - VMS__free( oldArray ); + VMS_int__free( oldArray ); } Q->internalQs[ Q->numInternalQs - 1 ] = makeSRSWQ(); return Q->numInternalQs - 1; diff -r b5ae7fbb1f01 -r 59781a4c9cf1 PrivateQueue.c --- a/PrivateQueue.c Sat Feb 11 20:37:52 2012 -0800 +++ b/PrivateQueue.c Sun Feb 12 01:43:39 2012 -0800 @@ -26,9 +26,9 @@ PrivQueueStruc* makePrivQ() { PrivQueueStruc* retQ; - retQ = (PrivQueueStruc *) VMS__malloc( sizeof( PrivQueueStruc ) ); + retQ = (PrivQueueStruc *) VMS_int__malloc( sizeof( PrivQueueStruc ) ); - retQ->startOfData = VMS__malloc( 1024 * sizeof(void *) ); + retQ->startOfData = VMS_int__malloc( 1024 * sizeof(void *) ); memset( retQ->startOfData, 0, 1024 * sizeof(void *) ); retQ->extractPos = &(retQ->startOfData[0]); //side by side == empty retQ->insertPos = &(retQ->startOfData[1]); // so start pos's have to be @@ -46,9 +46,9 @@ oldSize = Q->endOfData - Q->startOfData; newSize = 2 * oldSize; oldStartOfData = Q->startOfData; - Q->startOfData = VMS__malloc( newSize * sizeof(void *) ); + Q->startOfData = VMS_int__malloc( newSize * sizeof(void *) ); memcpy(Q->startOfData, oldStartOfData, oldSize * sizeof(void *)); - VMS__free(oldStartOfData); + VMS_int__free(oldStartOfData); Q->extractPos = &(Q->startOfData[0]); //side by side == empty Q->insertPos = &(Q->startOfData[1]); // so start pos's have to be