# HG changeset patch # User Sean Halle # Date 1346710065 25200 # Node ID d01d48b023cad85cbb0d6485209310f3ff43946e # Parent b9cb01d8ce569a10a031cf37d2aec59b7b12c621 Renamed VMS to PR, in new branch diff -r b9cb01d8ce56 -r d01d48b023ca BlockingQueue.c --- a/BlockingQueue.c Wed Jun 06 18:00:59 2012 -0700 +++ b/BlockingQueue.c Mon Sep 03 15:07:45 2012 -0700 @@ -35,7 +35,7 @@ CASQueueStruc* makeCASQ() { CASQueueStruc* retQ; - retQ = (CASQueueStruc *) VMS_WL__malloc( sizeof( CASQueueStruc ) ); + retQ = (CASQueueStruc *) PR_WL__malloc( sizeof( CASQueueStruc ) ); retQ->insertLock = UNLOCKED; retQ->extractLock= UNLOCKED; @@ -160,7 +160,7 @@ SRSWQueueStruc* makeSRSWQ() { SRSWQueueStruc* retQ; - retQ = (SRSWQueueStruc *) VMS_WL__malloc( sizeof( SRSWQueueStruc ) ); + retQ = (SRSWQueueStruc *) PR_WL__malloc( sizeof( SRSWQueueStruc ) ); memset( retQ->startOfData, 0, 1024 * sizeof(void *) ); retQ->extractPos = &(retQ->startOfData[0]); //side by side == empty @@ -173,7 +173,7 @@ void freeSRSWQ( SRSWQueueStruc* Q ) { - VMS_int__free( Q ); + PR_int__free( Q ); } void* readSRSWQ( SRSWQueueStruc* Q ) @@ -299,11 +299,11 @@ SRMWQueueStruc* makeSRMWQ() { SRMWQueueStruc* retQ; - retQ = (SRMWQueueStruc *) VMS_WL__malloc( sizeof( SRMWQueueStruc ) ); + retQ = (SRMWQueueStruc *) PR_WL__malloc( sizeof( SRMWQueueStruc ) ); retQ->numInternalQs = 0; retQ->internalQsSz = 10; - retQ->internalQs = VMS_WL__malloc( retQ->internalQsSz * sizeof(SRSWQueueStruc *)); + retQ->internalQs = PR_WL__malloc( retQ->internalQsSz * sizeof(SRSWQueueStruc *)); retQ->lastQReadFrom = 0; @@ -329,11 +329,11 @@ oldSz = Q->internalQsSz; oldArray = Q->internalQs; Q->internalQsSz *= 2; - Q->internalQs = VMS_WL__malloc( Q->internalQsSz * sizeof(SRSWQueueStruc *)); + Q->internalQs = PR_WL__malloc( Q->internalQsSz * sizeof(SRSWQueueStruc *)); for( i = 0; i < oldSz; i++ ) { Q->internalQs[i] = oldArray[i]; } - VMS_int__free( oldArray ); + PR_int__free( oldArray ); } Q->internalQs[ Q->numInternalQs - 1 ] = makeSRSWQ(); return Q->numInternalQs - 1; diff -r b9cb01d8ce56 -r d01d48b023ca BlockingQueue.h --- a/BlockingQueue.h Wed Jun 06 18:00:59 2012 -0700 +++ b/BlockingQueue.h Mon Sep 03 15:07:45 2012 -0700 @@ -8,8 +8,8 @@ #ifndef _BLOCKINGQUEUE_H #define _BLOCKINGQUEUE_H -#include "VMS_impl/VMS_primitive_data_types.h" -#include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h" +#include "PR_impl/PR_primitive_data_types.h" +#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h" #define TRUE 1 diff -r b9cb01d8ce56 -r d01d48b023ca PrivateQueue.c --- a/PrivateQueue.c Wed Jun 06 18:00:59 2012 -0700 +++ b/PrivateQueue.c Mon Sep 03 15:07:45 2012 -0700 @@ -27,10 +27,10 @@ { PrivQueueStruc* retQ; //This malloc is not safe to use in wrapper lib nor app code! - retQ = (PrivQueueStruc *) VMS_int__malloc( sizeof( PrivQueueStruc ) ); + retQ = (PrivQueueStruc *) PR_int__malloc( sizeof( PrivQueueStruc ) ); //This malloc is not safe to use in wrapper lib nor app code! - retQ->startOfData = VMS_int__malloc( 1024 * sizeof(void *) ); + retQ->startOfData = PR_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 @@ -61,7 +61,7 @@ newSize = 2 * oldSize; //This malloc is not safe to use in wrapper lib nor app code! - Q->startOfData = (void **)VMS_int__malloc( newSize ); + Q->startOfData = (void **)PR_int__malloc( newSize ); newStartOfData = (int8 *)Q->startOfData; newEndOfData = newStartOfData + newSize; //all calcs in Bytes Q->endOfData = (void **)newEndOfData; @@ -99,7 +99,7 @@ Q->insertPos = (void **)(newStartOfData + bottPartSize); } //This free is not safe to use in wrapper lib nor app code! - VMS_int__free(oldStartOfData); + PR_int__free(oldStartOfData); } @@ -287,6 +287,6 @@ freePrivQ( PrivQueueStruc *Q ) { //This free is not safe to use in wrapper lib nor app code! - VMS_int__free( Q->startOfData ); - VMS_int__free( Q ); + PR_int__free( Q->startOfData ); + PR_int__free( Q ); } \ No newline at end of file diff -r b9cb01d8ce56 -r d01d48b023ca PrivateQueue.h --- a/PrivateQueue.h Wed Jun 06 18:00:59 2012 -0700 +++ b/PrivateQueue.h Mon Sep 03 15:07:45 2012 -0700 @@ -9,8 +9,8 @@ #define _PRIVATE_QUEUE_H -#include "VMS_impl/VMS_primitive_data_types.h" -#include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h" +#include "PR_impl/PR_primitive_data_types.h" +#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h" #define TRUE 1 diff -r b9cb01d8ce56 -r d01d48b023ca __brch__MC_shared --- a/__brch__MC_shared Wed Jun 06 18:00:59 2012 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -This branch is for the project structure defined Jan 2012.. the #includes reflect this directory structure. - -More importantly, the MC_shared version of VMS requires a separat malloc implemeted by VMS code.. so this branch has modified the library to use the VMS-specific malloc. - diff -r b9cb01d8ce56 -r d01d48b023ca __brch__Renamed_VMS_to_PR --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/__brch__Renamed_VMS_to_PR Mon Sep 03 15:07:45 2012 -0700 @@ -0,0 +1,4 @@ +This branch is for the project structure defined Jan 2012.. the #includes reflect this directory structure. + +More importantly, the MC_shared version of PR requires a separat malloc implemeted by PR code.. so this branch has modified the library to use the PR-specific malloc. +