Changeset 7dd8bc for src/Fragmentation/Automation

Timestamp:

Jun 29, 2012, 8:01:46 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:

701bbc

Parents:

f98c8e

git-author:

Frederik Heber <heber@…> (03/04/12 16:05:02)

git-committer:

Frederik Heber <heber@…> (06/29/12 08:01:46)

Message:

Added template functions for sync_read() and sync_write() to Connection.

• also factored our prepare_write from async_write() which is needed in case of sync_write() as well.

File:

• src/Fragmentation/Automation/Connection.hpp (modified) (5 diffs)

src/Fragmentation/Automation/Connection.hpp

@@ -25 +25 @@
 #include <sstream>
 #include <vector>
+
+#include "CodePatterns/Log.hpp"
 
 /** The Connection class provides serialization primitives on top of a socket.
@@ -48 +50 @@
   }
 
-  /// Asynchronously write a data structure to the socket.
-  template <typename T, typename Handler>
-  void async_write(const T& t, Handler handler)
+  typedef std::vector<boost::asio::const_buffer> buffers_t;
+
+  /** Prepare data for write operation.
+   *
+   * The dara is prepared in two blocks: header and data.
+   *
+   * @param t data to place into buffers
+   * @param vector of buffers
+   * @return true - data placed in buffer, false - some mismatch, data not placed
+   */
+  template <typename T>
+  bool prepare_write(const T& t, buffers_t &buffers)
   {
     // Serialize the data first so we know how large it is.
@@ -63 +74 @@
       << std::hex << outbound_data_.size();
     if (!header_stream || header_stream.str().size() != header_length)
-    {
+      return false;
+    outbound_header_ = header_stream.str();
+
+    // Write the serialized data to the socket. We use "gather-write" to send
+    // both the header and the data in a single write operation.
+    buffers.push_back(boost::asio::buffer(outbound_header_));
+    buffers.push_back(boost::asio::buffer(outbound_data_));
+    return true;
+  }
+
+  /// Asynchronously write a data structure to the socket.
+  template <typename T, typename Handler>
+  void async_write(const T& t, Handler handler)
+  {
+    buffers_t buffers;
+    if (!prepare_write(t, buffers)) {
       // Something went wrong, inform the caller.
       boost::system::error_code error(boost::asio::error::invalid_argument);
@@ -69 +95 @@
       return;
     }
-    outbound_header_ = header_stream.str();
-
-    // Write the serialized data to the socket. We use "gather-write" to send
-    // both the header and the data in a single write operation.
-    std::vector<boost::asio::const_buffer> buffers;
-    buffers.push_back(boost::asio::buffer(outbound_header_));
-    buffers.push_back(boost::asio::buffer(outbound_data_));
     boost::asio::async_write(socket_, buffers, handler);
+  }
+
+  /// Synchronously write a data structure to the socket.
+  template <typename T>
+  void sync_write(const T& t)
+  {
+    buffers_t buffers;
+    if (prepare_write(t, buffers)) {
+      boost::asio::write(socket_, buffers);
+    } else {
+      ELOG(2, "sync_write failed, data could not be placed in buffers.");
+    }
   }
 
@@ -92 +123 @@
           this, boost::asio::placeholders::error, boost::ref(t),
           boost::make_tuple(handler)));
+  }
+
+  /// Synchronously read a data structure from the socket.
+  template <typename T, typename Handler>
+  void sync_read(T& t, Handler handler)
+  {
+    // Issue a read operation to read exactly the number of bytes in a header.
+    void (Connection::*f)(
+        const boost::system::error_code&,
+        T&, boost::tuple<Handler>)
+      = &Connection::handle_read_header<T, Handler>;
+    boost::asio::read(socket_, boost::asio::buffer(inbound_header_));
   }