VMS/VMS_Implementations/SSR_impls/SSR__MC_shared_impl

changeset 77:833b31a8abc1 Holistic_Model

working version (w/ old hash impl)
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Tue, 28 Aug 2012 13:40:07 +0200
parents 6647aea90477
children ee8510009267
files SSR_PluginFns.c SSR_Request_Handlers.c
diffstat 2 files changed, 12 insertions(+), 5 deletions(-) [+]
line diff
     1.1 --- a/SSR_PluginFns.c	Sun Jul 15 02:03:43 2012 -0700
     1.2 +++ b/SSR_PluginFns.c	Tue Aug 28 13:40:07 2012 +0200
     1.3 @@ -118,7 +118,9 @@
     1.4        
     1.5     while( req != NULL )
     1.6      {
     1.7 -//          semEnv->lastReqType = 0;
     1.8 +#ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
     1.9 +          semEnv->lastReqType = 0;
    1.10 +#endif
    1.11        switch( req->reqType )
    1.12         { case semantic:     handleSemReq(         req, requestingPr, semEnv);
    1.13              break;
    1.14 @@ -298,12 +300,13 @@
    1.15     if(procr->assignCount <= 1){
    1.16         newu.ret_ptr = procr->resumeInstrPtr;  
    1.17     } else {
    1.18 -        void* frame_ptr0 = procr->framePtr;                               
    1.19 +        /*void* frame_ptr0 = procr->framePtr;                               
    1.20          void* frame_ptr1 = *((void**)frame_ptr0);                          
    1.21          void* frame_ptr2 = *((void**)frame_ptr1);                          
    1.22          void* frame_ptr3 = *((void**)frame_ptr2);                          
    1.23          void* ret_addr = *((void**)frame_ptr3 + 1);                        
    1.24 -        newu.ret_ptr = ret_addr; 
    1.25 +        newu.ret_ptr = ret_addr; */
    1.26 +       newu.ret_ptr = procr->resumeInstrPtr;
    1.27     }
    1.28     addToListOfArrays(Unit,newu,semEnv->unitList);
    1.29     
     2.1 --- a/SSR_Request_Handlers.c	Sun Jul 15 02:03:43 2012 -0700
     2.2 +++ b/SSR_Request_Handlers.c	Tue Aug 28 13:40:07 2012 +0200
     2.3 @@ -428,7 +428,9 @@
     2.4   { void *ptr;
     2.5   
     2.6        DEBUG__printf1(dbgRqstHdlr,"Malloc request from processor %d",requestingPr->slaveID)
     2.7 -//      semEnv->lastReqType = 1;
     2.8 +#ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
     2.9 +      semEnv->lastReqType = 1;
    2.10 +#endif
    2.11     ptr = VMS_PI__malloc( semReq->sizeToMalloc );
    2.12     requestingPr->dataRetFromReq = ptr;
    2.13     resume_slaveVP( requestingPr, semEnv );
    2.14 @@ -440,7 +442,9 @@
    2.15  handleFree( SSRSemReq *semReq, SlaveVP *requestingPr, SSRSemEnv *semEnv )
    2.16   {
    2.17           DEBUG__printf1(dbgRqstHdlr,"Free request from processor %d",requestingPr->slaveID)
    2.18 -//         semEnv->lastReqType = 1;
    2.19 +#ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
    2.20 +         semEnv->lastReqType = 1;
    2.21 +#endif
    2.22     VMS_PI__free( semReq->ptrToFree );     
    2.23     resume_slaveVP( requestingPr, semEnv );
    2.24   }