# HG changeset patch # User Sean Halle # Date 1379254810 25200 # Node ID c390d605702cfaecc0e5ca2730e2984e909a2c28 # Parent 10986666560d0ee569307062e8362042d4a6a1f2# Parent c3829f630c2f02e90f7838ab4f8cc93b3a6c089e Merge diff -r 10986666560d -r c390d605702c PR__structs__common.h --- a/PR__structs__common.h Sun Sep 15 07:18:46 2013 -0700 +++ b/PR__structs__common.h Sun Sep 15 07:20:10 2013 -0700 @@ -80,7 +80,7 @@ PRLangEnv **langEnvs; //used as a hash table PRLangEnv **protoLangEnvsList; //for fast linear scan of envs - int32 numLangEnvs; //for fast linear scan of envs + int32 numLangEnvs; //for fast linear scan of envs SlaveVP *seedSlv; @@ -89,6 +89,7 @@ SlaveAssigner overrideAssigner; + int32 numConsecutiveTasks; //These are used to coord with an OS thread waiting for process to end @@ -243,6 +244,8 @@ PRLangData **langDatas; //Lang saves lang-specific things in slave here PRMetaTask **metaTasks; + PRGhostInfo *ghostInfo; + //=========== MEASUREMENT STUFF ========== MEAS__Insert_Meas_Fields_into_Slave; float64 createPtInSecs; //time VP created, in seconds