Mercurial > cgi-bin > hgwebdir.cgi > PR > PR_Implementations > PR__Univ > PR__includes > PR__include

changeset 5:c390d605702c Dev_Univ

find changesets by author, revision, files, or words in the commit message
Merge
author Sean Halle <seanhalle@yahoo.com>
date Sun, 15 Sep 2013 07:20:10 -0700
parents 10986666560d c3829f630c2f
children f278511770ce e0bd5a1424fb
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line diff
     1.1 --- a/PR__structs__common.h	Sun Sep 15 07:18:46 2013 -0700
     1.2 +++ b/PR__structs__common.h	Sun Sep 15 07:20:10 2013 -0700
     1.3 @@ -80,7 +80,7 @@
     1.4      
     1.5     PRLangEnv **langEnvs;     //used as a hash table
     1.6     PRLangEnv **protoLangEnvsList; //for fast linear scan of envs
     1.7 -   int32      numLangEnvs;   //for fast linear scan of envs
     1.8 +   int32       numLangEnvs;   //for fast linear scan of envs
     1.9      
    1.10     SlaveVP        *seedSlv;
    1.11     
    1.12 @@ -89,6 +89,7 @@
    1.13  
    1.14     SlaveAssigner   overrideAssigner;
    1.15    
    1.16 +   int32           numConsecutiveTasks;
    1.17     
    1.18     
    1.19        //These are used to coord with an OS thread waiting for process to end
    1.20 @@ -243,6 +244,8 @@
    1.21     PRLangData  **langDatas;  //Lang saves lang-specific things in slave here
    1.22     PRMetaTask  **metaTasks;
    1.23  
    1.24 +   PRGhostInfo  *ghostInfo;
    1.25 +   
    1.26          //=========== MEASUREMENT STUFF ==========
    1.27           MEAS__Insert_Meas_Fields_into_Slave;
    1.28           float64     createPtInSecs;  //time VP created, in seconds