# HG changeset patch
# User SeanHalle
# Date 1289480388 28800
# Node ID b549ad140f18665e9183569a801f5c6aa5d19b38
# Parent  cee3eecc5c223a99af2555d182916da80cb178e2
chgd resumePr to resume_procr

diff -r cee3eecc5c22 -r b549ad140f18 SSR.h
--- a/SSR.h	Mon Nov 08 04:02:50 2010 -0800
+++ b/SSR.h	Thu Nov 11 04:59:48 2010 -0800
@@ -15,7 +15,6 @@
 
 
 //===========================================================================
-
 #define NUM_STRUCS_IN_SEM_ENV 1000
 
 //===========================================================================
diff -r cee3eecc5c22 -r b549ad140f18 SSR_PluginFns.c
--- a/SSR_PluginFns.c	Mon Nov 08 04:02:50 2010 -0800
+++ b/SSR_PluginFns.c	Thu Nov 11 04:59:48 2010 -0800
@@ -13,7 +13,7 @@
 
 //=========================== Local Fn Prototypes ===========================
 void inline
-resumePr( VirtProcr *procr, SSRSemEnv *semEnv );
+resume_procr( VirtProcr *procr, SSRSemEnv *semEnv );
 
 void inline
 handleSemReq( VMSReqst *req, VirtProcr *requestingPr, SSRSemEnv *semEnv );
@@ -78,7 +78,7 @@
          case dissipate:    handleDissipate(           requestingPr, semEnv);
             break;
          case VMSSemantic:  VMS__handle_VMSSemReq(req, requestingPr, semEnv,
-                                                                  &resumePr);
+                                                                  &resume_procr);
             break;
          default:
             break;
@@ -199,14 +199,14 @@
       //For SSR, caller needs ptr to created processor returned to it
    requestingPr->dataRetFromReq = newPr;
 
-   resumePr( newPr,        semEnv );
-   resumePr( requestingPr, semEnv );
+   resume_procr( newPr,        semEnv );
+   resume_procr( requestingPr, semEnv );
  }
 
 
 //=========================== Helper ==============================
 void inline
-resumePr( VirtProcr *procr, SSRSemEnv *semEnv )
+resume_procr( VirtProcr *procr, SSRSemEnv *semEnv )
  {
    writePrivQ( procr, semEnv->readyVPQs[ procr->coreAnimatedBy] );
  }
diff -r cee3eecc5c22 -r b549ad140f18 SSR_Request_Handlers.c
--- a/SSR_Request_Handlers.c	Mon Nov 08 04:02:50 2010 -0800
+++ b/SSR_Request_Handlers.c	Thu Nov 11 04:59:48 2010 -0800
@@ -16,7 +16,7 @@
 
 //=========================== Local Fn Prototypes ===========================
 void inline
-resumePr( VirtProcr *procr, SSRSemEnv *semEnv );
+resume_procr( VirtProcr *procr, SSRSemEnv *semEnv );
 
 
 
@@ -139,8 +139,8 @@
       receivePr->dataRetFromReq = semReq->msg;
 
          //bring both processors back from suspend
-      resumePr( sendPr,    semEnv );
-      resumePr( receivePr, semEnv );
+      resume_procr( sendPr,    semEnv );
+      resume_procr( receivePr, semEnv );
 
       return;
     }
@@ -353,7 +353,7 @@
 
    ptr = VMS__malloc( semReq->sizeToMalloc );
    requestingPr->dataRetFromReq = ptr;
-   resumePr( requestingPr, semEnv );
+   resume_procr( requestingPr, semEnv );
  }
 
 /*
@@ -362,7 +362,7 @@
 handleFree( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv )
  {
    VMS__free( semReq->ptrToFree );
-   resumePr( requestingPr, semEnv );
+   resume_procr( requestingPr, semEnv );
  }
 
 
@@ -380,7 +380,7 @@
    else
       semEnv->singletonHasBeenExecutedFlags[ semReq->singletonID ] = TRUE;
 
-   resumePr( requestingPr, semEnv );
+   resume_procr( requestingPr, semEnv );
  }
 
 
@@ -391,7 +391,7 @@
 handleAtomic( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv )
  {
    semReq->fnToExecInMaster( semReq->dataForFn );
-   resumePr( requestingPr, semEnv );
+   resume_procr( requestingPr, semEnv );
  }
 
 /*First, it looks at the VP's semantic data, to see the highest transactionID
@@ -435,7 +435,7 @@
    if( transStruc->VPCurrentlyExecuting == NULL )
     {
       transStruc->VPCurrentlyExecuting = requestingPr;
-      resumePr( requestingPr, semEnv );
+      resume_procr( requestingPr, semEnv );
     }
    else
     {    //note, might make future things cleaner if save request with VP and
@@ -489,7 +489,7 @@
    transStruc->VPCurrentlyExecuting = waitingPr;
 
    if( waitingPr != NULL )
-      resumePr( waitingPr, semEnv );
+      resume_procr( waitingPr, semEnv );
 
-   resumePr( requestingPr, semEnv );
+   resume_procr( requestingPr, semEnv );
  }
diff -r cee3eecc5c22 -r b549ad140f18 SSR_lib.c
--- a/SSR_lib.c	Mon Nov 08 04:02:50 2010 -0800
+++ b/SSR_lib.c	Thu Nov 11 04:59:48 2010 -0800
@@ -106,7 +106,7 @@
    seedPr = SSR__create_procr_helper( fnPtr, initData,
                                       semEnv, semEnv->nextCoreToGetNewPr++ );
 
-   resumePr( seedPr, semEnv );
+   resume_procr( seedPr, semEnv );
    
    #ifdef SEQUENTIAL
    VMS__start_the_work_then_wait_until_done_Seq();  //debug sequential exe