Changeset af3aed for src

Timestamp:

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

926a49

Parents:

c6bcd0

git-author:

Frederik Heber <heber@…> (11/18/11 20:29:36)

git-committer:

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

Message:

Introduced Info in several functions, replaced connection.hpp by Connection.hpp.

Location:

src/Fragmentation/Automation

Files:

• Connection.hpp (moved) (moved from src/Fragmentation/Automation/connection.hpp ) (6 diffs)
• Makefile.am (modified) (2 diffs)
• StockClient.cpp (modified) (4 diffs)
• StockClient.hpp (modified) (2 diffs)
• StockServer.cpp (modified) (5 diffs)
• StockServer.hpp (modified) (1 diff)

src/Fragmentation/Automation/Connection.hpp

@@ -1 @@
-//
-// connection.hpp
-// ~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2011 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
+/*
+ * Connection.hpp
+ *
+ *  Created on: Oct 21, 2011
+ *      Author: heber
+ */
 
-#ifndef SERIALIZATION_CONNECTION_HPP
-#define SERIALIZATION_CONNECTION_HPP
+#ifndef CONNECTION_HPP_
+#define CONNECTION_HPP_
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
 
 #include <boost/asio.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#include <boost/archive/text_oarchive.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
@@ -23 +26 @@
 #include <vector>
 
-/// The connection class provides serialization primitives on top of a socket.
-/**
+/** The Connection class provides serialization primitives on top of a socket.
  * Each message sent using this class consists of:
  * @li An 8-byte header containing the length of the serialized data in
@@ -30 +32 @@
  * @li The serialized data.
  */
-class connection
+class Connection
 {
 public:
   /// Constructor.
-  connection(boost::asio::io_service& io_service)
+  Connection(boost::asio::io_service& io_service)
     : socket_(io_service)
   {
   }
 
-  /// Get the underlying socket. Used for making a connection or for accepting
-  /// an incoming connection.
+  /// Get the underlying socket. Used for making a Connection or for accepting
+  /// an incoming Connection.
   boost::asio::ip::tcp::socket& socket()
   {
@@ -82 +84 @@
   {
     // Issue a read operation to read exactly the number of bytes in a header.
-    void (connection::*f)(
+    void (Connection::*f)(
         const boost::system::error_code&,
         T&, boost::tuple<Handler>)
-      = &connection::handle_read_header<T, Handler>;
+      = &Connection::handle_read_header<T, Handler>;
     boost::asio::async_read(socket_, boost::asio::buffer(inbound_header_),
         boost::bind(f,
@@ -118 +120 @@
       // Start an asynchronous call to receive the data.
       inbound_data_.resize(inbound_data_size);
-      void (connection::*f)(
+      void (Connection::*f)(
           const boost::system::error_code&,
           T&, boost::tuple<Handler>)
-        = &connection::handle_read_data<T, Handler>;
+        = &Connection::handle_read_data<T, Handler>;
       boost::asio::async_read(socket_, boost::asio::buffer(inbound_data_),
         boost::bind(f, this,
@@ -180 +182 @@
 };
 
-typedef boost::shared_ptr<connection> connection_ptr;
+typedef boost::shared_ptr<Connection> connection_ptr;
 
-#endif // SERIALIZATION_CONNECTION_HPP
+#endif /* CONNECTION_HPP_ */

src/Fragmentation/Automation/Makefile.am

@@ -13 +13 @@
 
 servers11n_SOURCES = \
-  connection.hpp \
+  Connection.hpp \
   server.cpp \
   FragmentJob.cpp \
@@ -30 +30 @@
 clients11n_SOURCES = \
   client.cpp \
-  connection.hpp \
+  Connection.hpp \
   FragmentJob.cpp \
   FragmentJob.hpp \

src/Fragmentation/Automation/StockClient.cpp

@@ -19 +19 @@
 #include <iostream>
 #include <vector>
-#include "connection.hpp" // Must come before boost/serialization headers.
+#include "Connection.hpp" // Must come before boost/serialization headers.
 #include <boost/serialization/vector.hpp>
+#include "CodePatterns/Info.hpp"
 #include "FragmentJob.hpp"
 #include "StockClient.hpp"
@@ -31 +32 @@
   connection_(io_service)
 {
+    Info info(__FUNCTION__);
   // Resolve the host name into an IP address.
   boost::asio::ip::tcp::resolver resolver(io_service);
@@ -47 +49 @@
 void StockClient::handle_connect(const boost::system::error_code& e)
 {
+    Info info(__FUNCTION__);
   if (!e)
   {
@@ -68 +71 @@
 void StockClient::handle_read(const boost::system::error_code& e)
 {
+    Info info(__FUNCTION__);
   if (!e)
   {

src/Fragmentation/Automation/StockClient.hpp

@@ -17 +17 @@
 #include <boost/asio.hpp>
 #include <vector>
-#include "connection.hpp" // Must come before boost/serialization headers.
+#include "Connection.hpp" // Must come before boost/serialization headers.
 #include "FragmentJob.hpp"
 
@@ -36 +36 @@
 private:
   /// The connection to the server.
-  connection connection_;
+  Connection connection_;
 
   /// The data received from the server.

src/Fragmentation/Automation/StockServer.cpp

@@ -20 +20 @@
 #include <iostream>
 #include <vector>
-#include "connection.hpp" // Must come before boost/serialization headers.
+#include "Connection.hpp" // Must come before boost/serialization headers.
 #include <boost/serialization/vector.hpp>
+#include "CodePatterns/Info.hpp"
 #include "FragmentJob.hpp"
 
@@ -31 +32 @@
   )
 {
+    Info info(__FUNCTION__);
   FragmentJob s(std::string("test"), 1);
   jobs_.push_back(s);
 
   // Start an accept operation for a new connection.
-  connection_ptr new_conn(new connection(acceptor_.get_io_service()));
+  connection_ptr new_conn(new Connection(acceptor_.get_io_service()));
   acceptor_.async_accept(new_conn->socket(),
     boost::bind(&StockServer::handle_accept, this,
@@ -43 +45 @@
 void StockServer::handle_accept(const boost::system::error_code& e, connection_ptr conn)
 {
+    Info info(__FUNCTION__);
   std::cout << "handle_accept called." << std::endl;
   if (!e)
@@ -54 +57 @@
   }
 
-  connection_ptr new_conn(new connection(acceptor_.get_io_service()));
+  connection_ptr new_conn(new Connection(acceptor_.get_io_service()));
   acceptor_.async_accept(new_conn->socket(),
     boost::bind(&StockServer::handle_accept, this,
@@ -62 +65 @@
 void StockServer::handle_write(const boost::system::error_code& e, connection_ptr conn)
 {
+    Info info(__FUNCTION__);
   // Nothing to do. The socket will be closed automatically when the last
   // reference to the connection object goes away.

src/Fragmentation/Automation/StockServer.hpp

@@ -17 +17 @@
 #include <boost/asio.hpp>
 #include <vector>
-#include "connection.hpp" // Must come before boost/serialization headers.
+#include "Connection.hpp" // Must come before boost/serialization headers.
 #include "FragmentJob.hpp"