Mercurial > cgi-bin > hgwebdir.cgi > VMS > VMS_Implementations > Vthread_impls > Vthread_MC_shared_impl
changeset 26:99b300fa7f1c V0
New include paths because of new project structure and branch file
| author | Merten Sach <msach@mailbox.tu-berlin.de> |
|---|---|
| date | Mon, 13 Feb 2012 19:36:58 +0100 |
| parents | 258ff77b64b1 |
| children | |
| files | VMS_lang_specific_defines.h VPThread.h VPThread_PluginFns.c VPThread_Request_Handlers.c VPThread_helper.c VPThread_helper.h VPThread_lib.c __brch__V0 |
| diffstat | 7 files changed, 30 insertions(+), 30 deletions(-) [+] |
line diff
1.1 --- a/VMS_lang_specific_defines.h Fri Dec 16 20:03:16 2011 +0100 1.2 +++ b/VMS_lang_specific_defines.h Mon Feb 13 19:36:58 2012 +0100 1.3 @@ -5,7 +5,7 @@ 1.4 * Created on June 10, 2011, 12:20 PM 1.5 */ 1.6 1.7 -#include "VMS/VMS.h" 1.8 +#include "VMS_Implementations/VMS_impl/VMS.h" 1.9 #include "VPThread.h" 1.10 1.11 #ifndef VMS_lang_specific_defines_H
2.1 --- a/VPThread.h Fri Dec 16 20:03:16 2011 +0100 2.2 +++ b/VPThread.h Mon Feb 13 19:36:58 2012 +0100 2.3 @@ -9,9 +9,9 @@ 2.4 #ifndef _VPThread_H 2.5 #define _VPThread_H 2.6 2.7 -#include "VMS/VMS.h" 2.8 -#include "VMS/Queue_impl/PrivateQueue.h" 2.9 -#include "VMS/DynArray/DynArray.h" 2.10 +#include "VMS_Implementations/VMS_impl/VMS.h" 2.11 +#include "C_Libraries/Queue_impl/PrivateQueue.h" 2.12 +#include "C_Libraries/DynArray/DynArray.h" 2.13 2.14 2.15 /*This header defines everything specific to the VPThread semantic plug-in
3.1 --- a/VPThread_PluginFns.c Fri Dec 16 20:03:16 2011 +0100 3.2 +++ b/VPThread_PluginFns.c Mon Feb 13 19:36:58 2012 +0100 3.3 @@ -8,7 +8,7 @@ 3.4 #include <stdlib.h> 3.5 #include <malloc.h> 3.6 3.7 -#include "VMS/Queue_impl/PrivateQueue.h" 3.8 +#include "C_Libraries/Queue_impl/PrivateQueue.h" 3.9 #include "VPThread.h" 3.10 #include "VPThread_Request_Handlers.h" 3.11 #include "VPThread_helper.h" 3.12 @@ -142,7 +142,7 @@ 3.13 handleDissipate( VirtProcr *requestingPr, VPThdSemEnv *semEnv ) 3.14 { 3.15 //free any semantic data allocated to the virt procr 3.16 - VMS__free( requestingPr->semanticData ); 3.17 + VMS_int__free( requestingPr->semanticData ); 3.18 3.19 //Now, call VMS to free_all AppVP state -- stack and so on 3.20 VMS__dissipate_procr( requestingPr );
4.1 --- a/VPThread_Request_Handlers.c Fri Dec 16 20:03:16 2011 +0100 4.2 +++ b/VPThread_Request_Handlers.c Mon Feb 13 19:36:58 2012 +0100 4.3 @@ -9,11 +9,11 @@ 4.4 #include <stdio.h> 4.5 #include <malloc.h> 4.6 4.7 -#include "VMS/VMS.h" 4.8 -#include "VMS/Queue_impl/PrivateQueue.h" 4.9 -#include "VMS/Hash_impl/PrivateHash.h" 4.10 +#include "VMS_Implementations/VMS_impl/VMS.h" 4.11 +#include "C_Libraries/Queue_impl/PrivateQueue.h" 4.12 +#include "C_Libraries/Hash_impl/PrivateHash.h" 4.13 #include "VPThread.h" 4.14 -#include "VMS/vmalloc.h" 4.15 +#include "VMS_Implementations/VMS_impl/vmalloc.h" 4.16 4.17 #include "VPThread_Request_Handlers.h" 4.18 4.19 @@ -28,8 +28,8 @@ 4.20 VirtProcr *requestingPr; 4.21 4.22 requestingPr = semReq->requestingPr; 4.23 - newMutex = VMS__malloc( sizeof(VPThdMutex) ); 4.24 - newMutex->waitingQueue = makeVMSPrivQ( requestingPr ); 4.25 + newMutex = VMS_int__malloc( sizeof(VPThdMutex) ); 4.26 + newMutex->waitingQueue = makePrivQ( requestingPr ); 4.27 newMutex->holderOfLock = NULL; 4.28 4.29 //The mutex struc contains an int that identifies it -- use that as 4.30 @@ -113,10 +113,10 @@ 4.31 VirtProcr *requestingPr; 4.32 4.33 requestingPr = semReq->requestingPr; 4.34 - newCond = VMS__malloc( sizeof(VPThdCond) ); 4.35 + newCond = VMS_int__malloc( sizeof(VPThdCond) ); 4.36 newCond->partnerMutex = semEnv->mutexDynArray[ semReq->mutexIdx ]; 4.37 4.38 - newCond->waitingQueue = makeVMSPrivQ(); 4.39 + newCond->waitingQueue = makePrivQ(); 4.40 4.41 //The cond struc contains an int that identifies it -- use that as 4.42 // its index within the array of conds. Add the new cond to array. 4.43 @@ -202,7 +202,7 @@ 4.44 saveLowTimeStampCountInto( startStamp ); 4.45 #endif 4.46 //================================================================== 4.47 - ptr = VMS__malloc( semReq->sizeToMalloc ); 4.48 + ptr = VMS_int__malloc( semReq->sizeToMalloc ); 4.49 requestingPr->dataRetFromReq = ptr; 4.50 resume_procr( requestingPr, semEnv ); 4.51 //========================= MEASUREMENT STUFF ====================== 4.52 @@ -225,7 +225,7 @@ 4.53 saveLowTimeStampCountInto( startStamp ); 4.54 #endif 4.55 //================================================================== 4.56 - VMS__free( semReq->ptrToFree ); 4.57 + VMS_int__free( semReq->ptrToFree ); 4.58 resume_procr( requestingPr, semEnv ); 4.59 //========================= MEASUREMENT STUFF ====================== 4.60 #ifdef MEAS__TIME_PLUGIN 4.61 @@ -279,8 +279,8 @@ 4.62 { VPThdSingleton *singleton; 4.63 4.64 if( *(semReq->singletonPtrAddr) == NULL ) 4.65 - { singleton = VMS__malloc( sizeof(VPThdSingleton) ); 4.66 - singleton->waitQ = makeVMSPrivQ(); 4.67 + { singleton = VMS_int__malloc( sizeof(VPThdSingleton) ); 4.68 + singleton->waitQ = makePrivQ(); 4.69 singleton->endInstrAddr = 0x0; 4.70 singleton->hasBeenStarted = FALSE; 4.71 singleton->hasFinished = FALSE; 4.72 @@ -377,7 +377,7 @@ 4.73 //add this trans ID to the list of transactions entered -- check when 4.74 // end a transaction 4.75 semData->highestTransEntered = semReq->transID; 4.76 - nextTransElem = VMS__malloc( sizeof(TransListElem) ); 4.77 + nextTransElem = VMS_int__malloc( sizeof(TransListElem) ); 4.78 nextTransElem->transID = semReq->transID; 4.79 nextTransElem->nextTrans = semData->lastTransEntered; 4.80 semData->lastTransEntered = nextTransElem;
5.1 --- a/VPThread_helper.c Fri Dec 16 20:03:16 2011 +0100 5.2 +++ b/VPThread_helper.c Mon Feb 13 19:36:58 2012 +0100 5.3 @@ -1,7 +1,7 @@ 5.4 5.5 #include <stddef.h> 5.6 5.7 -#include "VMS/VMS.h" 5.8 +#include "VMS_Implementations/VMS_impl/VMS.h" 5.9 #include "VPThread.h" 5.10 5.11 /*Re-use this in the entry-point fn 5.12 @@ -17,7 +17,7 @@ 5.13 5.14 semEnv->numVirtPr += 1; 5.15 5.16 - semData = VMS__malloc( sizeof(VPThdSemData) ); 5.17 + semData = VMS_int__malloc( sizeof(VPThdSemData) ); 5.18 semData->highestTransEntered = -1; 5.19 semData->lastTransEntered = NULL; 5.20
6.1 --- a/VPThread_helper.h Fri Dec 16 20:03:16 2011 +0100 6.2 +++ b/VPThread_helper.h Mon Feb 13 19:36:58 2012 +0100 6.3 @@ -5,7 +5,7 @@ 6.4 * Created on June 10, 2011, 12:20 PM 6.5 */ 6.6 6.7 -#include "VMS/VMS.h" 6.8 +#include "VMS_Implementations/VMS_impl/VMS.h" 6.9 #include "VPThread.h" 6.10 6.11 #ifndef VPTHREAD_HELPER_H
7.1 --- a/VPThread_lib.c Fri Dec 16 20:03:16 2011 +0100 7.2 +++ b/VPThread_lib.c Mon Feb 13 19:36:58 2012 +0100 7.3 @@ -8,11 +8,11 @@ 7.4 #include <stdlib.h> 7.5 #include <malloc.h> 7.6 7.7 -#include "VMS/VMS.h" 7.8 +#include "VMS_Implementations/VMS_impl/VMS.h" 7.9 #include "VPThread.h" 7.10 #include "VPThread_helper.h" 7.11 -#include "VMS/Queue_impl/PrivateQueue.h" 7.12 -#include "VMS/Hash_impl/PrivateHash.h" 7.13 +#include "C_Libraries/Queue_impl/PrivateQueue.h" 7.14 +#include "C_Libraries/Hash_impl/PrivateHash.h" 7.15 7.16 7.17 //========================================================================== 7.18 @@ -189,15 +189,15 @@ 7.19 7.20 //create the semantic layer's environment (all its data) and add to 7.21 // the master environment 7.22 - semanticEnv = VMS__malloc( sizeof( VPThdSemEnv ) ); 7.23 + semanticEnv = VMS_int__malloc( sizeof( VPThdSemEnv ) ); 7.24 _VMSMasterEnv->semanticEnv = semanticEnv; 7.25 7.26 //create the ready queue 7.27 - readyVPQs = VMS__malloc( NUM_CORES * sizeof(PrivQueueStruc *) ); 7.28 + readyVPQs = VMS_int__malloc( NUM_CORES * sizeof(PrivQueueStruc *) ); 7.29 7.30 for( coreIdx = 0; coreIdx < NUM_CORES; coreIdx++ ) 7.31 { 7.32 - readyVPQs[ coreIdx ] = makeVMSPrivQ(); 7.33 + readyVPQs[ coreIdx ] = makePrivQ(); 7.34 } 7.35 7.36 semanticEnv->readyVPQs = readyVPQs; 7.37 @@ -219,8 +219,8 @@ 7.38 semanticEnv->fnSingletons[i].endInstrAddr = NULL; 7.39 semanticEnv->fnSingletons[i].hasBeenStarted = FALSE; 7.40 semanticEnv->fnSingletons[i].hasFinished = FALSE; 7.41 - semanticEnv->fnSingletons[i].waitQ = makeVMSPrivQ(); 7.42 - semanticEnv->transactionStrucs[i].waitingVPQ = makeVMSPrivQ(); 7.43 + semanticEnv->fnSingletons[i].waitQ = makePrivQ(); 7.44 + semanticEnv->transactionStrucs[i].waitingVPQ = makePrivQ(); 7.45 } 7.46 } 7.47