Changeset aee1a3

Timestamp:

Mar 11, 2010, 2:19:53 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

ed58ad

Parents:

e73a8a2

Message:

Made logger class use the new Singleton framework

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• log.cpp (modified) (2 diffs)
• logger.cpp (modified) (3 diffs)
• logger.hpp (modified) (2 diffs)
• unittests/logunittest.cpp (modified) (1 diff)

src/Makefile.am

@@ -12 +12 @@
 
 PATTERNSOURCE = Patterns/Observer.cpp
-PATTERNHEADER = Patterns/Observer.hpp Patterns/Cacheable.hpp
+PATTERNHEADER = Patterns/Cacheable.hpp \
+                                Patterns/Observer.hpp \
+                Patterns/Singleton.hpp
 
 VIEWSOURCE = Views/View.cpp Views/StringView.cpp Views/MethodStringView.cpp Views/StreamStringView.cpp

src/log.cpp

@@ -15 +15 @@
  */
 void setVerbosity(int verbosityLevel) {
-  logger::getInstance()->setVerbosity(verbosityLevel);
+  logger::getInstance().setVerbosity(verbosityLevel);
   errorLogger::getInstance()->setVerbosity(verbosityLevel);
 }
@@ -24 +24 @@
  * \param indentation level of the message to log
  */
-class logger * Log() {
+class logger& Log() {
   return logger::getInstance();
 }

src/logger.cpp

@@ -9 +9 @@
 #include "logger.hpp"
 #include "verbose.hpp"
+#include "Patterns/Singleton_impl.hpp"
 
 ofstream nullStream("/dev/null");
 
-logger* logger::instance = NULL;
 int logger::verbosity = 2;
 ostream* logger::nix = &nullStream;
@@ -23 +23 @@
 logger::logger()
 {
-  instance = NULL;
   verbosity = 2;
 };
@@ -34 +33 @@
 }
 
-/**
- * Returns the singleton logger instance.
- *
- * \return logger instance
- */
-logger* logger::getInstance() {
-  if (instance == NULL) {
-    instance = new logger();
-  }
-
-  return instance;
-}
-
-
-/**
- * Purges the current logger instance.
- */
-void logger::purgeInstance() {
-  if (instance != NULL) {
-    delete instance;
-  }
-
-  instance = NULL;
-}
+CONSTRUCT_SINGLETON(logger)
 
 /**

src/logger.hpp

@@ -11 +11 @@
 #include <iostream>
 
+#include "Patterns/Singleton.hpp"
+
 using namespace std;
 
 class Verbose;
 
-class logger {
+class logger : public Singleton<logger> {
+  friend class Singleton<logger>;
 public :
   static ostream *nix;
   static int verbosity;
 
-  static logger* getInstance();
-  static void purgeInstance();
   static bool DoOutput();
   static void setVerbosity(int verbosityLevel);
@@ -30 +31 @@
   /** Do not call this destructor directly, use purgeInstance() instead. */
   ~logger();
-
-private:
-  static logger* instance;
 };
 

src/unittests/logunittest.cpp

@@ -40 +40 @@
 void LogTest::logTest()
 {
-  logger::getInstance()->setVerbosity(2);
+  logger::getInstance().setVerbosity(2);
   Log() << Verbose(0) << "Verbosity level is set to 2." << endl;
   Log() << Verbose(0) << "Test level 0" << endl;