changeset 1:bfa2fe3552e4

Refactored -- working measurement for suspend and master
author Me
date Sat, 11 Sep 2010 04:49:31 -0700
parents e123acb162f0
children a99b99c2b814
files MeasVMS.h MeasVMS_PluginFns.c MeasVMS_lib.c
diffstat 3 files changed, 6 insertions(+), 12 deletions(-) [+]
line diff
     1.1 --- a/MeasVMS.h	Sat Sep 11 03:25:03 2010 -0700
     1.2 +++ b/MeasVMS.h	Sat Sep 11 04:49:31 2010 -0700
     1.3 @@ -59,10 +59,10 @@
     1.4  
     1.5  typedef struct
     1.6   {
     1.7 -    Histogram **suspHistAddr;
     1.8 -    Histogram **masterHistAddr;
     1.9 +    Histogram *suspHist;
    1.10 +    Histogram *masterHist;
    1.11   }
    1.12 -PairOfHistAddresses;
    1.13 +HistCarrier;
    1.14  
    1.15  //===========================================================================
    1.16  
     2.1 --- a/MeasVMS_PluginFns.c	Sat Sep 11 03:25:03 2010 -0700
     2.2 +++ b/MeasVMS_PluginFns.c	Sat Sep 11 04:49:31 2010 -0700
     2.3 @@ -44,12 +44,6 @@
     2.4     semEnv->numTimesCalled += 1;
     2.5     if( semEnv->numTimesCalled >= MEAS__NUM_TIMES_TO_RUN )
     2.6      {
     2.7 -      #ifdef MEAS__TIME_STAMP_SUSP
     2.8 -      *(semEnv->addrOfSuspHist)   = _VMSMasterEnv->measSuspHist;
     2.9 -      #endif
    2.10 -      #ifdef MEAS__TIME_MASTER
    2.11 -      *(semEnv->addrOfMasterHist) = _VMSMasterEnv->measMasterHist;
    2.12 -      #endif
    2.13        VMS__handle_shutdown_reqst( requestingPr );
    2.14      }
    2.15     
     3.1 --- a/MeasVMS_lib.c	Sat Sep 11 03:25:03 2010 -0700
     3.2 +++ b/MeasVMS_lib.c	Sat Sep 11 04:49:31 2010 -0700
     3.3 @@ -64,10 +64,10 @@
     3.4     semEnv->numVirtPr = 1;
     3.5  
     3.6     //============================= MEASUREMENT STUFF ========================
     3.7 -   PairOfHistAddresses *histCarrier = (PairOfHistAddresses *)initData;
     3.8 +   HistCarrier *histCarrier = (HistCarrier *)initData;
     3.9  
    3.10 -   semEnv->addrOfSuspHist   = histCarrier->suspHistAddr;
    3.11 -   semEnv->addrOfMasterHist = histCarrier->masterHistAddr;
    3.12 +   semEnv->addrOfSuspHist   = histCarrier->suspHist;
    3.13 +   semEnv->addrOfMasterHist = histCarrier->masterHist;
    3.14     //========================================================================
    3.15  
    3.16