Changeset 7da5cd for JobMarket/src

Timestamp:

Jul 6, 2012, 10:18:47 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:

c8446c

Parents:

a10cc0

git-author:

Frederik Heber <heber@…> (06/04/12 09:19:42)

git-committer:

Frederik Heber <heber@…> (07/06/12 10:18:47)

Message:

Moved all Controller.., ..Options, and .._main() files over to JobMarket.

Location:

JobMarket/src

Files:

• JobMarket/Controller/ControllerCommand.hpp (moved) (moved from src/ControllerCommand.hpp )
• JobMarket/Controller/ControllerCommandRegistry.cpp (moved) (moved from src/ControllerCommandRegistry.cpp )
• JobMarket/Controller/ControllerCommandRegistry.hpp (moved) (moved from src/ControllerCommandRegistry.hpp ) (1 diff)
• JobMarket/Controller/ControllerOptions.cpp (moved) (moved from src/ControllerOptions.cpp )
• JobMarket/Controller/ControllerOptions.hpp (moved) (moved from src/ControllerOptions.hpp )
• JobMarket/Controller/ControllerOptions_SystemCommandJob.cpp (moved) (moved from src/ControllerOptions_SystemCommandJob.cpp )
• JobMarket/Controller/ControllerOptions_SystemCommandJob.hpp (moved) (moved from src/ControllerOptions_SystemCommandJob.hpp )
• JobMarket/Controller/FragmentController.cpp (moved) (moved from JobMarket/src/JobMarket/FragmentController.cpp )
• JobMarket/Controller/FragmentController.hpp (moved) (moved from JobMarket/src/JobMarket/FragmentController.hpp )
• JobMarket/Controller/controller.cpp (added)
• JobMarket/Controller/controller_AddOn.hpp (moved) (moved from src/controller_AddOn.hpp )
• JobMarket/Controller/controller_AddOn_SystemCommandJob.cpp (moved) (moved from src/controller_AddOn_SystemCommandJob.cpp )
• JobMarket/Controller/controller_SystemCommandJob.cpp (moved) (moved from src/controller_SystemCommandJob.cpp ) (3 diffs)
• JobMarket/Controller/controller_SystemCommandJob.hpp (moved) (moved from src/controller_SystemCommandJob.hpp )
• JobMarket/Controller/controller_main.cpp (moved) (moved from src/controller_main.cpp ) (2 diffs)
• JobMarket/Controller/controller_main.hpp (moved) (moved from src/controller_main.hpp ) (1 diff)
• JobMarket/DefaultOptions.cpp (moved) (moved from src/DefaultOptions.cpp )
• JobMarket/DefaultOptions.hpp (moved) (moved from src/DefaultOptions.hpp )
• JobMarket/Makefile.am (modified) (9 diffs)
• JobMarket/ServerOptions.cpp (moved) (moved from src/ServerOptions.cpp )
• JobMarket/ServerOptions.hpp (moved) (moved from src/ServerOptions.hpp )
• JobMarket/SignalHandler.cpp (moved) (moved from src/SignalHandler.cpp )
• JobMarket/SignalHandler.hpp (moved) (moved from src/SignalHandler.hpp )
• JobMarket/SignalOptions.cpp (moved) (moved from src/SignalOptions.cpp )
• JobMarket/SignalOptions.hpp (moved) (moved from src/SignalOptions.hpp )
• JobMarket/WorkerOptions.cpp (moved) (moved from src/WorkerOptions.cpp )
• JobMarket/WorkerOptions.hpp (moved) (moved from src/WorkerOptions.hpp )
• JobMarket/poolworker.cpp (added)
• JobMarket/poolworker_main.cpp (moved) (moved from src/poolworker_main.cpp )
• JobMarket/poolworker_main.hpp (moved) (moved from src/poolworker_main.hpp )
• JobMarket/server.cpp (added)
• JobMarket/server_main.cpp (moved) (moved from src/server_main.cpp )
• JobMarket/server_main.hpp (moved) (moved from src/server_main.hpp )
• unittests/Makefile.am (modified) (2 diffs)

