Changeset cd4a6e for src

Timestamp:

May 4, 2012, 2:17:37 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:

f7f995

Parents:

8c9596

git-author:

Frederik Heber <heber@…> (11/21/11 08:22:22)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:17:37)

Message:

Renamed file StockServer -> FragmentScheduler.

Location:

src/Fragmentation/Automation

Files:

• FragmentScheduler.cpp (moved) (moved from src/Fragmentation/Automation/StockServer.cpp ) (5 diffs)
• FragmentScheduler.hpp (moved) (moved from src/Fragmentation/Automation/StockServer.hpp ) (3 diffs)
• FragmentWorker.cpp (moved) (moved from src/Fragmentation/Automation/StockClient.cpp ) (3 diffs)
• FragmentWorker.hpp (moved) (moved from src/Fragmentation/Automation/StockClient.hpp ) (5 diffs)
• Makefile.am (modified) (2 diffs)
• client.cpp (modified) (1 diff)
• server.cpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -1 +1 @@
 /*
- * FragmentScheduler.cpp
+ * Project: MoleCuilder
+ * Description: creates and alters molecular systems
+ * Copyright (C)  2011 University of Bonn. All rights reserved.
+ * Please see the LICENSE file or "Copyright notice" in builder.cpp for details.
+ */
+
+/*
+ * \file FragmentScheduler.cpp
  *
- *  Created on: 18.11.2011
+ * This file strongly follows the Serialization example from the boost::asio
+ * library (see server.cpp)
+ *
+ *  Created on: Oct 19, 2011
  *      Author: heber
  */
@@ -25 +35 @@
 #include "FragmentJob.hpp"
 
-#include "StockServer.hpp"
+#include "FragmentScheduler.hpp"
 
 FragmentScheduler::FragmentScheduler(boost::asio::io_service& io_service, unsigned short port) :
@@ -43 +53 @@
 }
 
+/// Handle completion of a accept operation.
 void FragmentScheduler::handle_accept(const boost::system::error_code& e, connection_ptr conn)
 {
-    Info info(__FUNCTION__);
+  Info info(__FUNCTION__);
   std::cout << "handle_accept called." << std::endl;
   if (!e)
   {
-    // Successfully accepted a new connection. Send the list of stocks to the
+    // Successfully accepted a new connection. Send the list of jobs to the
     // client. The connection::async_write() function will automatically
     // serialize the data structure for us.
@@ -55 +66 @@
       boost::bind(&FragmentScheduler::handle_write, this,
       boost::asio::placeholders::error, conn));
+
+    // Start an accept operation for a new Connection.
+    connection_ptr new_conn(new Connection(acceptor_.get_io_service()));
+    acceptor_.async_accept(new_conn->socket(),
+      boost::bind(&FragmentScheduler::handle_accept, this,
+      boost::asio::placeholders::error, new_conn));
   }
-
-  connection_ptr new_conn(new Connection(acceptor_.get_io_service()));
-  acceptor_.async_accept(new_conn->socket(),
-    boost::bind(&FragmentScheduler::handle_accept, this,
-      boost::asio::placeholders::error, new_conn));
+  else
+  {
+    // An error occurred. Log it and return. Since we are not starting a new
+    // accept operation the io_service will run out of work to do and the
+    // server will exit.
+    std::cerr << "Error: " << e.message() << std::endl;
+  }
 }
 
+/// Handle completion of a write operation.
 void FragmentScheduler::handle_write(const boost::system::error_code& e, connection_ptr conn)
 {
@@ -69 +89 @@
   // reference to the connection object goes away.
 }
+

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -2 +2 @@
  * FragmentScheduler.hpp
  *
- *  Created on: 18.11.2011
+ *  Created on: Oct 19, 2011
  *      Author: heber
  */
 
-#ifndef STOCKSERVER_HPP_
-#define STOCKSERVER_HPP_
+#ifndef FRAGMENTSCHEDULER_HPP_
+#define FRAGMENTSCHEDULER_HPP_
 
 // include config.h
@@ -14 +14 @@
 #endif
 
+#include <vector>
+#include <boost/asio.hpp>
 
-#include <boost/asio.hpp>
-#include <vector>
-#include "Connection.hpp" // Must come before boost/serialization headers.
+#include "Connection.hpp"
 #include "FragmentJob.hpp"
 
