# HG changeset patch
# User Me
# Date 1284205771 25200
# Node ID bfa2fe3552e4fafc1fa6f10327198ec53a2e87ec
# Parent  e123acb162f05306170f2b8e39ef51bbda8acb47
Refactored -- working measurement for suspend and master

diff -r e123acb162f0 -r bfa2fe3552e4 MeasVMS.h
--- a/MeasVMS.h	Sat Sep 11 03:25:03 2010 -0700
+++ b/MeasVMS.h	Sat Sep 11 04:49:31 2010 -0700
@@ -59,10 +59,10 @@
 
 typedef struct
  {
-    Histogram **suspHistAddr;
-    Histogram **masterHistAddr;
+    Histogram *suspHist;
+    Histogram *masterHist;
  }
-PairOfHistAddresses;
+HistCarrier;
 
 //===========================================================================
 
diff -r e123acb162f0 -r bfa2fe3552e4 MeasVMS_PluginFns.c
--- a/MeasVMS_PluginFns.c	Sat Sep 11 03:25:03 2010 -0700
+++ b/MeasVMS_PluginFns.c	Sat Sep 11 04:49:31 2010 -0700
@@ -44,12 +44,6 @@
    semEnv->numTimesCalled += 1;
    if( semEnv->numTimesCalled >= MEAS__NUM_TIMES_TO_RUN )
     {
-      #ifdef MEAS__TIME_STAMP_SUSP
-      *(semEnv->addrOfSuspHist)   = _VMSMasterEnv->measSuspHist;
-      #endif
-      #ifdef MEAS__TIME_MASTER
-      *(semEnv->addrOfMasterHist) = _VMSMasterEnv->measMasterHist;
-      #endif
       VMS__handle_shutdown_reqst( requestingPr );
     }
    
diff -r e123acb162f0 -r bfa2fe3552e4 MeasVMS_lib.c
--- a/MeasVMS_lib.c	Sat Sep 11 03:25:03 2010 -0700
+++ b/MeasVMS_lib.c	Sat Sep 11 04:49:31 2010 -0700
@@ -64,10 +64,10 @@
    semEnv->numVirtPr = 1;
 
    //============================= MEASUREMENT STUFF ========================
-   PairOfHistAddresses *histCarrier = (PairOfHistAddresses *)initData;
+   HistCarrier *histCarrier = (HistCarrier *)initData;
 
-   semEnv->addrOfSuspHist   = histCarrier->suspHistAddr;
-   semEnv->addrOfMasterHist = histCarrier->masterHistAddr;
+   semEnv->addrOfSuspHist   = histCarrier->suspHist;
+   semEnv->addrOfMasterHist = histCarrier->masterHist;
    //========================================================================