JobMarket/src/JobMarket/Controller/ControllerCommandRegistry.hpp

@@ -18 +18 @@
 #include "CodePatterns/Registry.hpp"
 
-#include "ControllerCommand.hpp"
+#include "Controller/ControllerCommand.hpp"
 
 struct ControllerCommandRegistry : public Registry<ControllerCommand>

JobMarket/src/JobMarket/Controller/controller_SystemCommandJob.cpp

@@ -18 +18 @@
 #endif
 
+// boost asio needs specific operator new
+#include <boost/asio.hpp>
+
 #include "CodePatterns/MemDebug.hpp"
 
@@ -24 +27 @@
 #include <boost/assign.hpp>
 #include <boost/bind.hpp>
+#include "CodePatterns/Log.hpp"
 
-#include "FragmentController.hpp"
+#include "Controller/ControllerCommand.hpp"
+#include "Controller/ControllerCommandRegistry.hpp"
+#include "Controller/ControllerOptions_SystemCommandJob.hpp"
+#include "Controller/FragmentController.hpp"
 #include "Jobs/SystemCommandJob.hpp"
 #include "Results/FragmentResult.hpp"
 
-#include "ControllerCommand.hpp"
-#include "ControllerCommandRegistry.hpp"
-#include "ControllerOptions_SystemCommandJob.hpp"
 
 /** Print received results.
@@ -101 +105 @@
 }
 
-void controller_SystemCommandJob::addSpecificOption(
+void controller_SystemCommandJob::addSpecificOptions(
     boost::program_options::options_description_easy_init option)
 {

JobMarket/src/JobMarket/Controller/controller_main.cpp

@@ -8 +8 @@
 /*
  * \file controller_main.cpp
- *
- * This file strongly follows the Serialization example from the boost::asio
- * library (see client.cpp)
  *
  *  Created on: Nov 27, 2011
@@ -40 +37 @@
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Log.hpp"
+
 #include "atexit.hpp"
-#include "FragmentController.hpp"
+#include "Controller/controller_AddOn.hpp"
+#include "Controller/ControllerCommandRegistry.hpp"
+#include "Controller/ControllerOptions.hpp"
+#include "Controller/FragmentController.hpp"
 
-#include "ControllerOptions_SystemCommandJob.hpp"
-#include "ControllerCommandRegistry.hpp"
-
-#include "controller_AddOn.hpp"
 
 /** Print the status of scheduled and done jobs.

JobMarket/src/JobMarket/Controller/controller_main.hpp

@@ -14 +14 @@
 #endif
 
-int controller_main(int argc, char **argv);
+int controller_main(int argc, char *argv[]);
 
 #endif /* CONTROLLER_MAIN_HPP_ */

JobMarket/src/JobMarket/Makefile.am

@@ -9 +9 @@
 
 noinst_LTLIBRARIES =
+lib_LTLIBRARIES =
+bin_PROGRAMS =
 
 JOBSSOURCE = \
@@ -33 +35 @@
         Operations/AsyncOperation.cpp \
         Operations/OperationQueue.cpp \
+        Operations/OperationRegistry.cpp \
         Operations/SyncOperation.cpp \
         Operations/Controllers/CheckResultsOperation.cpp \
@@ -52 +55 @@
         Operations/Operation.hpp \
         Operations/OperationQueue.hpp \
+        Operations/OperationRegistry.hpp \
         Operations/SyncOperation.hpp \
         Operations/Controllers/CheckResultsOperation.hpp \
@@ -72 +76 @@
 libJobMarketOperations_la_SOURCES = $(OPERATIONSSOURCE)
 
+POOLSOURCE = \
+        Pool/WorkerPool.cpp
+
+POOLHEADER = \
+        Pool/WorkerPool.hpp
+
+noinst_LTLIBRARIES += libJobMarketPool.la
+libJobMarketPool_la_includedir = $(includedir)/MoleCuilder/JobMarket
+nobase_libJobMarketPool_la_include_HEADERS = $(POOLHEADER)
+libJobMarketPool_la_SOURCES = $(POOLSOURCE)
+
 HELPERSOURCE = \
         atexit.cpp \