-/// Serves stock quote information to any client that connects to it.
+/** FragmentScheduler serves FragmentJobs to Workers.
+ *
+ */
 class FragmentScheduler
 {
 public:
   /// Constructor opens the acceptor and starts waiting for the first incoming
-  /// connection.
+  /// Connection.
   FragmentScheduler(boost::asio::io_service& io_service, unsigned short port);
 
@@ -42 +44 @@
 };
 
-#endif /* STOCKSERVER_HPP_ */
+#endif /* FRAGMENTSCHEDULER_HPP_ */

src/Fragmentation/Automation/FragmentWorker.cpp

@@ -1 +1 @@
 /*
- * FragmentWorker.cpp
+ * Project: MoleCuilder
+ * Description: creates and alters molecular systems
+ * Copyright (C)  2011 University of Bonn. All rights reserved.
+ * Please see the LICENSE file or "Copyright notice" in builder.cpp for details.
+ */
+
+/*
+ * \file FragmentWorker.cpp
+ *
+ * This file strongly follows the Serialization example from the boost::asio
+ * library (see client.cpp).
  *
  *  Created on: Nov 18, 2011
@@ -23 +33 @@
 #include "CodePatterns/Info.hpp"
 #include "FragmentJob.hpp"
-#include "StockClient.hpp"
+#include "FragmentWorker.hpp"
 
 /// Constructor starts the asynchronous connect operation.
@@ -53 +63 @@
   {
     // Successfully established connection. Start operation to read the list
-    // of stocks. The connection::async_read() function will automatically
+    // of jobs. The connection::async_read() function will automatically
     // decode the data that is read from the underlying socket.
     connection_.async_read(jobs_,

src/Fragmentation/Automation/FragmentWorker.hpp

@@ -1 +1 @@
 /*
- * FragmentWorker.hpp
+ * \file FragmentWorker.hpp
  *
  *  Created on: Nov 18, 2011
@@ -6 +6 @@
  */
 
-#ifndef STOCKCLIENT_HPP_
-#define STOCKCLIENT_HPP_
+#ifndef FRAGMENTWORKER_HPP_
+#define FRAGMENTWORKER_HPP_
 
 // include config.h
@@ -14 +14 @@
 #endif
 
-
 #include <boost/asio.hpp>
 #include <vector>
-#include "Connection.hpp" // Must come before boost/serialization headers.
+#include "Connection.hpp"
 #include "FragmentJob.hpp"
 
-/// Downloads stock quote information from a server.
+/** Receives a job from Server to execute and return FragmentResult.
+ *
+ */
 class FragmentWorker
 {
@@ -35 +36 @@
 
 private:
-  /// The connection to the server.
+  /// The Connection to the server.
   Connection connection_;
 
@@ -42 +43 @@
 };
 
-#endif /* STOCKCLIENT_HPP_ */
+#endif /* FRAGMENTWORKER_HPP_ */

src/Fragmentation/Automation/Makefile.am

@@ -14 +14 @@
 servers11n_SOURCES = \
   Connection.hpp \
-  server.cpp \
   FragmentJob.cpp \
   FragmentJob.hpp \
-  StockServer.cpp \
-  StockServer.hpp
+  FragmentScheduler.cpp \
+  FragmentScheduler.hpp \
+  server.cpp
 servers11n_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
 servers11n_CXXFLAGS = $(AM_CPPFLAGS)
@@ -33 +33 @@
   FragmentJob.cpp \
   FragmentJob.hpp \
-  StockClient.cpp \
-  StockClient.hpp
+  FragmentWorker.cpp \
+  FragmentWorker.hpp
 clients11n_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
 clients11n_CXXFLAGS = $(AM_CPPFLAGS)

src/Fragmentation/Automation/client.cpp

@@ -11 +11 @@
 #include <boost/asio.hpp>
 #include <iostream>
-#include "StockClient.hpp"
+#include "FragmentWorker.hpp"
 
 

src/Fragmentation/Automation/server.cpp

@@ -12 +12 @@
 #include <boost/lexical_cast.hpp>
 #include <iostream>
-#include "StockServer.hpp"
+#include "FragmentScheduler.hpp"