Changeset db03d9 for src/Fragmentation/Automation/Server.cpp

Timestamp:

May 4, 2012, 2:19:07 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:

3c4a5e

Parents:

8ee5ac

git-author:

Frederik Heber <heber@…> (11/27/11 23:20:43)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:19:07)

Message:

Added possibility to add jobs via a FragmentController.

• Server listens on another port for a controller to connect, also now has an Exitflag.
• Controller can add a bunch of jobs.
• JobAdder can successfully add a number jobs to Server, if 0 are sent, the socket shuts down.
• TESTFIX: extended regression Fragmentation/Automation test to use Jobadder as by default Server starts with no jobs in the queue.

File:

• src/Fragmentation/Automation/Server.cpp (modified) (2 diffs)

src/Fragmentation/Automation/Server.cpp

@@ -43 +43 @@
   setVerbosity(3);
 
+  size_t Exitflag = 0;
   try
   {
     // Check command line arguments.
-    if (argc != 2)
+    if (argc != 3)
     {
-      std::cerr << "Usage: " << argv[0] << " <port>" << std::endl;
+      std::cerr << "Usage: " << argv[0] << " <worker port> <controller port>" << std::endl;
       return 1;
     }
-    unsigned short port = boost::lexical_cast<unsigned short>(argv[1]);
-    std::cout << "Listening on port " << port << "." << std::endl;
+    unsigned short workerport = boost::lexical_cast<unsigned short>(argv[1]);
+    std::cout << "Listening for workers on port " << workerport << "." << std::endl;
+    unsigned short controllerport = boost::lexical_cast<unsigned short>(argv[2]);
+    std::cout << "Listening for controller on port " << controllerport << "." << std::endl;
 
     boost::asio::io_service io_service;
-    FragmentScheduler Server(io_service, port);
+    FragmentScheduler Server(io_service, workerport, controllerport);
     {
       Info info("io_service");
       io_service.run();
     }
+    Exitflag = Server.getExitflag();
   }
   catch (std::exception& e)
@@ -66 +70 @@
   }
 
-  return 0;
+  return Exitflag;
 }