+        DefaultOptions.cpp \
         GlobalJobId.cpp \
         Listener.cpp \
+        SignalHandler.cpp \
+        SignalOptions.cpp \
         WorkerAddress.cpp
 
 HELPERHEADER = \
         atexit.hpp \
+        Connection.hpp \
+        DefaultOptions.hpp \
         ExitflagContainer.hpp \
         GlobalJobId.hpp \
         Listener.hpp \
+        SignalHandler.hpp \
+        SignalOptions.hpp \
         WorkerAddress.hpp
 
@@ -90 +112 @@
 libJobMarketHelper_la_SOURCES = $(HELPERSOURCE)
 
-CONTROLLERSOURCE = \
-        FragmentController.cpp \
-        Operations/OperationRegistry.cpp
-
-CONTROLLERHEADER = \
-        Connection.hpp \
-        FragmentController.hpp \
-        Operations/OperationRegistry.hpp
-
-POOLWORKERSOURCE = \
-        Pool/PoolWorker.cpp
-
-POOLWORKERHEADER = \
-        Connection.hpp \
-        Pool/PoolWorker.hpp
-
-SERVERSOURCE = \
-        FragmentScheduler.cpp \
-        Pool/WorkerPool.cpp
-
-SERVERHEADER = \
-        Connection.hpp \
-        ControllerChoices.hpp \
-        FragmentScheduler.hpp \
-        Pool/WorkerPool.hpp
-
-lib_LTLIBRARIES = libJobMarket.la
+lib_LTLIBRARIES += libJobMarket.la
 # make libtool link with C++ linker
 nodist_EXTRA_libJobMarket_la_SOURCES = dummy.cpp
@@ -122 +118 @@
 libJobMarket_la_LDFLAGS = $(AM_LDFLAGS) \
         $(BOOST_ASIO_LDFLAGS) \
+        $(BOOST_PROGRAM_OPTIONS_LDFLAGS)  \
         $(BOOST_SERIALIZATION_LDFLAGS) \
         $(BOOST_THREAD_LDFLAGS) \
@@ -129 +126 @@
         ${CodePatterns_LDFLAGS}
 libJobMarket_la_LIBADD = \
+        libJobMarketPool.la \
         libJobMarketOperations.la \
         libJobMarketJobs.la \
         libJobMarketHelper.la \
         $(BOOST_ASIO_LIBS) \
+        $(BOOST_PROGRAM_OPTIONS_LIBS) \
         $(BOOST_SERIALIZATION_LIBS) \
         $(BOOST_THREAD_LIBS) \
@@ -156 +155 @@
 ## from each source file.  Note that it is not necessary to list header files
 ## which are already listed elsewhere in a _HEADERS variable assignment.
-libJobMarket_la_SOURCES = $(CONTROLLERSOURCE) $(POOLWORKERSOURCE) $(SERVERSOURCE) $(WORKERSOURCE)
+libJobMarket_la_SOURCES = $(POOLWORKERSOURCE) $(SERVERSOURCE)
 
 ## Instruct libtool to include ABI version information in the generated shared
