diff --git a/Makefile.am b/Makefile.am index 12701f7..86fd685 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,6 +44,9 @@ gladedir = $(sharedir)/glade localedir = @datadir@/locale aclocaldir = @datadir@/aclocal +# used for installing templates include files +templatesdir = $(pkgincludedir)/templates + #define empty global variables bin_PROGRAMS = pkglib_LTLIBRARIES = @@ -51,6 +54,7 @@ plugin_LTLIBRARIES = noinst_HEADERS = noinst_DATA = pkginclude_HEADERS = +templates_HEADERS = EXTRA_DIST = MAINTAINERCLEANFILES = MOSTLYCLEANFILES = @@ -133,7 +137,7 @@ pkglib_LTLIBRARIES += src/backend/libbackend.la src_backend_libbackend_la_CPPFLAGS = \ -I@top_srcdir@ \ - -I@top_srcdir@/src/templates \ + -I@top_srcdir@/src/backend \ -DPOLDIR="\"$(policiesdir)\"" \ -DPLUGDIR="\"$(plugindir)\"" \ -DLOCALEDIR="\"$(localedir)\"" \ @@ -207,43 +211,45 @@ src_backend_libbackend_la_SOURCES = \ # For headers used internally by the backend, see below. pkginclude_HEADERS += \ config.h \ - src/backend/cpu_policies_gatekeeper.hh \ - src/backend/cpu_policy.hh \ - src/backend/cpu_policy_exception.hh \ - src/backend/cpu_policy_manager.hh \ - src/backend/default_resource_policy_manager.hh \ - src/backend/environment.hh \ - src/backend/global_preferences.hh \ - src/backend/history.hh \ - src/backend/history_observer.hh \ - src/backend/holt_graph.hh \ - src/backend/invalid_plugin_exception.hh \ - src/backend/key_file.hh \ - src/backend/malformed_policy_exception.hh \ - src/backend/module.hh \ - src/backend/null_policy_exception.hh \ - src/backend/policy_parameters.hh \ - src/backend/plugin.hh \ - src/backend/plugin_manager.hh \ - src/backend/ready_queue.hh \ - src/backend/request.hh \ - src/backend/resource.hh \ - src/backend/resource_policies_gatekeeper.hh \ - src/backend/resource_policy.hh \ - src/backend/resource_policy_lifo.hh \ - src/backend/resource_policy_manager.hh \ - src/backend/process.hh \ - src/backend/schedulable.hh \ - src/backend/scheduler.hh \ - src/backend/serialize_visitor.hh \ - src/backend/serializer.hh \ - src/backend/serializer_error.hh \ - src/backend/serializers_gatekeeper.hh \ - src/backend/simulation.hh \ - src/backend/simulation_observer.hh \ - src/backend/sub_request.hh \ - src/backend/thread.hh \ - src/backend/user_interrupt_exception.hh + src/backend/sgpemv2/cpu_policies_gatekeeper.hh \ + src/backend/sgpemv2/cpu_policy.hh \ + src/backend/sgpemv2/cpu_policy_exception.hh \ + src/backend/sgpemv2/cpu_policy_manager.hh \ + src/backend/sgpemv2/default_resource_policy_manager.hh \ + src/backend/sgpemv2/environment.hh \ + src/backend/sgpemv2/global_preferences.hh \ + src/backend/sgpemv2/history.hh \ + src/backend/sgpemv2/history_observer.hh \ + src/backend/sgpemv2/holt_graph.hh \ + src/backend/sgpemv2/invalid_plugin_exception.hh \ + src/backend/sgpemv2/key_file.hh \ + src/backend/sgpemv2/malformed_policy_exception.hh \ + src/backend/sgpemv2/module.hh \ + src/backend/sgpemv2/null_policy_exception.hh \ + src/backend/sgpemv2/policy_parameters.hh \ + src/backend/sgpemv2/plugin.hh \ + src/backend/sgpemv2/plugin_manager.hh \ + src/backend/sgpemv2/ready_queue.hh \ + src/backend/sgpemv2/request.hh \ + src/backend/sgpemv2/resource.hh \ + src/backend/sgpemv2/resource_policies_gatekeeper.hh \ + src/backend/sgpemv2/resource_policy.hh \ + src/backend/sgpemv2/resource_policy_lifo.hh \ + src/backend/sgpemv2/resource_policy_manager.hh \ + src/backend/sgpemv2/process.hh \ + src/backend/sgpemv2/schedulable.hh \ + src/backend/sgpemv2/scheduler.hh \ + src/backend/sgpemv2/serialize_visitor.hh \ + src/backend/sgpemv2/serializer.hh \ + src/backend/sgpemv2/serializer_error.hh \ + src/backend/sgpemv2/serializers_gatekeeper.hh \ + src/backend/sgpemv2/simulation.hh \ + src/backend/sgpemv2/simulation_observer.hh \ + src/backend/sgpemv2/string_utils.hh \ + src/backend/sgpemv2/sub_request.hh \ + src/backend/sgpemv2/thread.hh \ + src/backend/sgpemv2/user_interrupt_exception.hh + # Put here headers used internally by the backend # They won't be installed for the end-user. @@ -262,8 +268,7 @@ noinst_HEADERS += \ src/backend/static_resource.hh \ src/backend/static_schedulable.hh \ src/backend/static_sub_request.hh \ - src/backend/static_thread.hh \ - src/backend/string_utils.hh + src/backend/static_thread.hh # ############################################################ @@ -277,7 +282,7 @@ bin_PROGRAMS += sgpemv2 sgpemv2_CPPFLAGS = \ -I@top_srcdir@ \ - -I@top_srcdir@/src/templates \ + -I@top_srcdir@/src/backend \ -DLOCALEDIR="\"$(localedir)\"" \ -DSHAREDIR="\"$(sharedir)\"" \ -DGLADEDIR="\"$(gladedir)\"" \ @@ -349,14 +354,14 @@ glade_DATA = \ # # ############################################################ -pkginclude_HEADERS += \ - src/templates/deletor.tcc \ - src/templates/parameter.tcc \ - src/templates/sequences.tcc \ - src/templates/singleton.hh \ - src/templates/singleton.tcc \ - src/templates/smartp.hh \ - src/templates/smartp.tcc +templates_HEADERS += \ + src/backend/sgpemv2/templates/deletor.tcc \ + src/backend/sgpemv2/templates/parameter.tcc \ + src/backend/sgpemv2/templates/sequences.tcc \ + src/backend/sgpemv2/templates/singleton.hh \ + src/backend/sgpemv2/templates/singleton.tcc \ + src/backend/sgpemv2/templates/smartp.hh \ + src/backend/sgpemv2/templates/smartp.tcc # ############################################################ # @@ -381,8 +386,7 @@ noinst_PROGRAMS = \ # src/testsuite/test-stepforward src_testsuite_test_history_CPPFLAGS = \ - -I@top_srcdir@/src \ - -I@top_srcdir@/src/templates \ + -I@top_srcdir@/src/backend \ $(GLIBMM_CFLAGS) src_testsuite_test_history_LDFLAGS = \ src/backend/libbackend.la \ @@ -405,8 +409,7 @@ src_testsuite_test_history_SOURCES = \ src/testsuite/test-history.cc src_testsuite_test_global_preferences_serialization_CPPFLAGS = \ - -I@top_srcdir@/src \ - -I@top_srcdir@/src/templates \ + -I@top_srcdir@/src/backend \ $(GLIBMM_CFLAGS) src_testsuite_test_global_preferences_serialization_LDFLAGS = \ src/backend/libbackend.la \ @@ -415,8 +418,7 @@ src_testsuite_test_global_preferences_serialization_SOURCES = \ src/testsuite/test-global_preferences_serialization.cc src_testsuite_test_key_file_CPPFLAGS = \ - -I@top_srcdir@/src \ - -I@top_srcdir@/src/templates \ + -I@top_srcdir@/src/backend \ $(GLIBMM_CFLAGS) src_testsuite_test_key_file_LDFLAGS = \ src/backend/libbackend.la \ @@ -426,7 +428,7 @@ src_testsuite_test_key_file_SOURCES = \ src_testsuite_test_cairo_widget_CPPFLAGS = \ -I@top_srcdir@/src \ - -I@top_srcdir@/src/templates \ + -I@top_srcdir@/src/backend \ $(CAIRO_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GLIBMM_CFLAGS) @@ -441,7 +443,7 @@ src_testsuite_test_cairo_widget_SOURCES = \ src_testsuite_test_simulation_widget_CPPFLAGS = \ -I@top_srcdir@/src \ - -I@top_srcdir@/src/templates \ + -I@top_srcdir@/src/backend \ $(CAIRO_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GLIBMM_CFLAGS) \ @@ -460,7 +462,7 @@ src_testsuite_test_simulation_widget_SOURCES = \ src_testsuite_test_holt_widget_CPPFLAGS = \ -I@top_srcdir@/src \ - -I@top_srcdir@/src/templates \ + -I@top_srcdir@/src/backend \ $(CAIRO_CFLAGS) \ $(GTKMM_CFLAGS) \ $(GLIBMM_CFLAGS) \ @@ -528,15 +530,15 @@ noinst_DATA += \ src/testsuite/scheduling-wizards/wizard-complex-test \ src/testsuite/scheduling-wizards/wizard-priority-inversion-porno \ src/testsuite/scheduling-wizards/wizard-priority-preemption-fail \ - src/testsuite/scheduling-wizards/wizard-block-fail - -# environments/DiscWorld_unblock.xgp \ -# environments/Fantozzi_lifo_requests.xgp \ -# environments/FruitsBasket_complex.xgp \ -# environments/Matteo_deadlock.xgp \ -# environments/Modernita_gap_terminated.xgp \ -# environments/Porno_priority_inversion.xgp \ -# environments/ScuolaDiMileto_assert_fail.xgp \ -# environments/ScuolaDiMileto_block_fail.xgp \ -# environments/ScuolaDiMileto_gap_blocked.xgp \ -# environments/ScuolaDiMileto_gap_fail.xgp + src/testsuite/scheduling-wizards/wizard-block-fail \ + src/testsuite/scheduling-wizards/environments/FruitsBasket_complex.xgp \ + src/testsuite/scheduling-wizards/environments/Fantozzi_lifo_requests.xgp \ + src/testsuite/scheduling-wizards/environments/ScuolaDiMileto_block_fail.xgp \ + src/testsuite/scheduling-wizards/environments/ScuolaDiMileto_gap_blocked.xgp \ + src/testsuite/scheduling-wizards/environments/ScuolaDiMileto_assert_fail.xgp \ + src/testsuite/scheduling-wizards/environments/Matteo_deadlock.xgp \ + src/testsuite/scheduling-wizards/environments/Modernita_gap_terminated.xgp \ + src/testsuite/scheduling-wizards/environments/Matteo_preemption_fail.xgp \ + src/testsuite/scheduling-wizards/environments/Porno_priority_inversion.xgp \ + src/testsuite/scheduling-wizards/environments/ScuolaDiMileto_gap_fail.xgp \ + src/testsuite/scheduling-wizards/environments/DiscWorld_unblock.xgp diff --git a/config/sgpemv2-uninstalled.pc.in b/config/sgpemv2-uninstalled.pc.in index 4b1b5fa..d1a81e5 100644 --- a/config/sgpemv2-uninstalled.pc.in +++ b/config/sgpemv2-uninstalled.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=@abs_top_builddir@ -includedir=@abs_top_srcdir@/src +includedir=@abs_top_srcdir@/src/backend datarootdir=@datarootdir@ policies_dir=@datadir@/@PACKAGE@/policies @@ -15,4 +15,4 @@ URL: http://www.math.unipd.it/ Requires: glibmm-2.4 >= 2.8 gthread-2.0 >= 2.8 Libs: -L${libdir}/src/backend -lbackend Libs.private: -lglibmm-2.4 -lgthread-2.0 -Cflags: -I${includedir}/backend -I${includedir}/templates +Cflags: -I${includedir} diff --git a/plugins/pyloader/Makefile.am b/plugins/pyloader/Makefile.am index b039648..cc2e591 100644 --- a/plugins/pyloader/Makefile.am +++ b/plugins/pyloader/Makefile.am @@ -127,7 +127,7 @@ _sgpem_la_CPPFLAGS = \ -I@top_srcdir@ \ $(SWIG_PYTHON_CPPFLAGS) \ $(GLIBMM_CFLAGS) \ - $(SGPEMV2_CFLAGS) + $(SGPEMV2_CFLAGS) _sgpem_la_LDFLAGS = -module -export-dynamic \ $(GLIBMM_LDFLAGS) _sgpem_la_LIBADD = $(SGPEMV2_LIBS) \ diff --git a/plugins/pyloader/src/plugin.cc b/plugins/pyloader/src/plugin.cc index b864a6f..8381b86 100644 --- a/plugins/pyloader/src/plugin.cc +++ b/plugins/pyloader/src/plugin.cc @@ -20,7 +20,7 @@ #include "config.h" -#include "plugin.hh" +#include #include "python_cpu_policy_manager.hh" using namespace sgpem; diff --git a/plugins/pyloader/src/python_cpu_policy.hh b/plugins/pyloader/src/python_cpu_policy.hh index 7568f57..8481a7a 100644 --- a/plugins/pyloader/src/python_cpu_policy.hh +++ b/plugins/pyloader/src/python_cpu_policy.hh @@ -29,9 +29,9 @@ #include -#include "cpu_policy.hh" -#include "user_interrupt_exception.hh" -#include "malformed_policy_exception.hh" +#include +#include +#include namespace sgpem { diff --git a/plugins/pyloader/src/python_cpu_policy_manager.cc b/plugins/pyloader/src/python_cpu_policy_manager.cc index a97d6ab..caf0a83 100644 --- a/plugins/pyloader/src/python_cpu_policy_manager.cc +++ b/plugins/pyloader/src/python_cpu_policy_manager.cc @@ -19,10 +19,10 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "python_cpu_policy_manager.hh" -#include "global_preferences.hh" -#include "cpu_policies_gatekeeper.hh" +#include +#include -#include "deletor.tcc" +#include #include #include diff --git a/plugins/pyloader/src/python_cpu_policy_manager.hh b/plugins/pyloader/src/python_cpu_policy_manager.hh index d21308f..ba8480b 100644 --- a/plugins/pyloader/src/python_cpu_policy_manager.hh +++ b/plugins/pyloader/src/python_cpu_policy_manager.hh @@ -25,7 +25,7 @@ #include -#include "cpu_policy_manager.hh" +#include #include "python_cpu_policy.hh" namespace sgpem diff --git a/plugins/pyloader/src/sgpem.i b/plugins/pyloader/src/sgpem.i index 01ec084..1ab25a4 100644 --- a/plugins/pyloader/src/sgpem.i +++ b/plugins/pyloader/src/sgpem.i @@ -1,15 +1,16 @@ %module sgpem %{ -#include "cpu_policy.hh" -#include "cpu_policies_gatekeeper.hh" -#include "history.hh" -#include "policy_parameters.hh" -#include "process.hh" -#include "ready_queue.hh" -#include "schedulable.hh" -#include "scheduler.hh" -#include "simulation.hh" -#include "thread.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +using namespace sgpem; %} /* NOTE : passing Unicode strings to C++ methods calling them diff --git a/plugins/pyloader/src/testsuite/test-python_loader.cc b/plugins/pyloader/src/testsuite/test-python_loader.cc index f7db62a..8c1a737 100644 --- a/plugins/pyloader/src/testsuite/test-python_loader.cc +++ b/plugins/pyloader/src/testsuite/test-python_loader.cc @@ -25,12 +25,12 @@ #include "../python_cpu_policy_manager.hh" #include "../python_cpu_policy.hh" -#include "simulation.hh" -#include "global_preferences.hh" -#include "cpu_policies_gatekeeper.hh" -#include "simulation.hh" -#include "scheduler.hh" -#include "user_interrupt_exception.hh" +#include +#include +#include +#include +#include +#include #include #include diff --git a/plugins/xmlsave/src/plugin.cc b/plugins/xmlsave/src/plugin.cc index 10d473d..6c885af 100644 --- a/plugins/xmlsave/src/plugin.cc +++ b/plugins/xmlsave/src/plugin.cc @@ -20,7 +20,7 @@ #include "config.h" -#include "plugin.hh" +#include #include "xml_serializer.hh" using namespace sgpem; diff --git a/plugins/xmlsave/src/xml_serializer.cc b/plugins/xmlsave/src/xml_serializer.cc index 6c7229a..3176c85 100644 --- a/plugins/xmlsave/src/xml_serializer.cc +++ b/plugins/xmlsave/src/xml_serializer.cc @@ -22,11 +22,11 @@ #include "xml_serializer_factory.hh" #include "xml_visitor.hh" -#include "environment.hh" -#include "history.hh" -#include "process.hh" -#include "serializer_error.hh" -#include "string_utils.hh" +#include +#include +#include +#include +#include using namespace sgpem; diff --git a/plugins/xmlsave/src/xml_serializer.hh b/plugins/xmlsave/src/xml_serializer.hh index b7dee88..3c81a34 100644 --- a/plugins/xmlsave/src/xml_serializer.hh +++ b/plugins/xmlsave/src/xml_serializer.hh @@ -22,7 +22,7 @@ #define XML_SERIALIZER_HH 1 #include "config.h" -#include "serializer.hh" +#include #include #include diff --git a/plugins/xmlsave/src/xml_serializer_factory.cc b/plugins/xmlsave/src/xml_serializer_factory.cc index 7ba29d1..19a1cd5 100644 --- a/plugins/xmlsave/src/xml_serializer_factory.cc +++ b/plugins/xmlsave/src/xml_serializer_factory.cc @@ -20,11 +20,9 @@ #include "xml_serializer_factory.hh" -#include "string_utils.hh" -// #include "environment.hh" -#include "history.hh" -#include "resource.hh" -// #include "backend/process.hh" +#include +#include +#include using namespace sgpem; diff --git a/plugins/xmlsave/src/xml_serializer_factory.hh b/plugins/xmlsave/src/xml_serializer_factory.hh index 63bf348..3d10304 100644 --- a/plugins/xmlsave/src/xml_serializer_factory.hh +++ b/plugins/xmlsave/src/xml_serializer_factory.hh @@ -22,9 +22,9 @@ #define XML_SERIALIZER_FACTORY_HH 1 #include "config.h" -#include "history.hh" -#include "environment.hh" -#include "serializer_error.hh" +#include +#include +#include #include #include diff --git a/plugins/xmlsave/src/xml_visitor.cc b/plugins/xmlsave/src/xml_visitor.cc index fda6438..6d4e837 100644 --- a/plugins/xmlsave/src/xml_visitor.cc +++ b/plugins/xmlsave/src/xml_visitor.cc @@ -22,15 +22,15 @@ #include "gettext.h" -#include "environment.hh" -#include "history.hh" -#include "process.hh" -#include "request.hh" -#include "resource.hh" -#include "serializer_error.hh" -#include "string_utils.hh" -#include "sub_request.hh" -#include "thread.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace sgpem; diff --git a/plugins/xmlsave/src/xml_visitor.hh b/plugins/xmlsave/src/xml_visitor.hh index 1f4d1bc..dafa214 100644 --- a/plugins/xmlsave/src/xml_visitor.hh +++ b/plugins/xmlsave/src/xml_visitor.hh @@ -31,7 +31,7 @@ namespace sgpem } #include "config.h" -#include "serialize_visitor.hh" +#include #include #include diff --git a/src/add_request_dialog.cc b/src/add_request_dialog.cc index 5bfba19..36250e6 100644 --- a/src/add_request_dialog.cc +++ b/src/add_request_dialog.cc @@ -19,11 +19,13 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "add_request_dialog.hh" -#include "templates/sequences.tcc" -#include "backend/history.hh" -#include "backend/environment.hh" -#include "backend/simulation.hh" -#include "backend/resource.hh" + +#include + +#include +#include +#include +#include #include #include diff --git a/src/backend/concrete_environment.cc b/src/backend/concrete_environment.cc index 4f9488e..c0e0602 100644 --- a/src/backend/concrete_environment.cc +++ b/src/backend/concrete_environment.cc @@ -22,11 +22,11 @@ #include "dynamic_process.hh" #include "dynamic_resource.hh" #include "dynamic_sub_request.hh" -#include "sub_request.hh" -#include "thread.hh" +#include +#include -#include "deletor.tcc" -#include "sequences.tcc" +#include +#include #include #include diff --git a/src/backend/concrete_environment.hh b/src/backend/concrete_environment.hh index 6740b64..af79cdd 100644 --- a/src/backend/concrete_environment.hh +++ b/src/backend/concrete_environment.hh @@ -22,11 +22,11 @@ #define CONCRETE_ENVIRONMENT_HH 1 #include "config.h" -#include "environment.hh" -#include "resource.hh" +#include +#include #include "dynamic_process.hh" #include "dynamic_request.hh" -#include "ready_queue.hh" +#include namespace sgpem diff --git a/src/backend/concrete_history.cc b/src/backend/concrete_history.cc index e1d0871..39461c2 100644 --- a/src/backend/concrete_history.cc +++ b/src/backend/concrete_history.cc @@ -32,11 +32,11 @@ #include "static_request.hh" #include "static_sub_request.hh" -#include "history_observer.hh" +#include #include "concrete_history.hh" -#include "deletor.tcc" -#include "smartp.tcc" +#include +#include #include #include diff --git a/src/backend/concrete_history.hh b/src/backend/concrete_history.hh index 80be351..d9865c6 100644 --- a/src/backend/concrete_history.hh +++ b/src/backend/concrete_history.hh @@ -29,7 +29,7 @@ #include "dynamic_resource.hh" #include "dynamic_sub_request.hh" #include "dynamic_thread.hh" -#include "history.hh" +#include #include diff --git a/src/backend/concrete_simulation.cc b/src/backend/concrete_simulation.cc index 796a0df..f9a22c5 100644 --- a/src/backend/concrete_simulation.cc +++ b/src/backend/concrete_simulation.cc @@ -19,14 +19,14 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "concrete_simulation.hh" -#include "simulation_observer.hh" -#include "scheduler.hh" -#include "cpu_policies_gatekeeper.hh" -#include "resource_policies_gatekeeper.hh" +#include +#include +#include +#include #include -#include "smartp.tcc" +#include #include #include diff --git a/src/backend/concrete_simulation.hh b/src/backend/concrete_simulation.hh index 2c0a210..a331555 100644 --- a/src/backend/concrete_simulation.hh +++ b/src/backend/concrete_simulation.hh @@ -23,7 +23,7 @@ #include "config.h" -#include "simulation.hh" +#include #include "concrete_history.hh" #include diff --git a/src/backend/cpu_policies_gatekeeper.cc b/src/backend/cpu_policies_gatekeeper.cc index f501f5b..72a4492 100644 --- a/src/backend/cpu_policies_gatekeeper.cc +++ b/src/backend/cpu_policies_gatekeeper.cc @@ -20,13 +20,13 @@ #include "config.h" -#include "cpu_policies_gatekeeper.hh" -#include "cpu_policy_manager.hh" -#include "cpu_policy.hh" +#include +#include +#include #include "concrete_history.hh" // Include full template definition only in implementation files: -#include "singleton.tcc" +#include #include #include diff --git a/src/backend/cpu_policy.cc b/src/backend/cpu_policy.cc index 6127bf9..fdbd7b8 100644 --- a/src/backend/cpu_policy.cc +++ b/src/backend/cpu_policy.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "cpu_policy.hh" +#include using namespace std; using namespace sgpem; diff --git a/src/backend/cpu_policy_exception.cc b/src/backend/cpu_policy_exception.cc index 759abfd..2430fad 100644 --- a/src/backend/cpu_policy_exception.cc +++ b/src/backend/cpu_policy_exception.cc @@ -22,7 +22,7 @@ // It could be necessary to do dynamic type-checking when // catching it (with typeinfo). -#include "malformed_policy_exception.hh" +#include using namespace sgpem; CPUPolicyException::CPUPolicyException(const std::string& msg) diff --git a/src/backend/cpu_policy_manager.cc b/src/backend/cpu_policy_manager.cc index ddd0e9c..4bd813d 100644 --- a/src/backend/cpu_policy_manager.cc +++ b/src/backend/cpu_policy_manager.cc @@ -19,8 +19,10 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "cpu_policy_manager.hh" -#include "cpu_policies_gatekeeper.hh" +#include +#include + +using namespace sgpem; CPUPolicyManager::CPUPolicyManager() { diff --git a/src/backend/default_resource_policy_manager.cc b/src/backend/default_resource_policy_manager.cc index 8be6689..36156be 100644 --- a/src/backend/default_resource_policy_manager.cc +++ b/src/backend/default_resource_policy_manager.cc @@ -19,9 +19,9 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "resource_policy_lifo.hh" -#include "default_resource_policy_manager.hh" -#include "resource_policies_gatekeeper.hh" +#include +#include +#include using namespace sgpem; diff --git a/src/backend/dynamic_process.cc b/src/backend/dynamic_process.cc index 15aae4f..95435c6 100644 --- a/src/backend/dynamic_process.cc +++ b/src/backend/dynamic_process.cc @@ -21,10 +21,10 @@ #include "dynamic_process.hh" #include "static_process.hh" #include "dynamic_thread.hh" -#include "serialize_visitor.hh" +#include -#include "deletor.tcc" -#include "sequences.tcc" +#include +#include #include #include diff --git a/src/backend/dynamic_process.hh b/src/backend/dynamic_process.hh index 782b84d..b8cb614 100644 --- a/src/backend/dynamic_process.hh +++ b/src/backend/dynamic_process.hh @@ -24,11 +24,11 @@ #include "config.h" #include "gettext.h" -#include "process.hh" +#include #include "dynamic_schedulable.hh" #include "static_process.hh" -#include "smartp.tcc" +#include #include #include diff --git a/src/backend/dynamic_request.cc b/src/backend/dynamic_request.cc index 99ff19d..9143b67 100644 --- a/src/backend/dynamic_request.cc +++ b/src/backend/dynamic_request.cc @@ -22,10 +22,10 @@ #include "static_request.hh" #include "dynamic_sub_request.hh" #include "dynamic_thread.hh" -#include "serialize_visitor.hh" +#include -#include "deletor.tcc" -#include "smartp.tcc" +#include +#include #include #include diff --git a/src/backend/dynamic_request.hh b/src/backend/dynamic_request.hh index d3b952c..b0d2b89 100644 --- a/src/backend/dynamic_request.hh +++ b/src/backend/dynamic_request.hh @@ -23,11 +23,11 @@ #include "config.h" -#include "request.hh" +#include #include "static_request.hh" #include "dynamic_thread.hh" -#include "smartp.hh" +#include #include diff --git a/src/backend/dynamic_resource.cc b/src/backend/dynamic_resource.cc index 4922b3d..21321bc 100644 --- a/src/backend/dynamic_resource.cc +++ b/src/backend/dynamic_resource.cc @@ -20,9 +20,9 @@ #include "dynamic_resource.hh" #include "static_resource.hh" -#include "serialize_visitor.hh" +#include -#include "smartp.tcc" +#include #include diff --git a/src/backend/dynamic_resource.hh b/src/backend/dynamic_resource.hh index b324fdd..93aff6e 100644 --- a/src/backend/dynamic_resource.hh +++ b/src/backend/dynamic_resource.hh @@ -24,9 +24,9 @@ #include "config.h" #include "glibmm/ustring.h" -#include "smartp.hh" +#include -#include "resource.hh" +#include #include "static_resource.hh" namespace sgpem diff --git a/src/backend/dynamic_schedulable.cc b/src/backend/dynamic_schedulable.cc index 21995b5..560e149 100644 --- a/src/backend/dynamic_schedulable.cc +++ b/src/backend/dynamic_schedulable.cc @@ -20,7 +20,7 @@ #include "dynamic_schedulable.hh" -#include "smartp.tcc" +#include #include diff --git a/src/backend/dynamic_schedulable.hh b/src/backend/dynamic_schedulable.hh index b6a3bd1..cd40640 100644 --- a/src/backend/dynamic_schedulable.hh +++ b/src/backend/dynamic_schedulable.hh @@ -22,7 +22,7 @@ #define DYNAMIC_SCHEDULABLE_HH 1 #include "config.h" -#include "schedulable.hh" +#include #include "static_schedulable.hh" namespace sgpem diff --git a/src/backend/dynamic_sub_request.cc b/src/backend/dynamic_sub_request.cc index 002644f..7f25450 100644 --- a/src/backend/dynamic_sub_request.cc +++ b/src/backend/dynamic_sub_request.cc @@ -20,10 +20,10 @@ #include "dynamic_sub_request.hh" #include "dynamic_request.hh" -#include "request.hh" -#include "serialize_visitor.hh" +#include +#include -#include "smartp.tcc" +#include #include #include diff --git a/src/backend/dynamic_sub_request.hh b/src/backend/dynamic_sub_request.hh index 814c795..8180141 100644 --- a/src/backend/dynamic_sub_request.hh +++ b/src/backend/dynamic_sub_request.hh @@ -23,13 +23,13 @@ #include "config.h" -#include "request.hh" -#include "sub_request.hh" +#include +#include #include "dynamic_request.hh" #include "dynamic_resource.hh" #include "static_sub_request.hh" -#include "smartp.hh" +#include namespace sgpem { diff --git a/src/backend/dynamic_thread.cc b/src/backend/dynamic_thread.cc index 5616cb9..3af14b3 100644 --- a/src/backend/dynamic_thread.cc +++ b/src/backend/dynamic_thread.cc @@ -21,14 +21,14 @@ #include "dynamic_thread.hh" #include "static_thread.hh" #include "dynamic_request.hh" -#include "serialize_visitor.hh" +#include #include #include #include -#include "deletor.tcc" -#include "smartp.tcc" +#include +#include using namespace sgpem; using namespace std; diff --git a/src/backend/dynamic_thread.hh b/src/backend/dynamic_thread.hh index 25a5a52..4448bac 100644 --- a/src/backend/dynamic_thread.hh +++ b/src/backend/dynamic_thread.hh @@ -26,11 +26,11 @@ #include "glibmm/ustring.h" #include -#include "thread.hh" +#include #include "dynamic_process.hh" #include "dynamic_schedulable.hh" -#include "smartp.hh" +#include namespace sgpem { diff --git a/src/backend/environment.cc b/src/backend/environment.cc index 8cfe5dd..570c4ae 100644 --- a/src/backend/environment.cc +++ b/src/backend/environment.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "environment.hh" +#include using namespace sgpem; diff --git a/src/backend/global_preferences.cc b/src/backend/global_preferences.cc index 330fecb..0295ecd 100644 --- a/src/backend/global_preferences.cc +++ b/src/backend/global_preferences.cc @@ -19,14 +19,16 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "config.h" -#include "global_preferences.hh" -#include "key_file.hh" -#include "string_utils.hh" + +#include +#include +#include + #include - // Do not include in header file: -#include "singleton.tcc" +#include + using namespace sgpem; // Explicit template instantiation to allow to export symbols from the DSO. diff --git a/src/backend/global_preferences_serializer.cc b/src/backend/global_preferences_serializer.cc index 8bfb461..a2b6a96 100644 --- a/src/backend/global_preferences_serializer.cc +++ b/src/backend/global_preferences_serializer.cc @@ -19,7 +19,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "config.h" -#include "key_file.hh" +#include #include "global_preferences_serializer.hh" #include diff --git a/src/backend/global_preferences_serializer.hh b/src/backend/global_preferences_serializer.hh index c4ee9ba..8e649db 100644 --- a/src/backend/global_preferences_serializer.hh +++ b/src/backend/global_preferences_serializer.hh @@ -21,8 +21,8 @@ #ifndef GLOBAL_PREFERENCES_SERIALIZER_HH #define GLOBAL_PREFERENCES_SERIALIZER_HH 1 -#include "global_preferences.hh" -#include "key_file.hh" +#include +#include namespace sgpem { diff --git a/src/backend/history.cc b/src/backend/history.cc index bfeb459..af6e3ac 100644 --- a/src/backend/history.cc +++ b/src/backend/history.cc @@ -20,8 +20,8 @@ #include "config.h" -#include "history.hh" -#include "history_observer.hh" +#include +#include #include #include diff --git a/src/backend/history_observer.cc b/src/backend/history_observer.cc index 9ce105f..691e1e4 100644 --- a/src/backend/history_observer.cc +++ b/src/backend/history_observer.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "history_observer.hh" +#include sgpem::HistoryObserver::~HistoryObserver() {} diff --git a/src/backend/holt_graph.cc b/src/backend/holt_graph.cc index 017f353..9a78686 100644 --- a/src/backend/holt_graph.cc +++ b/src/backend/holt_graph.cc @@ -18,11 +18,11 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "holt_graph.hh" +#include -#include "history.hh" -#include "process.hh" -#include "thread.hh" +#include +#include +#include using namespace sgpem; using namespace std; diff --git a/src/backend/invalid_plugin_exception.cc b/src/backend/invalid_plugin_exception.cc index fc8bfa1..7b7a101 100644 --- a/src/backend/invalid_plugin_exception.cc +++ b/src/backend/invalid_plugin_exception.cc @@ -20,7 +20,7 @@ #include "config.h" -#include "invalid_plugin_exception.hh" +#include using namespace sgpem; diff --git a/src/backend/key_file.cc b/src/backend/key_file.cc index db4773b..6de3e91 100644 --- a/src/backend/key_file.cc +++ b/src/backend/key_file.cc @@ -19,7 +19,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "config.h" -#include "key_file.hh" +#include #include #include diff --git a/src/backend/malformed_policy_exception.cc b/src/backend/malformed_policy_exception.cc index 2244548..df440c2 100644 --- a/src/backend/malformed_policy_exception.cc +++ b/src/backend/malformed_policy_exception.cc @@ -22,7 +22,7 @@ // It could be necessary to do dynamic type-checking when // catching it (with typeinfo). -#include "malformed_policy_exception.hh" +#include using namespace sgpem; MalformedPolicyException::MalformedPolicyException(const std::string& msg) diff --git a/src/backend/module.cc b/src/backend/module.cc index 754e5a8..0577bef 100644 --- a/src/backend/module.cc +++ b/src/backend/module.cc @@ -20,7 +20,7 @@ #include "config.h" -#include "module.hh" +#include // FIXME: remove this header #include diff --git a/src/backend/null_policy_exception.cc b/src/backend/null_policy_exception.cc index d12c286..9d9795c 100644 --- a/src/backend/null_policy_exception.cc +++ b/src/backend/null_policy_exception.cc @@ -22,7 +22,7 @@ // It could be necessary to do dynamic type-checking when // catching it (with typeinfo). -#include "null_policy_exception.hh" +#include using namespace sgpem; NullPolicyException::NullPolicyException(const char* msg) diff --git a/src/backend/plugin_manager.cc b/src/backend/plugin_manager.cc index f9a4d38..06f13c7 100644 --- a/src/backend/plugin_manager.cc +++ b/src/backend/plugin_manager.cc @@ -20,12 +20,12 @@ #include "config.h" -#include "plugin_manager.hh" -#include "module.hh" -#include "global_preferences.hh" +#include +#include +#include -#include "deletor.tcc" -#include "singleton.tcc" +#include +#include #include #include diff --git a/src/backend/policy_parameters.cc b/src/backend/policy_parameters.cc index 0c9ea1c..01ca3ea 100644 --- a/src/backend/policy_parameters.cc +++ b/src/backend/policy_parameters.cc @@ -18,11 +18,22 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "policy_parameters.hh" +#include +#include + using namespace std; using namespace sgpem; using Glib::ustring; + +// instantiate Parameter template for use outside this DSO +namespace sgpem { + template class SG_DLLEXPORT PolicyParameters::Parameter; + template class SG_DLLEXPORT PolicyParameters::Parameter; + template class SG_DLLEXPORT PolicyParameters::Parameter; +} + + /** Register a new parameter of type integer. If there is a parameter with the same name and type it will be overwritten. diff --git a/src/backend/process.cc b/src/backend/process.cc index efc3b0b..c3e0fd2 100644 --- a/src/backend/process.cc +++ b/src/backend/process.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "process.hh" +#include using namespace sgpem; diff --git a/src/backend/ready_queue.cc b/src/backend/ready_queue.cc index 835bbfd..5bc6682 100644 --- a/src/backend/ready_queue.cc +++ b/src/backend/ready_queue.cc @@ -21,7 +21,7 @@ #include "config.h" #include "gettext.h" -#include "ready_queue.hh" +#include using sgpem::ReadyQueue; diff --git a/src/backend/request.cc b/src/backend/request.cc index 72687b4..de9ee82 100644 --- a/src/backend/request.cc +++ b/src/backend/request.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "request.hh" +#include using namespace sgpem; diff --git a/src/backend/resource.cc b/src/backend/resource.cc index 9c03f9c..2ef92ef 100644 --- a/src/backend/resource.cc +++ b/src/backend/resource.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "resource.hh" +#include using namespace sgpem; diff --git a/src/backend/resource_policies_gatekeeper.cc b/src/backend/resource_policies_gatekeeper.cc index 894a720..224fdd5 100644 --- a/src/backend/resource_policies_gatekeeper.cc +++ b/src/backend/resource_policies_gatekeeper.cc @@ -20,13 +20,13 @@ #include "config.h" -#include "resource_policies_gatekeeper.hh" -#include "resource_policy_manager.hh" -#include "resource_policy.hh" +#include +#include +#include #include "concrete_history.hh" // Include full template definition only in implementation files: -#include "singleton.tcc" +#include #include #include diff --git a/src/backend/resource_policy.cc b/src/backend/resource_policy.cc index d6c6422..23dff89 100644 --- a/src/backend/resource_policy.cc +++ b/src/backend/resource_policy.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "resource_policy.hh" +#include using namespace std; using namespace sgpem; diff --git a/src/backend/resource_policy_lifo.cc b/src/backend/resource_policy_lifo.cc index c7bfe82..6d3a1f4 100644 --- a/src/backend/resource_policy_lifo.cc +++ b/src/backend/resource_policy_lifo.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "resource_policy_lifo.hh" +#include using namespace std; diff --git a/src/backend/resource_policy_manager.cc b/src/backend/resource_policy_manager.cc index 723a19b..85c719f 100644 --- a/src/backend/resource_policy_manager.cc +++ b/src/backend/resource_policy_manager.cc @@ -19,8 +19,8 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "resource_policy_manager.hh" -#include "resource_policies_gatekeeper.hh" +#include +#include using namespace sgpem; diff --git a/src/backend/schedulable.cc b/src/backend/schedulable.cc index 3c312bd..8088d06 100644 --- a/src/backend/schedulable.cc +++ b/src/backend/schedulable.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "schedulable.hh" +#include using namespace sgpem; diff --git a/src/backend/scheduler.cc b/src/backend/scheduler.cc index 8054af6..3eccb4d 100644 --- a/src/backend/scheduler.cc +++ b/src/backend/scheduler.cc @@ -29,14 +29,14 @@ #include "concrete_environment.hh" #include "concrete_history.hh" -#include "cpu_policy.hh" -#include "cpu_policy_exception.hh" +#include +#include -#include "scheduler.hh" +#include // Do not include full template definition in the header file -#include "singleton.tcc" -#include "sequences.tcc" +#include +#include #include diff --git a/src/backend/serialize_visitor.cc b/src/backend/serialize_visitor.cc index ef5160b..158de8b 100644 --- a/src/backend/serialize_visitor.cc +++ b/src/backend/serialize_visitor.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "serialize_visitor.hh" +#include using namespace sgpem; diff --git a/src/backend/serializer.cc b/src/backend/serializer.cc index a4c6808..4922d79 100644 --- a/src/backend/serializer.cc +++ b/src/backend/serializer.cc @@ -18,9 +18,9 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "serializer.hh" +#include -#include "serializers_gatekeeper.hh" +#include using namespace sgpem; diff --git a/src/backend/serializer_error.cc b/src/backend/serializer_error.cc index fa1fb45..4b1b43c 100644 --- a/src/backend/serializer_error.cc +++ b/src/backend/serializer_error.cc @@ -20,7 +20,7 @@ #include "config.h" -#include "serializer_error.hh" +#include using namespace sgpem; diff --git a/src/backend/serializers_gatekeeper.cc b/src/backend/serializers_gatekeeper.cc index 05942c9..2554407 100644 --- a/src/backend/serializers_gatekeeper.cc +++ b/src/backend/serializers_gatekeeper.cc @@ -20,11 +20,11 @@ #include "config.h" -#include "serializers_gatekeeper.hh" -#include "serializer.hh" +#include +#include // Include full template definition only in implementation files: -#include "singleton.tcc" +#include #include #include diff --git a/src/backend/cpu_policies_gatekeeper.hh b/src/backend/sgpemv2/cpu_policies_gatekeeper.hh similarity index 90% rename from src/backend/cpu_policies_gatekeeper.hh rename to src/backend/sgpemv2/cpu_policies_gatekeeper.hh index f0464b8..4ed17f1 100644 --- a/src/backend/cpu_policies_gatekeeper.hh +++ b/src/backend/sgpemv2/cpu_policies_gatekeeper.hh @@ -1,4 +1,4 @@ -// src/backend/cpu_policies_gatekeeper.hh - Copyright 2005, 2006, University +// src/sgpemv2/cpu_policies_gatekeeper.hhbackend/cpu_policy.hh - Copyright 2005, 2006, University // of Padova, dept. of Pure and Applied // Mathematics // @@ -34,9 +34,9 @@ namespace sgpem #include #include -#include "singleton.hh" -#include "malformed_policy_exception.hh" -#include "user_interrupt_exception.hh" +#include +#include +#include namespace sgpem { diff --git a/src/backend/cpu_policy.hh b/src/backend/sgpemv2/cpu_policy.hh similarity index 96% rename from src/backend/cpu_policy.hh rename to src/backend/sgpemv2/cpu_policy.hh index 5e90eca..218f998 100644 --- a/src/backend/cpu_policy.hh +++ b/src/backend/sgpemv2/cpu_policy.hh @@ -26,9 +26,9 @@ #include "glibmm/ustring.h" -#include "policy_parameters.hh" -#include "user_interrupt_exception.hh" -#include "malformed_policy_exception.hh" +#include +#include +#include #include diff --git a/src/backend/cpu_policy_exception.hh b/src/backend/sgpemv2/cpu_policy_exception.hh similarity index 100% rename from src/backend/cpu_policy_exception.hh rename to src/backend/sgpemv2/cpu_policy_exception.hh diff --git a/src/backend/cpu_policy_manager.hh b/src/backend/sgpemv2/cpu_policy_manager.hh similarity index 98% rename from src/backend/cpu_policy_manager.hh rename to src/backend/sgpemv2/cpu_policy_manager.hh index a99a422..0f81d50 100644 --- a/src/backend/cpu_policy_manager.hh +++ b/src/backend/sgpemv2/cpu_policy_manager.hh @@ -23,7 +23,7 @@ #include "config.h" -#include "cpu_policy.hh" +#include #include diff --git a/src/backend/default_resource_policy_manager.hh b/src/backend/sgpemv2/default_resource_policy_manager.hh similarity index 97% rename from src/backend/default_resource_policy_manager.hh rename to src/backend/sgpemv2/default_resource_policy_manager.hh index d94eeac..f61053d 100644 --- a/src/backend/default_resource_policy_manager.hh +++ b/src/backend/sgpemv2/default_resource_policy_manager.hh @@ -28,7 +28,7 @@ namespace sgpem #include "config.h" -#include "resource_policy_manager.hh" +#include #include diff --git a/src/backend/environment.hh b/src/backend/sgpemv2/environment.hh similarity index 99% rename from src/backend/environment.hh rename to src/backend/sgpemv2/environment.hh index d929bea..48eaad5 100644 --- a/src/backend/environment.hh +++ b/src/backend/sgpemv2/environment.hh @@ -23,7 +23,7 @@ #include "config.h" -#include "sub_request.hh" +#include #include #include diff --git a/src/backend/global_preferences.hh b/src/backend/sgpemv2/global_preferences.hh similarity index 97% rename from src/backend/global_preferences.hh rename to src/backend/sgpemv2/global_preferences.hh index 220411d..26cc29a 100644 --- a/src/backend/global_preferences.hh +++ b/src/backend/sgpemv2/global_preferences.hh @@ -28,9 +28,9 @@ #include // Do not include complete template definition here: -#include "singleton.hh" -#include "schedulable.hh" -#include "request.hh" +#include +#include +#include namespace sgpem { diff --git a/src/backend/history.hh b/src/backend/sgpemv2/history.hh similarity index 99% rename from src/backend/history.hh rename to src/backend/sgpemv2/history.hh index 24d25c8..89bf3a8 100644 --- a/src/backend/history.hh +++ b/src/backend/sgpemv2/history.hh @@ -23,7 +23,7 @@ #include "config.h" -#include "environment.hh" +#include #include diff --git a/src/backend/history_observer.hh b/src/backend/sgpemv2/history_observer.hh similarity index 100% rename from src/backend/history_observer.hh rename to src/backend/sgpemv2/history_observer.hh diff --git a/src/backend/holt_graph.hh b/src/backend/sgpemv2/holt_graph.hh similarity index 97% rename from src/backend/holt_graph.hh rename to src/backend/sgpemv2/holt_graph.hh index 7422a08..6c4d200 100644 --- a/src/backend/holt_graph.hh +++ b/src/backend/sgpemv2/holt_graph.hh @@ -28,7 +28,7 @@ namespace sgpem class Request; } -#include "history_observer.hh" +#include #include #include diff --git a/src/backend/invalid_plugin_exception.hh b/src/backend/sgpemv2/invalid_plugin_exception.hh similarity index 100% rename from src/backend/invalid_plugin_exception.hh rename to src/backend/sgpemv2/invalid_plugin_exception.hh diff --git a/src/backend/key_file.hh b/src/backend/sgpemv2/key_file.hh similarity index 100% rename from src/backend/key_file.hh rename to src/backend/sgpemv2/key_file.hh diff --git a/src/backend/malformed_policy_exception.hh b/src/backend/sgpemv2/malformed_policy_exception.hh similarity index 97% rename from src/backend/malformed_policy_exception.hh rename to src/backend/sgpemv2/malformed_policy_exception.hh index 1f0e176..f0b6c5f 100644 --- a/src/backend/malformed_policy_exception.hh +++ b/src/backend/sgpemv2/malformed_policy_exception.hh @@ -27,7 +27,7 @@ #include "config.h" -#include "cpu_policy_exception.hh" +#include namespace sgpem { diff --git a/src/backend/module.hh b/src/backend/sgpemv2/module.hh similarity index 97% rename from src/backend/module.hh rename to src/backend/sgpemv2/module.hh index 7a844c3..77c509e 100644 --- a/src/backend/module.hh +++ b/src/backend/sgpemv2/module.hh @@ -23,7 +23,7 @@ #include "config.h" -#include "invalid_plugin_exception.hh" +#include #include #include diff --git a/src/backend/null_policy_exception.hh b/src/backend/sgpemv2/null_policy_exception.hh similarity index 100% rename from src/backend/null_policy_exception.hh rename to src/backend/sgpemv2/null_policy_exception.hh diff --git a/src/backend/plugin.hh b/src/backend/sgpemv2/plugin.hh similarity index 100% rename from src/backend/plugin.hh rename to src/backend/sgpemv2/plugin.hh diff --git a/src/backend/plugin_manager.hh b/src/backend/sgpemv2/plugin_manager.hh similarity index 97% rename from src/backend/plugin_manager.hh rename to src/backend/sgpemv2/plugin_manager.hh index 5011f00..7a0b7ef 100644 --- a/src/backend/plugin_manager.hh +++ b/src/backend/sgpemv2/plugin_manager.hh @@ -28,7 +28,7 @@ namespace sgpem #include "config.h" -#include "singleton.hh" +#include #include diff --git a/src/backend/policy_parameters.hh b/src/backend/sgpemv2/policy_parameters.hh similarity index 79% rename from src/backend/policy_parameters.hh rename to src/backend/sgpemv2/policy_parameters.hh index 45c5994..c5259d4 100644 --- a/src/backend/policy_parameters.hh +++ b/src/backend/sgpemv2/policy_parameters.hh @@ -30,11 +30,13 @@ namespace sgpem { + class SG_DLLEXPORT PolicyParametersException : public std::runtime_error { public: - PolicyParametersException(char* msg): std::runtime_error(msg) {}}; - class PolicyParameters; + PolicyParametersException(char* msg): std::runtime_error(msg) {} + }; + /** \brief Represents all configurable parameters of a single scheduling policy. @@ -46,8 +48,72 @@ namespace sgpem class SG_DLLEXPORT PolicyParameters { public: + + // ------------------------------------------------------------------------- + + /** \brief This class represents a sigle parameter of type \c T + + This class is useful only to store informations about each parameter. No checks + on the values entered are done. + */ template - class Parameter; + class SG_DLLEXPORT Parameter + { + public: + + /** \brief Constructs the parameter + \param name The name of the parameter. This string will be used to refer to this parameter, thus it MUST + be uniqe (one string identifies \b only ONE parameter) + \param value The initial value of this parameter + \param lower_bound The lower limitation of the value which can be set with set_int(...). + \param upper_bound The upper limitation of the value which can be set with set_int(...). + \param required Denotes if this parameter is required by the policy. + \param default_value The initial value of this parameter. (If not specified it's set to 0). + */ + Parameter(Glib::ustring name, const T& value, + const T& lower_bound, const T& upper_bound, + const bool& required, const T& default_value = 0); + + /** \returns The name of the parameter (its UNIQUE key) + */ + Glib::ustring get_name() const; + + /** \returns The lower bound + */ + T get_lower_bound() const; + + /** \returns The upper bound + */ + T get_upper_bound() const; + + /** \returns TRUE if this parameter is required + */ + bool is_required() const; + + /** \returns Its default value + */ + T get_default() const; + + /** \returns Its actual value + */ + T get_value() const; + + /** \brief Changes the value of the parameter. + \warning NO CHECK is done whether the value repects its bounds!! + */ + void set_value(const T&); + + private: + Glib::ustring _name; + T _value; + T _lower_bound; + T _upper_bound; + bool _is_required; + T _default; + }; + + + // ------------------------------------------------------------------ //####################################### //########## methods to CREATE PARAMETERS @@ -185,69 +251,6 @@ namespace sgpem std::map > string_map; }; - - /** \brief This class represents a sigle parameter of type \c T - - This class is useful only to store informations about each parameter. No checks - on the values entered are done. - */ - template - class PolicyParameters::Parameter - { - public: - - /** \brief Constructs the parameter - \param name The name of the parameter. This string will be used to refer to this parameter, thus it MUST - be uniqe (one string identifies \b only ONE parameter) - \param value The initial value of this parameter - \param lower_bound The lower limitation of the value which can be set with set_int(...). - \param upper_bound The upper limitation of the value which can be set with set_int(...). - \param required Denotes if this parameter is required by the policy. - \param default_value The initial value of this parameter. (If not specified it's set to 0). - */ - Parameter(Glib::ustring name, const T& value, const T& lower_bound, const T& upper_bound, const bool& required, const T& default_value = 0); - - /** \returns The name of the parameter (its UNIQUE key) - */ - Glib::ustring get_name() const; - - /** \returns The lower bound - */ - T get_lower_bound() const; - - /** \returns The upper bound - */ - T get_upper_bound() const; - - /** \returns TRUE if this parameter is required - */ - bool is_required() const; - - /** \returns Its default value - */ - T get_default() const; - - /** \returns Its actual value - */ - T get_value() const; - - /** \brief Changes the value of the parameter. - \warning NO CHECK is done whether the value repects its bounds!! - */ - void set_value(const T&); - - private: - Glib::ustring _name; - T _value; - T _lower_bound; - T _upper_bound; - bool _is_required; - T _default; - }; - - }//~ namespace sgpem -#include "../templates/parameter.tcc" - #endif diff --git a/src/backend/process.hh b/src/backend/sgpemv2/process.hh similarity index 97% rename from src/backend/process.hh rename to src/backend/sgpemv2/process.hh index be4faa2..f7c67dd 100644 --- a/src/backend/process.hh +++ b/src/backend/sgpemv2/process.hh @@ -25,7 +25,7 @@ #include "glibmm/ustring.h" #include -#include "schedulable.hh" +#include namespace sgpem { diff --git a/src/backend/ready_queue.hh b/src/backend/sgpemv2/ready_queue.hh similarity index 100% rename from src/backend/ready_queue.hh rename to src/backend/sgpemv2/ready_queue.hh diff --git a/src/backend/request.hh b/src/backend/sgpemv2/request.hh similarity index 100% rename from src/backend/request.hh rename to src/backend/sgpemv2/request.hh diff --git a/src/backend/resource.hh b/src/backend/sgpemv2/resource.hh similarity index 100% rename from src/backend/resource.hh rename to src/backend/sgpemv2/resource.hh diff --git a/src/backend/resource_policies_gatekeeper.hh b/src/backend/sgpemv2/resource_policies_gatekeeper.hh similarity index 98% rename from src/backend/resource_policies_gatekeeper.hh rename to src/backend/sgpemv2/resource_policies_gatekeeper.hh index e70bc4d..8f61f39 100644 --- a/src/backend/resource_policies_gatekeeper.hh +++ b/src/backend/sgpemv2/resource_policies_gatekeeper.hh @@ -34,7 +34,7 @@ namespace sgpem #include #include -#include "singleton.hh" +#include namespace sgpem { diff --git a/src/backend/resource_policy.hh b/src/backend/sgpemv2/resource_policy.hh similarity index 94% rename from src/backend/resource_policy.hh rename to src/backend/sgpemv2/resource_policy.hh index 9e436b0..985d2c4 100644 --- a/src/backend/resource_policy.hh +++ b/src/backend/sgpemv2/resource_policy.hh @@ -26,10 +26,10 @@ #include "glibmm/ustring.h" -#include "policy_parameters.hh" -#include "user_interrupt_exception.hh" -#include "environment.hh" -#include "sub_request.hh" +#include +#include +#include +#include namespace sgpem { diff --git a/src/backend/resource_policy_lifo.hh b/src/backend/sgpemv2/resource_policy_lifo.hh similarity index 95% rename from src/backend/resource_policy_lifo.hh rename to src/backend/sgpemv2/resource_policy_lifo.hh index e181bf4..e2de132 100644 --- a/src/backend/resource_policy_lifo.hh +++ b/src/backend/sgpemv2/resource_policy_lifo.hh @@ -26,10 +26,10 @@ #include "glibmm/ustring.h" -#include "resource_policy.hh" +#include -#include "policy_parameters.hh" -#include "user_interrupt_exception.hh" +#include +#include namespace sgpem { diff --git a/src/backend/resource_policy_manager.hh b/src/backend/sgpemv2/resource_policy_manager.hh similarity index 100% rename from src/backend/resource_policy_manager.hh rename to src/backend/sgpemv2/resource_policy_manager.hh diff --git a/src/backend/schedulable.hh b/src/backend/sgpemv2/schedulable.hh similarity index 100% rename from src/backend/schedulable.hh rename to src/backend/sgpemv2/schedulable.hh diff --git a/src/backend/scheduler.hh b/src/backend/sgpemv2/scheduler.hh similarity index 92% rename from src/backend/scheduler.hh rename to src/backend/sgpemv2/scheduler.hh index a92e639..d880ad6 100644 --- a/src/backend/scheduler.hh +++ b/src/backend/sgpemv2/scheduler.hh @@ -28,15 +28,15 @@ namespace sgpem #include "config.h" -#include "history.hh" -#include "cpu_policy.hh" -#include "resource_policy.hh" -#include "ready_queue.hh" -#include "user_interrupt_exception.hh" -#include "malformed_policy_exception.hh" +#include +#include +#include +#include +#include +#include // Do not include full template definition here -#include "singleton.hh" +#include #include diff --git a/src/backend/serialize_visitor.hh b/src/backend/sgpemv2/serialize_visitor.hh similarity index 98% rename from src/backend/serialize_visitor.hh rename to src/backend/sgpemv2/serialize_visitor.hh index 20c32a2..4e1776c 100644 --- a/src/backend/serialize_visitor.hh +++ b/src/backend/sgpemv2/serialize_visitor.hh @@ -34,7 +34,7 @@ namespace sgpem #include "config.h" -#include "serializer_error.hh" +#include #include diff --git a/src/backend/serializer.hh b/src/backend/sgpemv2/serializer.hh similarity index 95% rename from src/backend/serializer.hh rename to src/backend/sgpemv2/serializer.hh index 3605687..4bf0bc2 100644 --- a/src/backend/serializer.hh +++ b/src/backend/sgpemv2/serializer.hh @@ -22,8 +22,8 @@ #define SERIALIZER_HH 1 #include "config.h" -#include "history.hh" -#include "serializer_error.hh" +#include +#include #include diff --git a/src/backend/serializer_error.hh b/src/backend/sgpemv2/serializer_error.hh similarity index 100% rename from src/backend/serializer_error.hh rename to src/backend/sgpemv2/serializer_error.hh diff --git a/src/backend/serializers_gatekeeper.hh b/src/backend/sgpemv2/serializers_gatekeeper.hh similarity index 97% rename from src/backend/serializers_gatekeeper.hh rename to src/backend/sgpemv2/serializers_gatekeeper.hh index b98b15f..1673f58 100644 --- a/src/backend/serializers_gatekeeper.hh +++ b/src/backend/sgpemv2/serializers_gatekeeper.hh @@ -30,7 +30,7 @@ namespace sgpem #include -#include "singleton.hh" +#include namespace sgpem { diff --git a/src/backend/simulation.hh b/src/backend/sgpemv2/simulation.hh similarity index 95% rename from src/backend/simulation.hh rename to src/backend/sgpemv2/simulation.hh index 37cb724..9875f66 100644 --- a/src/backend/simulation.hh +++ b/src/backend/sgpemv2/simulation.hh @@ -30,12 +30,12 @@ namespace sgpem } #include "config.h" -#include "history.hh" -#include "singleton.hh" -#include "cpu_policy_exception.hh" -#include "user_interrupt_exception.hh" -#include "null_policy_exception.hh" -#include "malformed_policy_exception.hh" +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/backend/simulation_observer.hh b/src/backend/sgpemv2/simulation_observer.hh similarity index 100% rename from src/backend/simulation_observer.hh rename to src/backend/sgpemv2/simulation_observer.hh diff --git a/src/backend/string_utils.hh b/src/backend/sgpemv2/string_utils.hh similarity index 100% rename from src/backend/string_utils.hh rename to src/backend/sgpemv2/string_utils.hh diff --git a/src/backend/sub_request.hh b/src/backend/sgpemv2/sub_request.hh similarity index 98% rename from src/backend/sub_request.hh rename to src/backend/sgpemv2/sub_request.hh index bfbb9c0..8360a79 100644 --- a/src/backend/sub_request.hh +++ b/src/backend/sgpemv2/sub_request.hh @@ -23,7 +23,7 @@ #include "config.h" -#include "request.hh" +#include namespace sgpem { diff --git a/src/templates/deletor.tcc b/src/backend/sgpemv2/templates/deletor.tcc similarity index 100% rename from src/templates/deletor.tcc rename to src/backend/sgpemv2/templates/deletor.tcc diff --git a/src/templates/parameter.tcc b/src/backend/sgpemv2/templates/parameter.tcc similarity index 79% rename from src/templates/parameter.tcc rename to src/backend/sgpemv2/templates/parameter.tcc index 56f05d9..a335972 100644 --- a/src/templates/parameter.tcc +++ b/src/backend/sgpemv2/templates/parameter.tcc @@ -19,17 +19,20 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef PARAMETERS_HH -#define PARAMETERS_HH 1 +#ifndef PARAMETER_TCC +#define PARAMETER_TCC 1 -#include "../backend/policy_parameters.hh" +#include using namespace sgpem; template -PolicyParameters::Parameter::Parameter(Glib::ustring name, const T& value, const T& lower_bound, const T& upper_bound, const bool& required, const T& default_value) - : _name(name), _value(value), _lower_bound(lower_bound), _upper_bound(upper_bound), _is_required(required), _default(default_value) +PolicyParameters::Parameter::Parameter(Glib::ustring name, const T& value, + const T& lower_bound, const T& upper_bound, + const bool& required, const T& default_value) + : _name(name), _value(value), _lower_bound(lower_bound), + _upper_bound(upper_bound), _is_required(required), _default(default_value) {} template @@ -82,8 +85,4 @@ PolicyParameters::Parameter::set_value(const T& val) _value = val; } - - - - -#endif +#endif //~ PARAMETER_TCC diff --git a/src/templates/sequences.tcc b/src/backend/sgpemv2/templates/sequences.tcc similarity index 100% rename from src/templates/sequences.tcc rename to src/backend/sgpemv2/templates/sequences.tcc diff --git a/src/templates/singleton.hh b/src/backend/sgpemv2/templates/singleton.hh similarity index 100% rename from src/templates/singleton.hh rename to src/backend/sgpemv2/templates/singleton.hh diff --git a/src/templates/singleton.tcc b/src/backend/sgpemv2/templates/singleton.tcc similarity index 97% rename from src/templates/singleton.tcc rename to src/backend/sgpemv2/templates/singleton.tcc index 44386e8..ca22255 100644 --- a/src/templates/singleton.tcc +++ b/src/backend/sgpemv2/templates/singleton.tcc @@ -19,7 +19,7 @@ #ifndef SINGLETON_TCC #define SINGLETON_TCC 1 -#include "singleton.hh" +#include template Instantiated_class* diff --git a/src/templates/smartp.hh b/src/backend/sgpemv2/templates/smartp.hh similarity index 100% rename from src/templates/smartp.hh rename to src/backend/sgpemv2/templates/smartp.hh diff --git a/src/templates/smartp.tcc b/src/backend/sgpemv2/templates/smartp.tcc similarity index 99% rename from src/templates/smartp.tcc rename to src/backend/sgpemv2/templates/smartp.tcc index 7abfa9b..17c358b 100644 --- a/src/templates/smartp.tcc +++ b/src/backend/sgpemv2/templates/smartp.tcc @@ -17,7 +17,7 @@ #ifndef SMARTP_TCC #define SMARTP_TCC 1 -#include "smartp.hh" +#include namespace memory { diff --git a/src/backend/thread.hh b/src/backend/sgpemv2/thread.hh similarity index 97% rename from src/backend/thread.hh rename to src/backend/sgpemv2/thread.hh index d5410ab..ec383be 100644 --- a/src/backend/thread.hh +++ b/src/backend/sgpemv2/thread.hh @@ -24,7 +24,7 @@ #include "config.h" #include -#include "schedulable.hh" +#include namespace sgpem { diff --git a/src/backend/user_interrupt_exception.hh b/src/backend/sgpemv2/user_interrupt_exception.hh similarity index 97% rename from src/backend/user_interrupt_exception.hh rename to src/backend/sgpemv2/user_interrupt_exception.hh index b0c5256..7d15a8d 100644 --- a/src/backend/user_interrupt_exception.hh +++ b/src/backend/sgpemv2/user_interrupt_exception.hh @@ -26,7 +26,7 @@ #define USER_INTERRUPT_EXCEPTION 1 #include "config.h" -#include "cpu_policy_exception.hh" +#include #include diff --git a/src/backend/simulation.cc b/src/backend/simulation.cc index 7a76d5a..8b420ca 100644 --- a/src/backend/simulation.cc +++ b/src/backend/simulation.cc @@ -20,15 +20,15 @@ #include "config.h" -#include "simulation.hh" -#include "simulation_observer.hh" +#include +#include #include "concrete_simulation.hh" #include #include // Do not include in header file: -#include "singleton.tcc" +#include using namespace sgpem; diff --git a/src/backend/simulation_observer.cc b/src/backend/simulation_observer.cc index b12ef8c..fd7f116 100644 --- a/src/backend/simulation_observer.cc +++ b/src/backend/simulation_observer.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "simulation_observer.hh" +#include sgpem::SimulationObserver::~SimulationObserver() {} diff --git a/src/backend/static_sub_request.hh b/src/backend/static_sub_request.hh index 5a85e3d..c91a3b4 100644 --- a/src/backend/static_sub_request.hh +++ b/src/backend/static_sub_request.hh @@ -23,7 +23,7 @@ #include "config.h" -#include "sub_request.hh" +#include namespace sgpem { diff --git a/src/backend/string_utils.cc b/src/backend/string_utils.cc index 53b78cb..e52a7f7 100644 --- a/src/backend/string_utils.cc +++ b/src/backend/string_utils.cc @@ -18,8 +18,10 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "string_utils.hh" #include "gettext.h" + +#include + #include using namespace std; diff --git a/src/backend/sub_request.cc b/src/backend/sub_request.cc index a87cc56..993fa0e 100644 --- a/src/backend/sub_request.cc +++ b/src/backend/sub_request.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "sub_request.hh" +#include using namespace sgpem; diff --git a/src/backend/thread.cc b/src/backend/thread.cc index 2de5d88..4b64a7e 100644 --- a/src/backend/thread.cc +++ b/src/backend/thread.cc @@ -18,7 +18,7 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "thread.hh" +#include using namespace sgpem; diff --git a/src/backend/user_interrupt_exception.cc b/src/backend/user_interrupt_exception.cc index 7bfeed1..4b526c3 100644 --- a/src/backend/user_interrupt_exception.cc +++ b/src/backend/user_interrupt_exception.cc @@ -22,7 +22,7 @@ // It could be necessary to do dynamic type-checking when // catching it (with typeinfo). -#include "user_interrupt_exception.hh" +#include using namespace sgpem; UserInterruptException::UserInterruptException(const char* msg) diff --git a/src/cairo_elements.hh b/src/cairo_elements.hh index d934b17..9ab4c00 100644 --- a/src/cairo_elements.hh +++ b/src/cairo_elements.hh @@ -23,8 +23,8 @@ #include "config.h" -#include "backend/thread.hh" -#include "backend/process.hh" +#include +#include #include diff --git a/src/configure_policy_dialog.cc b/src/configure_policy_dialog.cc index 80a4150..af716c1 100644 --- a/src/configure_policy_dialog.cc +++ b/src/configure_policy_dialog.cc @@ -20,7 +20,7 @@ #include "gettext.h" -#include "sequences.tcc" +#include #include "configure_policy_dialog.hh" diff --git a/src/configure_policy_dialog.hh b/src/configure_policy_dialog.hh index 7233441..decf7b4 100644 --- a/src/configure_policy_dialog.hh +++ b/src/configure_policy_dialog.hh @@ -21,7 +21,7 @@ #ifndef CONFIGURE_POLICY_DIALOG_HH #define CONFIGURE_POLICY_DIALOG_HH 1 -#include "backend/policy_parameters.hh" +#include #include #include diff --git a/src/graphical_preferences_editor.cc b/src/graphical_preferences_editor.cc index ba5b144..7919197 100644 --- a/src/graphical_preferences_editor.cc +++ b/src/graphical_preferences_editor.cc @@ -22,18 +22,19 @@ #include "gettext.h" #include "graphical_preferences_editor.hh" -#include "backend/cpu_policy_manager.hh" -#include "backend/cpu_policies_gatekeeper.hh" -#include "backend/cpu_policy.hh" -#include "backend/module.hh" -#include "backend/plugin_manager.hh" +#include +#include +#include +#include +#include #include #include -// FIXME: remove include -#include +#ifndef NDEBUG +#include +#endif using namespace sgpem; using Gnome::Glade::Xml; diff --git a/src/graphical_preferences_editor.hh b/src/graphical_preferences_editor.hh index 9346bd9..b98ccd6 100644 --- a/src/graphical_preferences_editor.hh +++ b/src/graphical_preferences_editor.hh @@ -24,7 +24,7 @@ #include "config.h" -#include "backend/global_preferences.hh" +#include #include #include diff --git a/src/gui_builder.cc b/src/gui_builder.cc index 3579892..b9d29fb 100644 --- a/src/gui_builder.cc +++ b/src/gui_builder.cc @@ -32,19 +32,19 @@ #include "simulation_widget.hh" #include "resources_widget.hh" -#include "sequences.tcc" +#include -#include "backend/cpu_policy_exception.hh" -#include "backend/null_policy_exception.hh" -#include "backend/cpu_policies_gatekeeper.hh" -#include "backend/cpu_policy_manager.hh" -#include "backend/resource_policies_gatekeeper.hh" -#include "backend/resource_policy_manager.hh" -#include "backend/history.hh" -#include "backend/policy_parameters.hh" -#include "backend/simulation.hh" -#include "backend/serializers_gatekeeper.hh" -#include "backend/serializer.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui_builder.hh b/src/gui_builder.hh index 2ea43a5..68ac2a7 100644 --- a/src/gui_builder.hh +++ b/src/gui_builder.hh @@ -25,8 +25,8 @@ #include "holt_container_window.hh" #include "simulation_widget.hh" -#include "backend/cpu_policy.hh" -#include "backend/resource_policy.hh" +#include +#include #include "simulation_controller.hh" diff --git a/src/holt_container_window.hh b/src/holt_container_window.hh index 695b4df..68fbe04 100644 --- a/src/holt_container_window.hh +++ b/src/holt_container_window.hh @@ -29,7 +29,7 @@ #include #include -#include "backend/simulation.hh" +#include #include "cairo_widget.hh" #include "holt_widget.hh" diff --git a/src/holt_widget.cc b/src/holt_widget.cc index 5b766b6..2a44cb7 100644 --- a/src/holt_widget.cc +++ b/src/holt_widget.cc @@ -20,16 +20,18 @@ #include "cairo_elements.hh" -#include "backend/history.hh" -#include "backend/schedulable.hh" -#include "backend/resource.hh" -#include "backend/simulation.hh" -#include "backend/string_utils.hh" -#include "backend/thread.hh" + +#include +#include +#include +#include +#include +#include + #include "holt_widget.hh" -#include "deletor.tcc" -#include "sequences.tcc" +#include +#include #include diff --git a/src/holt_widget.hh b/src/holt_widget.hh index b6ed5ff..957f7d7 100644 --- a/src/holt_widget.hh +++ b/src/holt_widget.hh @@ -24,9 +24,9 @@ #include "config.h" #include "cairo_widget.hh" -#include "backend/history_observer.hh" -#include "backend/request.hh" -#include "backend/simulation_observer.hh" +#include +#include +#include #include diff --git a/src/parse_opts.cc b/src/parse_opts.cc index 062701b..dcfa7a8 100644 --- a/src/parse_opts.cc +++ b/src/parse_opts.cc @@ -21,11 +21,12 @@ #include "config.h" #include "gettext.h" -#include "backend/global_preferences.hh" -#include "backend/plugin_manager.hh" -#include "backend/cpu_policy_manager.hh" -#include "backend/cpu_policies_gatekeeper.hh" -#include "backend/module.hh" +#include +#include +#include +#include +#include + #include "text_simulation.hh" #include "gui_builder.hh" #include "parse_opts.hh" diff --git a/src/ready_queue_widget.cc b/src/ready_queue_widget.cc index 9f5a1ce..5220b79 100644 --- a/src/ready_queue_widget.cc +++ b/src/ready_queue_widget.cc @@ -22,10 +22,10 @@ #include "ready_queue_widget.hh" -#include "backend/history.hh" -#include "backend/environment.hh" -#include "backend/ready_queue.hh" -#include "backend/thread.hh" +#include +#include +#include +#include #include #include diff --git a/src/ready_queue_widget.hh b/src/ready_queue_widget.hh index b911836..dff8eb1 100644 --- a/src/ready_queue_widget.hh +++ b/src/ready_queue_widget.hh @@ -25,7 +25,7 @@ #include -#include "backend/history_observer.hh" +#include namespace sgpem { diff --git a/src/resources_widget.cc b/src/resources_widget.cc index cd10bfa..fd95196 100644 --- a/src/resources_widget.cc +++ b/src/resources_widget.cc @@ -19,14 +19,16 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "resources_widget.hh" -#include "templates/sequences.tcc" -#include "backend/history.hh" -#include "backend/simulation.hh" -#include "backend/resource.hh" -#include "backend/process.hh" -#include "backend/thread.hh" -#include "backend/request.hh" -#include "backend/global_preferences.hh" + +#include + +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/resources_widget.hh b/src/resources_widget.hh index 5450998..a6b7485 100644 --- a/src/resources_widget.hh +++ b/src/resources_widget.hh @@ -36,7 +36,7 @@ namespace sgpem #include #include -#include "backend/history_observer.hh" +#include namespace sgpem { diff --git a/src/schedulable_state_widget.cc b/src/schedulable_state_widget.cc index a73384c..3ab5ac8 100644 --- a/src/schedulable_state_widget.cc +++ b/src/schedulable_state_widget.cc @@ -22,7 +22,7 @@ #include "schedulable_state_widget.hh" -#include "smartp.tcc" +#include #include diff --git a/src/schedulable_state_widget.hh b/src/schedulable_state_widget.hh index 3e4dcdb..4c77678 100644 --- a/src/schedulable_state_widget.hh +++ b/src/schedulable_state_widget.hh @@ -23,11 +23,11 @@ #include "config.h" -#include "backend/schedulable.hh" +#include #include "cairo_elements.hh" #include "cairo_widget.hh" -#include "smartp.tcc" +#include #include "gtkmm/tooltips.h" diff --git a/src/schedulables_tree_widget.cc b/src/schedulables_tree_widget.cc index f793dbb..04cf974 100644 --- a/src/schedulables_tree_widget.cc +++ b/src/schedulables_tree_widget.cc @@ -21,15 +21,15 @@ #include "gettext.h" #include "schedulables_tree_widget.hh" -#include "backend/history.hh" -#include "backend/simulation.hh" -#include "backend/process.hh" -#include "backend/thread.hh" -#include "backend/resource.hh" -#include "backend/global_preferences.hh" +#include +#include +#include +#include +#include +#include #include "add_request_dialog.hh" -#include "sequences.tcc" +#include #include #include diff --git a/src/schedulables_tree_widget.hh b/src/schedulables_tree_widget.hh index aae1898..d4c926d 100644 --- a/src/schedulables_tree_widget.hh +++ b/src/schedulables_tree_widget.hh @@ -40,7 +40,7 @@ namespace sgpem #include #include -#include "backend/history_observer.hh" +#include #include diff --git a/src/simulation_controller.cc b/src/simulation_controller.cc index 10bb911..3b612bb 100644 --- a/src/simulation_controller.cc +++ b/src/simulation_controller.cc @@ -22,13 +22,13 @@ #include "simulation_controller.hh" -#include "backend/cpu_policy_exception.hh" -#include "backend/malformed_policy_exception.hh" -#include "backend/null_policy_exception.hh" -#include "backend/user_interrupt_exception.hh" +#include +#include +#include +#include -#include "backend/global_preferences.hh" -#include "backend/simulation.hh" +#include +#include #include #include diff --git a/src/simulation_controller.hh b/src/simulation_controller.hh index 81c0b6d..5847c22 100644 --- a/src/simulation_controller.hh +++ b/src/simulation_controller.hh @@ -23,7 +23,7 @@ #include "config.h" -#include "backend/simulation_observer.hh" +#include #include #include diff --git a/src/simulation_widget.cc b/src/simulation_widget.cc index d91b4d6..8f700ca 100644 --- a/src/simulation_widget.cc +++ b/src/simulation_widget.cc @@ -23,9 +23,10 @@ #include "simulation_widget.hh" #include "cairo_elements.hh" -#include "backend/history.hh" -#include "backend/simulation.hh" -#include "backend/string_utils.hh" + +#include +#include +#include #include diff --git a/src/simulation_widget.hh b/src/simulation_widget.hh index c38e926..a7f127d 100644 --- a/src/simulation_widget.hh +++ b/src/simulation_widget.hh @@ -24,9 +24,9 @@ #include "config.h" #include "cairo_widget.hh" -#include "backend/history_observer.hh" -#include "backend/schedulable.hh" -#include "backend/simulation_observer.hh" +#include +#include +#include namespace sgpem { diff --git a/src/testsuite/stubs/history.cc b/src/testsuite/stubs/history.cc index 7e1f84a..583fc61 100644 --- a/src/testsuite/stubs/history.cc +++ b/src/testsuite/stubs/history.cc @@ -19,7 +19,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "history.hh" +#include using namespace sgpem; diff --git a/src/testsuite/stubs/history.hh b/src/testsuite/stubs/history.hh index bc9779c..c91f3d9 100644 --- a/src/testsuite/stubs/history.hh +++ b/src/testsuite/stubs/history.hh @@ -24,7 +24,7 @@ #include "backend/observed_subject.hh" #include "backend/slice.hh" -#include "backend/ready_queue.hh" +#include #include "templates/smartp.tcc" #include @@ -42,7 +42,7 @@ #include "backend/dynamic_schedulable.hh" -#include "backend/user_interrupt_exception.hh" +#include #include "backend/policy.hh" #include "prrpolicy.cc" diff --git a/src/testsuite/stubs/policy_manager.hh b/src/testsuite/stubs/policy_manager.hh index 8c4060a..ba28375 100644 --- a/src/testsuite/stubs/policy_manager.hh +++ b/src/testsuite/stubs/policy_manager.hh @@ -33,10 +33,10 @@ #include #include "backend/static_process.hh" #include "backend/observed_subject.hh" -#include "backend/ready_queue.hh" +#include #include "backend/dynamic_schedulable.hh" #include "templates/smartp.tcc" -#include "backend/user_interrupt_exception.hh" +#include #include "backend/policy.hh" #include "backend/slice.hh" #include "prrpolicy.cc" diff --git a/src/testsuite/stubs/prrpolicy.hh b/src/testsuite/stubs/prrpolicy.hh index 3f718a9..424def4 100644 --- a/src/testsuite/stubs/prrpolicy.hh +++ b/src/testsuite/stubs/prrpolicy.hh @@ -22,9 +22,9 @@ #define PRRPOLICY_HH 1 #include "backend/policy.hh" -#include "backend/user_interrupt_exception.hh" -#include "backend/ready_queue.hh" -#include "backend/scheduler.hh" +#include +#include +#include #include "glibmm/ustring.h" /* @@ -39,7 +39,7 @@ #include "backend/dynamic_schedulable.hh" #include "templates/smartp.tcc" -#include "backend/user_interrupt_exception.hh" +#include #include "backend/slice.hh" diff --git a/src/testsuite/test-global_preferences_serialization.cc b/src/testsuite/test-global_preferences_serialization.cc index ac57cee..515de71 100644 --- a/src/testsuite/test-global_preferences_serialization.cc +++ b/src/testsuite/test-global_preferences_serialization.cc @@ -23,7 +23,7 @@ #include "config.h" #include "glibmm/ustring.h" -#include "backend/global_preferences.hh" +#include #include #include diff --git a/src/testsuite/test-history.cc b/src/testsuite/test-history.cc index e7bb36d..caf3060 100644 --- a/src/testsuite/test-history.cc +++ b/src/testsuite/test-history.cc @@ -29,9 +29,9 @@ #include #include -#include "backend/concrete_environment.hh" -#include "backend/concrete_history.hh" -#include "backend/history_observer.hh" +#include "concrete_environment.hh" +#include "concrete_history.hh" +#include using namespace sgpem; using namespace std; diff --git a/src/testsuite/test-holt_widget.cc b/src/testsuite/test-holt_widget.cc index 40350c2..bb266b2 100644 --- a/src/testsuite/test-holt_widget.cc +++ b/src/testsuite/test-holt_widget.cc @@ -39,20 +39,20 @@ #include #include -#include "backend/cpu_policies_gatekeeper.hh" -#include "backend/cpu_policy.hh" -#include "backend/cpu_policy_manager.hh" -#include "backend/resource_policies_gatekeeper.hh" -#include "backend/resource_policy.hh" -#include "backend/resource_policy_manager.hh" +#include +#include +#include +#include +#include +#include -#include "backend/history_observer.hh" -#include "backend/scheduler.hh" -#include "backend/simulation.hh" -#include "backend/simulation_observer.hh" -#include "backend/process.hh" -#include "backend/resource.hh" -#include "backend/thread.hh" +#include +#include +#include +#include +#include +#include +#include #include "cairo_elements.hh" #include "cairo_widget.hh" #include "holt_container_window.hh" diff --git a/src/testsuite/test-key_file.cc b/src/testsuite/test-key_file.cc index a2af170..3a1e75d 100644 --- a/src/testsuite/test-key_file.cc +++ b/src/testsuite/test-key_file.cc @@ -23,7 +23,7 @@ #include "config.h" #include "glibmm/ustring.h" -#include "backend/key_file.hh" +#include #include diff --git a/src/testsuite/test-parse_command.cc b/src/testsuite/test-parse_command.cc index 546d7c6..e9c5064 100644 --- a/src/testsuite/test-parse_command.cc +++ b/src/testsuite/test-parse_command.cc @@ -38,10 +38,10 @@ #include "backend/static_process.hh" #include "backend/slice.hh" #include "backend/observed_subject.hh" -#include "backend/ready_queue.hh" +#include #include "backend/dynamic_schedulable.hh" -#include "smartp.tcc" +#include namespace sgpem { diff --git a/src/testsuite/test-simulation_widget.cc b/src/testsuite/test-simulation_widget.cc index 624227d..6667590 100644 --- a/src/testsuite/test-simulation_widget.cc +++ b/src/testsuite/test-simulation_widget.cc @@ -38,19 +38,19 @@ #include #include -#include "backend/cpu_policies_gatekeeper.hh" -#include "backend/cpu_policy.hh" -#include "backend/cpu_policy_manager.hh" -#include "backend/resource_policies_gatekeeper.hh" -#include "backend/resource_policy.hh" -#include "backend/resource_policy_manager.hh" -#include "backend/history_observer.hh" -#include "backend/scheduler.hh" -#include "backend/simulation.hh" -#include "backend/simulation_observer.hh" -#include "backend/process.hh" -#include "backend/resource.hh" -#include "backend/thread.hh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "cairo_elements.hh" #include "cairo_widget.hh" #include "simulation_widget.hh" diff --git a/src/testsuite/test-stepforward.cc b/src/testsuite/test-stepforward.cc index 87b4c60..0a66c2c 100644 --- a/src/testsuite/test-stepforward.cc +++ b/src/testsuite/test-stepforward.cc @@ -33,13 +33,13 @@ #include #include "backend/static_process.hh" #include "backend/observed_subject.hh" -#include "backend/ready_queue.hh" +#include #include "backend/dynamic_schedulable.hh" -#include "scheduler.hh" -#include "user_interrupt_exception.hh" +#include +#include -#include "smartp.tcc" +#include #include diff --git a/src/text_simulation.cc b/src/text_simulation.cc index 808c2c9..ac1878a 100644 --- a/src/text_simulation.cc +++ b/src/text_simulation.cc @@ -18,23 +18,25 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "backend/global_preferences.hh" -#include "backend/string_utils.hh" -#include "backend/cpu_policies_gatekeeper.hh" -#include "backend/cpu_policy_manager.hh" -#include "backend/policy_parameters.hh" -#include "backend/history.hh" -#include "backend/simulation.hh" -#include "backend/serializers_gatekeeper.hh" -#include "backend/serializer.hh" -#include "backend/process.hh" -#include "backend/resource.hh" -#include "backend/resource_policies_gatekeeper.hh" -#include "backend/resource_policy_manager.hh" -#include "backend/thread.hh" -#include "backend/request.hh" -#include "backend/sub_request.hh" -#include "backend/ready_queue.hh" +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "text_simulation.hh" @@ -48,11 +50,10 @@ using namespace std; using namespace sgpem; -using namespace memory; using Glib::Thread; using Glib::ustring; -#include "smartp.tcc" +#include namespace sgpem { diff --git a/src/text_simulation.hh b/src/text_simulation.hh index 4472102..dccda7e 100644 --- a/src/text_simulation.hh +++ b/src/text_simulation.hh @@ -24,13 +24,9 @@ #include "config.h" #include "gettext.h" -#include "backend/simulation.hh" -#include "templates/smartp.hh" -//#include "backend/policy_parameters.hh" -#include "backend/string_utils.hh" -#include "backend/simulation_observer.hh" - -#include "smartp.hh" +#include +#include +#include #include #include