1.1 --- a/SSR.h	Mon Nov 08 04:02:50 2010 -0800
     1.2 +++ b/SSR.h	Thu Nov 11 04:59:48 2010 -0800
     1.3 @@ -15,7 +15,6 @@
     1.4  
     1.5  
     1.6  //===========================================================================
     1.7 -
     1.8  #define NUM_STRUCS_IN_SEM_ENV 1000
     1.9  
    1.10  //===========================================================================

     2.1 --- a/SSR_PluginFns.c	Mon Nov 08 04:02:50 2010 -0800
     2.2 +++ b/SSR_PluginFns.c	Thu Nov 11 04:59:48 2010 -0800
     2.3 @@ -13,7 +13,7 @@
     2.4  
     2.5  //=========================== Local Fn Prototypes ===========================
     2.6  void inline
     2.7 -resumePr( VirtProcr *procr, SSRSemEnv *semEnv );
     2.8 +resume_procr( VirtProcr *procr, SSRSemEnv *semEnv );
     2.9  
    2.10  void inline
    2.11  handleSemReq( VMSReqst *req, VirtProcr *requestingPr, SSRSemEnv *semEnv );
    2.12 @@ -78,7 +78,7 @@
    2.13           case dissipate:    handleDissipate(           requestingPr, semEnv);
    2.14              break;
    2.15           case VMSSemantic:  VMS__handle_VMSSemReq(req, requestingPr, semEnv,
    2.16 -                                                                  &resumePr);
    2.17 +                                                                  &resume_procr);
    2.18              break;
    2.19           default:
    2.20              break;
    2.21 @@ -199,14 +199,14 @@
    2.22        //For SSR, caller needs ptr to created processor returned to it
    2.23     requestingPr->dataRetFromReq = newPr;
    2.24  
    2.25 -   resumePr( newPr,        semEnv );
    2.26 -   resumePr( requestingPr, semEnv );
    2.27 +   resume_procr( newPr,        semEnv );
    2.28 +   resume_procr( requestingPr, semEnv );
    2.29   }
    2.30  
    2.31  
    2.32  //=========================== Helper ==============================
    2.33  void inline
    2.34 -resumePr( VirtProcr *procr, SSRSemEnv *semEnv )
    2.35 +resume_procr( VirtProcr *procr, SSRSemEnv *semEnv )
    2.36   {
    2.37     writePrivQ( procr, semEnv->readyVPQs[ procr->coreAnimatedBy] );
    2.38   }

     3.1 --- a/SSR_Request_Handlers.c	Mon Nov 08 04:02:50 2010 -0800
     3.2 +++ b/SSR_Request_Handlers.c	Thu Nov 11 04:59:48 2010 -0800
     3.3 @@ -16,7 +16,7 @@
     3.4  
     3.5  //=========================== Local Fn Prototypes ===========================
     3.6  void inline
     3.7 -resumePr( VirtProcr *procr, SSRSemEnv *semEnv );
     3.8 +resume_procr( VirtProcr *procr, SSRSemEnv *semEnv );
     3.9  
    3.10  
    3.11  
    3.12 @@ -139,8 +139,8 @@
    3.13        receivePr->dataRetFromReq = semReq->msg;
    3.14  
    3.15           //bring both processors back from suspend
    3.16 -      resumePr( sendPr,    semEnv );
    3.17 -      resumePr( receivePr, semEnv );
    3.18 +      resume_procr( sendPr,    semEnv );
    3.19 +      resume_procr( receivePr, semEnv );
    3.20  
    3.21        return;
    3.22      }
    3.23 @@ -353,7 +353,7 @@
    3.24  
    3.25     ptr = VMS__malloc( semReq->sizeToMalloc );
    3.26     requestingPr->dataRetFromReq = ptr;
    3.27 -   resumePr( requestingPr, semEnv );
    3.28 +   resume_procr( requestingPr, semEnv );
    3.29   }
    3.30  
    3.31  /*
    3.32 @@ -362,7 +362,7 @@
    3.33  handleFree( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv )
    3.34   {
    3.35     VMS__free( semReq->ptrToFree );
    3.36 -   resumePr( requestingPr, semEnv );
    3.37 +   resume_procr( requestingPr, semEnv );
    3.38   }
    3.39  
    3.40  
    3.41 @@ -380,7 +380,7 @@
    3.42     else
    3.43        semEnv->singletonHasBeenExecutedFlags[ semReq->singletonID ] = TRUE;
    3.44  
    3.45 -   resumePr( requestingPr, semEnv );
    3.46 +   resume_procr( requestingPr, semEnv );
    3.47   }
    3.48  
    3.49  
    3.50 @@ -391,7 +391,7 @@
    3.51  handleAtomic( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv )
    3.52   {
    3.53     semReq->fnToExecInMaster( semReq->dataForFn );
    3.54 -   resumePr( requestingPr, semEnv );
    3.55 +   resume_procr( requestingPr, semEnv );
    3.56   }
    3.57  
    3.58  /*First, it looks at the VP's semantic data, to see the highest transactionID
    3.59 @@ -435,7 +435,7 @@
    3.60     if( transStruc->VPCurrentlyExecuting == NULL )
    3.61      {
    3.62        transStruc->VPCurrentlyExecuting = requestingPr;
    3.63 -      resumePr( requestingPr, semEnv );
    3.64 +      resume_procr( requestingPr, semEnv );
    3.65      }
    3.66     else
    3.67      {    //note, might make future things cleaner if save request with VP and
    3.68 @@ -489,7 +489,7 @@
    3.69     transStruc->VPCurrentlyExecuting = waitingPr;
    3.70  
    3.71     if( waitingPr != NULL )
    3.72 -      resumePr( waitingPr, semEnv );
    3.73 +      resume_procr( waitingPr, semEnv );
    3.74  
    3.75 -   resumePr( requestingPr, semEnv );
    3.76 +   resume_procr( requestingPr, semEnv );
    3.77   }

     4.1 --- a/SSR_lib.c	Mon Nov 08 04:02:50 2010 -0800
     4.2 +++ b/SSR_lib.c	Thu Nov 11 04:59:48 2010 -0800
     4.3 @@ -106,7 +106,7 @@
     4.4     seedPr = SSR__create_procr_helper( fnPtr, initData,
     4.5                                        semEnv, semEnv->nextCoreToGetNewPr++ );
     4.6  
     4.7 -   resumePr( seedPr, semEnv );
     4.8 +   resume_procr( seedPr, semEnv );
     4.9     
    4.10     #ifdef SEQUENTIAL
    4.11     VMS__start_the_work_then_wait_until_done_Seq();  //debug sequential exe