@@ -191 +190 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(top_builddir)/JobMarket.pc $(top_builddir)/JobMarket-debug.pc
+
+
+CONTROLLERSOURCE = \
+        Controller/controller_main.cpp \
+        Controller/controller_SystemCommandJob.cpp \
+        Controller/ControllerCommandRegistry.cpp \
+        Controller/ControllerOptions.cpp \
+        Controller/ControllerOptions_SystemCommandJob.cpp \
+        Controller/FragmentController.cpp
+
+CONTROLLERHEADER = \
+        Controller/controller_AddOn.hpp \
+        Controller/controller_main.hpp \
+        Controller/controller_SystemCommandJob.hpp \
+        Controller/ControllerCommand.hpp \
+        Controller/ControllerCommandRegistry.hpp \
+        Controller/ControllerOptions.hpp \
+        Controller/ControllerOptions_SystemCommandJob.hpp \
+        Controller/FragmentController.hpp
+
+lib_LTLIBRARIES += libJobMarketController.la
+libJobMarketController_la_includedir = $(includedir)/MoleCuilder/JobMarket
+nobase_libJobMarketController_la_include_HEADERS = $(CONTROLLERHEADER)
+libJobMarketController_la_SOURCES = $(CONTROLLERSOURCE)
+libJobMarketController_la_LDFLAGS = \
+        ${CodePatterns_LDFLAGS}
+libJobMarketController_la_LIBADD = \
+        libJobMarket.la \
+        ${CodePatterns_LIBS}
+
+POOLWORKERSOURCE = \
+        Pool/PoolWorker.cpp \
+        poolworker_main.cpp \
+        WorkerOptions.cpp
+
+POOLWORKERHEADER = \
+        Pool/PoolWorker.hpp \
+        poolworker_main.hpp \
+        WorkerOptions.hpp
+
+lib_LTLIBRARIES += libJobMarketPoolWorker.la
+libJobMarketPoolWorker_la_includedir = $(includedir)/MoleCuilder/JobMarket
+nobase_libJobMarketPoolWorker_la_include_HEADERS = $(POOLWORKERHEADER)
+libJobMarketPoolWorker_la_SOURCES = $(POOLWORKERSOURCE)
+libJobMarketPoolWorker_la_LDFLAGS = \
+        ${CodePatterns_LDFLAGS}
+libJobMarketPoolWorker_la_LIBADD = \
+        libJobMarket.la \
+        ${CodePatterns_LIBS}
+
+SERVERSOURCE = \
+        FragmentScheduler.cpp \
+        server_main.cpp \
+        ServerOptions.cpp
+
+SERVERHEADER = \
+        FragmentScheduler.hpp \
+        server_main.hpp \
+        ServerOptions.hpp
+
+lib_LTLIBRARIES += libJobMarketServer.la
+libJobMarketServer_la_includedir = $(includedir)/MoleCuilder/JobMarket
+nobase_libJobMarketServer_la_include_HEADERS = $(SERVERHEADER)
+libJobMarketServer_la_SOURCES = $(SERVERSOURCE)
+libJobMarketServer_la_LDFLAGS = \
+        ${CodePatterns_LDFLAGS}
+libJobMarketServer_la_LIBADD = \
+        libJobMarket.la \
+        ${CodePatterns_LIBS}
+
+
+bin_PROGRAMS += Controller PoolWorker Server
+
+Controller_SOURCES = Controller/controller.cpp Controller/controller_main.hpp Controller/controller_AddOn_SystemCommandJob.cpp
+Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
+Controller_CXXFLAGS = $(AM_CPPFLAGS)
+Controller_LDADD = \
+        libJobMarketController.la \
+        libJobMarket.la \
+        $(top_builddir)/../LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS}
+
+PoolWorker_SOURCES = poolworker.cpp
+PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
+PoolWorker_CXXFLAGS = $(AM_CPPFLAGS)
+PoolWorker_LDADD = \
+        libJobMarketPoolWorker.la \
+        libJobMarket.la \
+        $(top_builddir)/../LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS}
+
+Server_SOURCES = server.cpp
+Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
+Server_CXXFLAGS = $(AM_CPPFLAGS)
+Server_LDADD = \
+        libJobMarketServer.la \
+        libJobMarket.la \
+        $(top_builddir)/../LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS}
+

JobMarket/src/unittests/Makefile.am

@@ -101 +101 @@
   stubs/AsyncOperationStub.hpp
 OperationQueueUnitTest_LDADD = \
-        ../JobMarket/libJobMarket.la \
+        ../JobMarket/libJobMarketOperations.la \
+        ../JobMarket/libJobMarketJobs.la \
+        ../JobMarket/libJobMarketHelper.la \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
   ${CodePatterns_LIBS}
@@ -137 +139 @@
   stubs/ObserverStub.hpp
 WorkerPoolUnitTest_LDADD = \
-        ../JobMarket/libJobMarket.la \
+        ../JobMarket/libJobMarketPool.la \
+        ../JobMarket/libJobMarketHelper.la \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \