Changeset 2a20bd

Timestamp:

Jul 6, 2012, 10:18:44 AM (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:

ad39c2

Parents:

4ccc8d

git-author:

Frederik Heber <heber@…> (06/01/12 17:42:59)

git-committer:

Frederik Heber <heber@…> (07/06/12 10:18:44)

Message:

Placed all Option parsing in Server into ServerOptions on own module.

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• Server.cpp (modified) (4 diffs)
• ServerOptions.cpp (added)
• ServerOptions.hpp (added)

src/Makefile.am

@@ -413 +413 @@
   ${CodePatterns_LIBS}
 
-Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER) Server.cpp
-Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
+Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER) Server.cpp DefaultOptions.cpp DefaultOptions.hpp SignalOptions.cpp SignalOptions.hpp ServerOptions.cpp ServerOptions.hpp
+Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM__OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
 Server_CXXFLAGS = $(AM_CPPFLAGS)
 Server_LDADD = \

src/Server.cpp

@@ -34 +34 @@
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Log.hpp"
-#include "Fragmentation/Automation/FragmentScheduler.hpp"
+#include "atexit.hpp"
+#include "FragmentScheduler.hpp"
+#include "Jobs/SystemCommandJob.hpp"
+#include "ServerOptions.hpp"
 
 
@@ -69 +72 @@
   atexit(cleanUp);
 
+  ServerOptions ServerOpts;
+
   // Declare the supported options.
   boost::program_options::options_description desc("Allowed options");
@@ -83 +88 @@
   boost::program_options::notify(vm);
 
-  if (vm.count("help")) {
-    std::cout << desc << "\n";
-    return 1;
-  }
-
-  if (vm.count("verbosity")) {
-    LOG(0, "STATUS: Verbosity level was set to " << vm["verbosity"].as<size_t>() << ".");
-    setVerbosity(vm["verbosity"].as<size_t>());
-  } else {
-    LOG(0, "STATUS: Verbosity level was not set, defaulting to 3.");
-    setVerbosity(3);
-  }
-
-  unsigned short workerport;
-  if (vm.count("workerport")) {
-    try {
-      workerport = vm["workerport"].as< unsigned short >();
-    } catch (boost::bad_lexical_cast) {
-      ELOG(1, "Could not read " << workerport << " as digits.");
-      return 255;
-    }
-    LOG(1, "INFO: Using " << workerport << " as listen port for worker.");
-  } else {
-    ELOG(1, "Requiring listen port for worker.");
-    return 255;
-  }
-
-  unsigned short controllerport;
-  if (vm.count("controllerport")) {
-    try {
-      controllerport = vm["controllerport"].as< unsigned short >();
-    } catch (boost::bad_lexical_cast) {
-      ELOG(1, "Could not read " << controllerport << " as digits.");
-      return 255;
-    }
-    LOG(1, "INFO: Using " << controllerport << " as listen port for controller.");
-  } else {
-    ELOG(1, "Requiring listen port for controller.");
-    return 255;
-  }
+  int status = 0;
+  status = ServerOpts.parseHelp(vm, desc);
+  if (status) return status;
+  status = ServerOpts.parseVerbosity(vm);
+  if (status) return status;
+  status = ServerOpts.parseWorkerPort(vm);
+  if (status) return status;
+  status = ServerOpts.parseControllerPort(vm);
+  if (status) return status;
+  status = ServerOpts.parseSignals(vm);
+  if (status) return status;
 
   size_t Exitflag = 0;
@@ -128 +104 @@
   {
     boost::asio::io_service io_service;
-    FragmentScheduler Server(io_service, workerport, controllerport);
+    FragmentScheduler Server(io_service, ServerOpts.workerport, ServerOpts.controllerport);
 
     // catch ctrl-c and shutdown worker properly