diff VSs.c @ 15:459055db7fc0

bug fix -- shutsdown correctly now -- count extra task slaves correctly
author Sean Halle <seanhalle@yahoo.com>
date Thu, 23 Aug 2012 03:21:03 -0700
parents 2bf83f932705
children 1ffd5df22df9 a60399b62614
line diff
     1.1 --- a/VSs.c	Thu Aug 23 01:27:26 2012 -0700
     1.2 +++ b/VSs.c	Thu Aug 23 03:21:03 2012 -0700
     1.3 @@ -191,9 +191,6 @@
     1.4        //Hook up the semantic layer's plug-ins to the Master virt procr
     1.5     _VMSMasterEnv->requestHandler = &VSs__Request_Handler;
     1.6     _VMSMasterEnv->slaveAssigner  = &VSs__assign_slaveVP_to_slot;
     1.7 -   #ifdef HOLISTIC__TURN_ON_PERF_COUNTERS
     1.8 -   _VMSMasterEnv->counterHandler = &VSs__counter_handler;
     1.9 -   #endif
    1.10  
    1.11        //create the semantic layer's environment (all its data) and add to
    1.12        // the master environment
    1.13 @@ -201,6 +198,7 @@
    1.14     _VMSMasterEnv->semanticEnv = semanticEnv;
    1.15     
    1.16     #ifdef HOLISTIC__TURN_ON_PERF_COUNTERS
    1.17 +   _VMSMasterEnv->counterHandler = &VSs__counter_handler;
    1.18     VSs__init_counter_data_structs();
    1.19     #endif
    1.20  
    1.21 @@ -255,7 +253,7 @@
    1.22      }
    1.23  
    1.24     semanticEnv->numLiveExtraTaskSlvs   = 0; //must be last
    1.25 -   semanticEnv->numLiveThreadSlvs      = 1; //must be last, count the seed
    1.26 +   semanticEnv->numLiveThreadSlvs      = 1; //must be last, counts the seed
    1.27  
    1.28     #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
    1.29     semanticEnv->unitList = makeListOfArrays(sizeof(Unit),128);