# HG changeset patch # User Merten Sach # Date 1329158218 -3600 # Node ID 99b300fa7f1c94ce6178254b308ed0a132e4caa2 # Parent 258ff77b64b18a728f295983f5e04d70bd02b83f New include paths because of new project structure and branch file diff -r 258ff77b64b1 -r 99b300fa7f1c VMS_lang_specific_defines.h --- a/VMS_lang_specific_defines.h Fri Dec 16 20:03:16 2011 +0100 +++ b/VMS_lang_specific_defines.h Mon Feb 13 19:36:58 2012 +0100 @@ -5,7 +5,7 @@ * Created on June 10, 2011, 12:20 PM */ -#include "VMS/VMS.h" +#include "VMS_Implementations/VMS_impl/VMS.h" #include "VPThread.h" #ifndef VMS_lang_specific_defines_H diff -r 258ff77b64b1 -r 99b300fa7f1c VPThread.h --- a/VPThread.h Fri Dec 16 20:03:16 2011 +0100 +++ b/VPThread.h Mon Feb 13 19:36:58 2012 +0100 @@ -9,9 +9,9 @@ #ifndef _VPThread_H #define _VPThread_H -#include "VMS/VMS.h" -#include "VMS/Queue_impl/PrivateQueue.h" -#include "VMS/DynArray/DynArray.h" +#include "VMS_Implementations/VMS_impl/VMS.h" +#include "C_Libraries/Queue_impl/PrivateQueue.h" +#include "C_Libraries/DynArray/DynArray.h" /*This header defines everything specific to the VPThread semantic plug-in diff -r 258ff77b64b1 -r 99b300fa7f1c VPThread_PluginFns.c --- a/VPThread_PluginFns.c Fri Dec 16 20:03:16 2011 +0100 +++ b/VPThread_PluginFns.c Mon Feb 13 19:36:58 2012 +0100 @@ -8,7 +8,7 @@ #include #include -#include "VMS/Queue_impl/PrivateQueue.h" +#include "C_Libraries/Queue_impl/PrivateQueue.h" #include "VPThread.h" #include "VPThread_Request_Handlers.h" #include "VPThread_helper.h" @@ -142,7 +142,7 @@ handleDissipate( VirtProcr *requestingPr, VPThdSemEnv *semEnv ) { //free any semantic data allocated to the virt procr - VMS__free( requestingPr->semanticData ); + VMS_int__free( requestingPr->semanticData ); //Now, call VMS to free_all AppVP state -- stack and so on VMS__dissipate_procr( requestingPr ); diff -r 258ff77b64b1 -r 99b300fa7f1c VPThread_Request_Handlers.c --- a/VPThread_Request_Handlers.c Fri Dec 16 20:03:16 2011 +0100 +++ b/VPThread_Request_Handlers.c Mon Feb 13 19:36:58 2012 +0100 @@ -9,11 +9,11 @@ #include #include -#include "VMS/VMS.h" -#include "VMS/Queue_impl/PrivateQueue.h" -#include "VMS/Hash_impl/PrivateHash.h" +#include "VMS_Implementations/VMS_impl/VMS.h" +#include "C_Libraries/Queue_impl/PrivateQueue.h" +#include "C_Libraries/Hash_impl/PrivateHash.h" #include "VPThread.h" -#include "VMS/vmalloc.h" +#include "VMS_Implementations/VMS_impl/vmalloc.h" #include "VPThread_Request_Handlers.h" @@ -28,8 +28,8 @@ VirtProcr *requestingPr; requestingPr = semReq->requestingPr; - newMutex = VMS__malloc( sizeof(VPThdMutex) ); - newMutex->waitingQueue = makeVMSPrivQ( requestingPr ); + newMutex = VMS_int__malloc( sizeof(VPThdMutex) ); + newMutex->waitingQueue = makePrivQ( requestingPr ); newMutex->holderOfLock = NULL; //The mutex struc contains an int that identifies it -- use that as @@ -113,10 +113,10 @@ VirtProcr *requestingPr; requestingPr = semReq->requestingPr; - newCond = VMS__malloc( sizeof(VPThdCond) ); + newCond = VMS_int__malloc( sizeof(VPThdCond) ); newCond->partnerMutex = semEnv->mutexDynArray[ semReq->mutexIdx ]; - newCond->waitingQueue = makeVMSPrivQ(); + newCond->waitingQueue = makePrivQ(); //The cond struc contains an int that identifies it -- use that as // its index within the array of conds. Add the new cond to array. @@ -202,7 +202,7 @@ saveLowTimeStampCountInto( startStamp ); #endif //================================================================== - ptr = VMS__malloc( semReq->sizeToMalloc ); + ptr = VMS_int__malloc( semReq->sizeToMalloc ); requestingPr->dataRetFromReq = ptr; resume_procr( requestingPr, semEnv ); //========================= MEASUREMENT STUFF ====================== @@ -225,7 +225,7 @@ saveLowTimeStampCountInto( startStamp ); #endif //================================================================== - VMS__free( semReq->ptrToFree ); + VMS_int__free( semReq->ptrToFree ); resume_procr( requestingPr, semEnv ); //========================= MEASUREMENT STUFF ====================== #ifdef MEAS__TIME_PLUGIN @@ -279,8 +279,8 @@ { VPThdSingleton *singleton; if( *(semReq->singletonPtrAddr) == NULL ) - { singleton = VMS__malloc( sizeof(VPThdSingleton) ); - singleton->waitQ = makeVMSPrivQ(); + { singleton = VMS_int__malloc( sizeof(VPThdSingleton) ); + singleton->waitQ = makePrivQ(); singleton->endInstrAddr = 0x0; singleton->hasBeenStarted = FALSE; singleton->hasFinished = FALSE; @@ -377,7 +377,7 @@ //add this trans ID to the list of transactions entered -- check when // end a transaction semData->highestTransEntered = semReq->transID; - nextTransElem = VMS__malloc( sizeof(TransListElem) ); + nextTransElem = VMS_int__malloc( sizeof(TransListElem) ); nextTransElem->transID = semReq->transID; nextTransElem->nextTrans = semData->lastTransEntered; semData->lastTransEntered = nextTransElem; diff -r 258ff77b64b1 -r 99b300fa7f1c VPThread_helper.c --- a/VPThread_helper.c Fri Dec 16 20:03:16 2011 +0100 +++ b/VPThread_helper.c Mon Feb 13 19:36:58 2012 +0100 @@ -1,7 +1,7 @@ #include -#include "VMS/VMS.h" +#include "VMS_Implementations/VMS_impl/VMS.h" #include "VPThread.h" /*Re-use this in the entry-point fn @@ -17,7 +17,7 @@ semEnv->numVirtPr += 1; - semData = VMS__malloc( sizeof(VPThdSemData) ); + semData = VMS_int__malloc( sizeof(VPThdSemData) ); semData->highestTransEntered = -1; semData->lastTransEntered = NULL; diff -r 258ff77b64b1 -r 99b300fa7f1c VPThread_helper.h --- a/VPThread_helper.h Fri Dec 16 20:03:16 2011 +0100 +++ b/VPThread_helper.h Mon Feb 13 19:36:58 2012 +0100 @@ -5,7 +5,7 @@ * Created on June 10, 2011, 12:20 PM */ -#include "VMS/VMS.h" +#include "VMS_Implementations/VMS_impl/VMS.h" #include "VPThread.h" #ifndef VPTHREAD_HELPER_H diff -r 258ff77b64b1 -r 99b300fa7f1c VPThread_lib.c --- a/VPThread_lib.c Fri Dec 16 20:03:16 2011 +0100 +++ b/VPThread_lib.c Mon Feb 13 19:36:58 2012 +0100 @@ -8,11 +8,11 @@ #include #include -#include "VMS/VMS.h" +#include "VMS_Implementations/VMS_impl/VMS.h" #include "VPThread.h" #include "VPThread_helper.h" -#include "VMS/Queue_impl/PrivateQueue.h" -#include "VMS/Hash_impl/PrivateHash.h" +#include "C_Libraries/Queue_impl/PrivateQueue.h" +#include "C_Libraries/Hash_impl/PrivateHash.h" //========================================================================== @@ -189,15 +189,15 @@ //create the semantic layer's environment (all its data) and add to // the master environment - semanticEnv = VMS__malloc( sizeof( VPThdSemEnv ) ); + semanticEnv = VMS_int__malloc( sizeof( VPThdSemEnv ) ); _VMSMasterEnv->semanticEnv = semanticEnv; //create the ready queue - readyVPQs = VMS__malloc( NUM_CORES * sizeof(PrivQueueStruc *) ); + readyVPQs = VMS_int__malloc( NUM_CORES * sizeof(PrivQueueStruc *) ); for( coreIdx = 0; coreIdx < NUM_CORES; coreIdx++ ) { - readyVPQs[ coreIdx ] = makeVMSPrivQ(); + readyVPQs[ coreIdx ] = makePrivQ(); } semanticEnv->readyVPQs = readyVPQs; @@ -219,8 +219,8 @@ semanticEnv->fnSingletons[i].endInstrAddr = NULL; semanticEnv->fnSingletons[i].hasBeenStarted = FALSE; semanticEnv->fnSingletons[i].hasFinished = FALSE; - semanticEnv->fnSingletons[i].waitQ = makeVMSPrivQ(); - semanticEnv->transactionStrucs[i].waitingVPQ = makeVMSPrivQ(); + semanticEnv->fnSingletons[i].waitQ = makePrivQ(); + semanticEnv->transactionStrucs[i].waitingVPQ = makePrivQ(); } }