1.1 --- a/probes.c	Sat Feb 11 21:43:43 2012 -0800
     1.2 +++ b/probes.c	Sun Feb 12 01:49:33 2012 -0800
     1.3 @@ -9,21 +9,6 @@
     1.4  #include <sys/time.h>
     1.5  
     1.6  #include "VMS.h"
     1.7 -#include "Queue_impl/BlockingQueue.h"
     1.8 -#include "Histogram/Histogram.h"
     1.9 -
    1.10 -
    1.11 -//================================ STATS ====================================
    1.12 -
    1.13 -inline TSCount getTSCount()
    1.14 - { unsigned int low, high;
    1.15 -   TSCount  out;
    1.16 -
    1.17 -   saveTimeStampCountInto( low, high );
    1.18 -   out = high;
    1.19 -   out = (out << 32) + low;
    1.20 -   return out;
    1.21 - }
    1.22  
    1.23  
    1.24  
    1.25 @@ -108,14 +93,14 @@
    1.26   * 
    1.27   */
    1.28  IntervalProbe *
    1.29 -create_generic_probe( char *nameStr, VirtProcr *animPr )
    1.30 +create_generic_probe( char *nameStr, SlaveVP *animPr )
    1.31  {
    1.32     VMSSemReq reqData;
    1.33  
    1.34     reqData.reqType  = createProbe;
    1.35     reqData.nameStr  = nameStr;
    1.36  
    1.37 -   VMS__send_VMSSem_request( &reqData, animPr );
    1.38 +   VMS_WL__send_VMSSem_request( &reqData, animPr );
    1.39  
    1.40     return animPr->dataRetFromReq;
    1.41   }
    1.42 @@ -146,13 +131,13 @@
    1.43  void
    1.44  VMS_impl__free_probe( IntervalProbe *probe )
    1.45   { if( probe->hist != NULL )   freeDblHist( probe->hist );
    1.46 -   if( probe->nameStr != NULL) VMS__free( probe->nameStr );
    1.47 -   VMS__free( probe );
    1.48 +   if( probe->nameStr != NULL) VMS_int__free( probe->nameStr );
    1.49 +   VMS_int__free( probe );
    1.50   }
    1.51  
    1.52  
    1.53  int32
    1.54 -VMS_impl__record_time_point_into_new_probe( char *nameStr, VirtProcr *animPr)
    1.55 +VMS_impl__record_time_point_into_new_probe( char *nameStr, SlaveVP *animPr)
    1.56   { IntervalProbe *newProbe;
    1.57     struct timeval *startStamp;
    1.58     float64 startSecs;
    1.59 @@ -190,7 +175,7 @@
    1.60   }
    1.61  
    1.62  int32
    1.63 -VMS_impl__create_single_interval_probe( char *nameStr, VirtProcr *animPr )
    1.64 +VMS_impl__create_single_interval_probe( char *nameStr, SlaveVP *animPr )
    1.65   { IntervalProbe *newProbe;
    1.66  
    1.67     newProbe = create_generic_probe( nameStr, animPr );
    1.68 @@ -200,7 +185,7 @@
    1.69  
    1.70  int32
    1.71  VMS_impl__create_histogram_probe( int32   numBins, float64    startValue,
    1.72 -               float64 binWidth, char   *nameStr, VirtProcr *animPr )
    1.73 +               float64 binWidth, char   *nameStr, SlaveVP *animPr )
    1.74   { IntervalProbe *newProbe;
    1.75     DblHist *hist;
    1.76  
    1.77 @@ -212,7 +197,7 @@
    1.78   }
    1.79  
    1.80  void
    1.81 -VMS_impl__index_probe_by_its_name( int32 probeID, VirtProcr *animPr )
    1.82 +VMS_impl__index_probe_by_its_name( int32 probeID, SlaveVP *animPr )
    1.83   { IntervalProbe *probe;
    1.84  
    1.85     //TODO: fix this To be in Master -- race condition
    1.86 @@ -222,7 +207,7 @@
    1.87   }
    1.88  
    1.89  IntervalProbe *
    1.90 -VMS_impl__get_probe_by_name( char *probeName, VirtProcr *animPr )
    1.91 +VMS_impl__get_probe_by_name( char *probeName, SlaveVP *animPr )
    1.92   {
    1.93     //TODO: fix this To be in Master -- race condition
    1.94     return getValueFromTable( probeName, _VMSMasterEnv->probeNameHashTbl );
    1.95 @@ -233,7 +218,7 @@
    1.96   * work locally, in the anim Pr
    1.97   */
    1.98  void
    1.99 -VMS_impl__record_sched_choice_into_probe( int32 probeID, VirtProcr *animatingPr )
   1.100 +VMS_impl__record_sched_choice_into_probe( int32 probeID, SlaveVP *animatingPr )
   1.101   { IntervalProbe *probe;
   1.102   
   1.103     probe = _VMSMasterEnv->intervalProbes[ probeID ];