improved memleak detection, set warning threshold to 16MB

ATOOLS/Org/Run_Parameter.C

@@ -276,7 +276,7 @@ void Run_Parameter::Init(std::string path,std::string file,int argc,char* argv[]
   gen.SetVariable("RNG_SEED",ToString(gen.m_seeds[0])+seedstr);
 
   gen.SetVariable("MEMLEAK_WARNING_THRESHOLD",
-		  ToString(dr.GetValue<int>("MEMLEAK_WARNING_THRESHOLD",1<<20)));
+		  ToString(dr.GetValue<int>("MEMLEAK_WARNING_THRESHOLD",1<<24)));
   gen.m_timeout = dr.GetValue<double>("TIMEOUT",std::numeric_limits<double>::max());
   if (gen.m_timeout<0.) gen.m_timeout=0.;
   rpa->gen.m_timer.Start();

PHASIC++/Main/Phase_Space_Integrator.C

@@ -308,15 +308,15 @@ bool Phase_Space_Integrator::AddPoint(const double value)
 		<<" left ) ["<<rpa->gen.Timer().StrFTime("%H:%M:%S")<<"]   "<<endl; 
 #endif
       size_t currentrss=GetCurrentRSS();
-      if (currentrss-lastrss>ToType<int>
+      if (currentrss>lastrss+ToType<int>
 	  (rpa->gen.Variable("MEMLEAK_WARNING_THRESHOLD"))) {
 	msg_Error()<<METHOD<<"() {\n"<<om::bold<<"  Memory usage increased by "
 		   <<(currentrss-lastrss)/(1<<20)<<" MB,"
 		   <<" now "<<currentrss/(1<<20)<<" MB.\n"
 		   <<om::red<<"  This might indicate a memory leak!\n"
 		   <<"  Please monitor this process closely.\n"<<om::reset<<"}"<<std::endl;
+	lastrss=currentrss;
       }
-      lastrss=currentrss;
       std::vector<double> stats(6);
       stats[0]=psh->Process()->TotalResult()*rpa->Picobarn();
       stats[1]=psh->Process()->TotalVar()*rpa->Picobarn();

SHERPA/Single_Events/Event_Handler.C

@@ -480,15 +480,15 @@ void Event_Handler::MPISync()
   }
 #endif
   size_t currentrss=GetCurrentRSS();
-  if (currentrss-m_lastrss>ToType<int>
+  if (currentrss>m_lastrss+ToType<int>
       (rpa->gen.Variable("MEMLEAK_WARNING_THRESHOLD"))) {
     msg_Error()<<METHOD<<"() {\n"<<om::bold<<"  Memory usage increased by "
 	       <<(currentrss-m_lastrss)/(1<<20)<<" MB,"
 	       <<" now "<<currentrss/(1<<20)<<" MB.\n"
 	       <<om::red<<"  This might indicate a memory leak!\n"
 	       <<"  Please monitor this process closely.\n"<<om::reset<<"}"<<std::endl;
+    m_lastrss=currentrss;
   }
-  m_lastrss=currentrss;
 }
 
 double Event_Handler::TotalXS()