Changeset 862b6a for src

Timestamp:

Nov 3, 2011, 7:44:01 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

50e4e5

Parents:

004ae7

git-author:

Frederik Heber <heber@…> (10/27/11 09:32:27)

git-committer:

Frederik Heber <heber@…> (11/03/11 19:44:01)

Message:

All Actions are timed now, timings are given on exit.

• Chronos is used for this.
• new function printTiming() called in cleanUp().

Location:

src

Files:

• Actions/Action.cpp (modified) (1 diff)
• Actions/Action.hpp (modified) (1 diff)
• Actions/Action_impl_header.hpp (modified) (1 diff)
• Actions/Action_impl_pre.hpp (modified) (2 diffs)
• builder_init.cpp (modified) (3 diffs)

src/Actions/Action.cpp

@@ -159 +159 @@
   state_ptr state = Action::failure;
 //  try {
+    startTimer();
     state = performCall();
+    endTimer();
 //  } catch(MissingValueException&) {
 //    DoeLog(0) && (eLog() << Verbose(0) << "There is a value missing for action " << getName() << endl);

src/Actions/Action.hpp

@@ -173 +173 @@
   Dialog * createDialog();
 
+  /** Virtual function that starts the timer.
+   *
+   */
+  virtual void startTimer() const {};
+
+  /** Virtual function that ends the timer.
+   *
+   */
+  virtual void endTimer() const {};
+
 private:
 

src/Actions/Action_impl_header.hpp

@@ -215 +215 @@
 protected:
   virtual Dialog * fillDialog(Dialog*);
+
+  void startTimer() const;
+  void endTimer() const;
+
 private:
   virtual void getParametersfromValueStorage();

src/Actions/Action_impl_pre.hpp

@@ -31 +31 @@
 #endif
 
+#include "CodePatterns/Chronos.hpp"
+
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/expand.hpp>
@@ -198 +200 @@
 };
 
+// =========== time the action ===========
+// we need this here to have the correct function name
+void ACTION::startTimer() const { Chronos::getInstance().startTiming( std::string( TOKEN ) ); }
+void ACTION::endTimer() const { Chronos::getInstance().endTiming( std::string( TOKEN ) ); }
+
 // =========== command for calling action directly ===========
 #if defined paramtypes && defined paramreferences

src/builder_init.cpp

@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include <iomanip>
 #include <iostream>
 
+#include "config.hpp"
+#include "molecule.hpp"
+#include "World.hpp"
+
+#include "Actions/ActionExceptions.hpp"
+#include "Actions/ActionHistory.hpp"
+#include "Actions/ActionRegistry.hpp"
+
+#include "CodePatterns/Chronos.hpp"
+#include "CodePatterns/Log.hpp"
+#include "Element/periodentafel.hpp"
 #include "Graph/BondGraph.hpp"
-#include "config.hpp"
-#include "CodePatterns/Log.hpp"
-#include "molecule.hpp"
-#include "Element/periodentafel.hpp"
+#include "Parser/ChangeTracker.hpp"
+#include "Parser/FormatParserStorage.hpp"
+#include "RandomNumbers/RandomNumberDistributionFactory.hpp"
+#include "RandomNumbers/RandomNumberEngineFactory.hpp"
+#include "RandomNumbers/RandomNumberGeneratorFactory.hpp"
 #include "Tesselation/tesselationhelpers.hpp"
-#include "UIElements/UIFactory.hpp"
-#include "UIElements/Menu/MenuDescription.hpp"
-#include "UIElements/TextUI/TextUIFactory.hpp"
+#include "UIElements/CommandLineUI/CommandLineUIFactory.hpp"
 #include "UIElements/CommandLineUI/CommandLineUIFactory.hpp"
 #include "UIElements/CommandLineUI/CommandLineParser.hpp"
+#include "UIElements/Dialog.hpp"
+#include "UIElements/MainWindow.hpp"
+#include "UIElements/Menu/MenuDescription.hpp"
 #ifdef USE_GUI_QT
 #include "UIElements/Qt4/QtUIFactory.hpp"
 #endif
-#include "UIElements/MainWindow.hpp"
-#include "UIElements/Dialog.hpp"
-//#include "Menu/ActionMenuItem.hpp"
-#include "CodePatterns/Verbose.hpp"
-#include "World.hpp"
-
-#include "Actions/ActionExceptions.hpp"
-#include "Actions/ActionHistory.hpp"
-#include "Actions/ActionRegistry.hpp"
-
-#include "RandomNumbers/RandomNumberDistributionFactory.hpp"
-#include "RandomNumbers/RandomNumberEngineFactory.hpp"
-#include "RandomNumbers/RandomNumberGeneratorFactory.hpp"
-
-#include "Parser/ChangeTracker.hpp"
-#include "Parser/FormatParserStorage.hpp"
-
+#include "UIElements/TextUI/TextUIFactory.hpp"
 #include "UIElements/UIFactory.hpp"
-#include "UIElements/TextUI/TextUIFactory.hpp"
-#include "UIElements/CommandLineUI/CommandLineUIFactory.hpp"
-#include "UIElements/MainWindow.hpp"
-#include "UIElements/Dialog.hpp"
 
 #include "version.h"
@@ -171 +165 @@
 }
 
+/** We give a list of all times per action and a total time.
+ *
+ */
+void printTimings()
+{
+  const MoleCuilder::ActionRegistry &AR = MoleCuilder::ActionRegistry::getInstance();
+  const Chronos &Chron = Chronos::getInstance();
+  std::cout << "(Non-zero) Times used per Action [seconds]:" << std::endl;
+  for (MoleCuilder::ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter)
+    if (Chron.getTime(iter->first) != 0.) { // dont give if action has not been used
+      std::cout << "  " << setiosflags(ios::left) << setw(24) << setfill('.') << iter->first;
+      std::cout << setiosflags(ios::left) << setprecision(6) << fixed << Chron.getTime(iter->first) << std::endl;
+    }
+  std::cout << "Total Time: " << Chron.SumUpTotalTime() << " seconds" << std::endl;
+  std::cout << "Total Actions called: " << Chron.SumUpTotalFunctions() << std::endl;
+}
+
 /** Cleans all singleton instances in an orderly fashion.
  * C++ does not guarantee any specific sequence of removal of single instances
@@ -178 +189 @@
 void cleanUp()
 {
+  printTimings();
+  Chronos::purgeInstance();
+
   RandomNumberDistributionFactory::purgeInstance();
   RandomNumberEngineFactory::purgeInstance();