changeset 220:fb75c4b52d32 HW__4x10__WestmereEX

Fixed sequential version
author Merten Sach <msach@mailbox.tu-berlin.de>
date Mon, 05 Mar 2012 13:59:02 +0100
parents a262abf4b8d5
children b8b167b91a5e
files CoreLoop.c MasterLoop.c
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/CoreLoop.c	Fri Feb 17 18:43:52 2012 +0100
     1.2 +++ b/CoreLoop.c	Mon Mar 05 13:59:02 2012 +0100
     1.3 @@ -243,6 +243,7 @@
     1.4   {
     1.5     VirtProcr      *currVP;
     1.6     VMSQueueStruc *readyToAnimateQ;
     1.7 +   int32           numMasterInARow = 0;
     1.8     
     1.9     ThdParams      *coreLoopThdParams;
    1.10     int             thisCoresIdx;
    1.11 @@ -262,14 +263,14 @@
    1.12     readyToAnimateQ  = _VMSMasterEnv->readyToAnimateQs[thisCoresIdx];
    1.13     currVP = (VirtProcr *) readVMSQ( readyToAnimateQ );
    1.14     if( currVP == NULL )
    1.15 -    { if( _VMSMasterEnv->numMasterInARow[thisCoresIdx] > 1000 )
    1.16 +    { if( numMasterInARow > 1000 )
    1.17         { printf("too many back to back MasterVP\n"); exit(1); }
    1.18 -      _VMSMasterEnv->numMasterInARow[thisCoresIdx] += 1;
    1.19 +      numMasterInARow += 1;
    1.20        
    1.21        currVP = _VMSMasterEnv->masterVPs[thisCoresIdx];
    1.22      }
    1.23     else
    1.24 -      _VMSMasterEnv->numMasterInARow[thisCoresIdx] = 0;
    1.25 +      numMasterInARow = 0;
    1.26  
    1.27  
    1.28     switchToVP( currVP );
     2.1 --- a/MasterLoop.c	Fri Feb 17 18:43:52 2012 +0100
     2.2 +++ b/MasterLoop.c	Mon Mar 05 13:59:02 2012 +0100
     2.3 @@ -340,7 +340,7 @@
     2.4  
     2.5     //====== Start Gate-protection =======
     2.6     vicGate->gateClosed = TRUE;
     2.7 -   coreMightBeInProtected= vicGate->preGateProgress != vicGate->exitProgress;
     2.8 +   coreMightBeInProtected= (vicGate->preGateProgress != vicGate->exitProgress);
     2.9     while( coreMightBeInProtected )
    2.10      {    //wait until sure
    2.11        if( vicGate->preGateProgress == vicGate->waitProgress )