Changeset 684bc1 for src

Timestamp:

Jul 2, 2012, 8:32:04 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:

d9373b

Parents:

012c98

git-author:

Frederik Heber <heber@…> (05/23/12 12:33:01)

git-committer:

Frederik Heber <heber@…> (07/02/12 08:32:04)

Message:

Server now also parses worker and controller port via boost::program_options.

• TESTFIX: Same again, adapted server calls due to changed command option signature in regression tests Fragmentation/Automation.

Location:

src/Fragmentation/Automation

Files:

• Makefile.am (modified) (1 diff)
• Server.cpp (modified) (2 diffs)

src/Fragmentation/Automation/Makefile.am

@@ -174 +174 @@
   $(BOOST_ASIO_LIBS) \
   $(BOOST_SERIALIZATION_LIBS) \
+  $(BOOST_PROGRAM_OPTIONS_LIBS) \
   $(BOOST_THREAD_LIBS) \
   $(BOOST_SYSTEM_LIBS) \

src/Fragmentation/Automation/Server.cpp

@@ -27 +27 @@
 
 #include <boost/lexical_cast.hpp>
+#include <boost/program_options.hpp>
 #include <iostream>
 
@@ -41 +42 @@
   atexit(cleanUp);
 
-  setVerbosity(3);
+  // Declare the supported options.
+  boost::program_options::options_description desc("Allowed options");
+  desc.add_options()
+      ("help,h", "produce help message")
+      ("verbosity,v", boost::program_options::value<size_t>(), "set verbosity level")
+      ("workerport", boost::program_options::value< unsigned short >(), "listen on this port for connecting workers")
+      ("controllerport", boost::program_options::value< unsigned short >(), "listen on this port for connecting controller")
+  ;
+
+  boost::program_options::variables_map vm;
+  boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
+  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;
+  }
 
   size_t Exitflag = 0;
   try
   {
-    // Check command line arguments.
-    if (argc != 3)
-    {
-      std::cerr << "Usage: " << argv[0] << " <worker port> <controller port>" << std::endl;
-      return 1;
-    }
-    unsigned short workerport = boost::lexical_cast<unsigned short>(argv[1]);
-    unsigned short controllerport = boost::lexical_cast<unsigned short>(argv[2]);
-
     boost::asio::io_service io_service;
     FragmentScheduler Server(io_service, workerport, controllerport);