From dd6085a0a6592b5e2768717e23ad642b8a5ec864 Mon Sep 17 00:00:00 2001 From: elvez Date: Tue, 13 Jun 2006 14:20:05 +0000 Subject: [PATCH] - Renamed Process to StaticProcess git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@627 3ecf2c5c-341e-0410-92b4-d18e462d057c --- Makefile.am | 4 +- src/backend/{process.cc => static_process.cc} | 12 +++--- src/backend/{process.hh => static_process.hh} | 14 +++---- src/main.cc | 14 +++---- src/testsuite/test-history.cc | 42 +++++++++---------- src/testsuite/test-parse_command.cc | 2 +- src/testsuite/test-stepforward.cc | 42 +++++++++---------- 7 files changed, 65 insertions(+), 65 deletions(-) rename src/backend/{process.cc => static_process.cc} (74%) rename src/backend/{process.hh => static_process.hh} (78%) diff --git a/Makefile.am b/Makefile.am index e738d3d..42eb100 100644 --- a/Makefile.am +++ b/Makefile.am @@ -147,7 +147,7 @@ src_backend_libbackend_la_SOURCES = \ src/backend/policy.cc \ src/backend/policy_manager.cc \ src/backend/policy_parameters.cc \ - src/backend/process.cc \ + src/backend/static_process.cc \ src/backend/static_schedulable.cc \ src/backend/schedulable_queue.cc \ src/backend/schedulable_status.cc \ @@ -166,7 +166,7 @@ pkginclude_HEADERS = \ src/backend/policy.hh \ src/backend/policy_manager.hh \ src/backend/policy_parameters.hh \ - src/backend/process.hh \ + src/backend/static_process.hh \ src/backend/static_schedulable.hh \ src/backend/schedulable_queue.hh \ src/backend/schedulable_status.hh \ diff --git a/src/backend/process.cc b/src/backend/static_process.cc similarity index 74% rename from src/backend/process.cc rename to src/backend/static_process.cc index 1969208..5ab9957 100644 --- a/src/backend/process.cc +++ b/src/backend/static_process.cc @@ -1,4 +1,4 @@ -// src/backend/process.cc - Copyright 2005, 2006, University +// src/backend/static_process.cc - Copyright 2005, 2006, University // of Padova, dept. of Pure and Applied // Mathematics // @@ -18,22 +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 "process.hh" +#include "static_process.hh" using namespace sgpem; -Process::Process(const Glib::ustring& name, const unsigned int& arrival, const unsigned int& total, const int& priority) +StaticProcess::StaticProcess(const Glib::ustring& name, const unsigned int& arrival, const unsigned int& total, const int& priority) : StaticSchedulable(name, arrival, total, priority) { } -Process::~Process() +StaticProcess::~StaticProcess() { } Glib::ustring -Process::get_type() const +StaticProcess::get_type() const { - return "Process"; + return "StaticProcess"; } diff --git a/src/backend/process.hh b/src/backend/static_process.hh similarity index 78% rename from src/backend/process.hh rename to src/backend/static_process.hh index b4d8ed2..9afdf0d 100644 --- a/src/backend/process.hh +++ b/src/backend/static_process.hh @@ -1,4 +1,4 @@ -// src/backend/process.hh - Copyright 2005, 2006, University +// src/backend/static_process.hh - Copyright 2005, 2006, University // of Padova, dept. of Pure and Applied // Mathematics // @@ -18,8 +18,8 @@ // along with SGPEMv2; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef PROCESS_HH -#define PROCESS_HH 1 +#ifndef STATIC_PROCESS_HH +#define STATIC_PROCESS_HH 1 #include "config.h" #include "gettext.h" @@ -29,19 +29,19 @@ namespace sgpem { - class Process; + class StaticProcess; /** \brief Represents a program in execution. It IS a Schedulable object. */ - class SG_DLLEXPORT Process : public StaticSchedulable + class SG_DLLEXPORT StaticProcess : public StaticSchedulable { public: /** \brief Creates a new object with the given parameters. */ - Process(const Glib::ustring& name, const unsigned int& arrival, const unsigned int& total, const int& priority); + StaticProcess(const Glib::ustring& name, const unsigned int& arrival, const unsigned int& total, const int& priority); /** \brief Destructor. */ - ~Process(); + ~StaticProcess(); /** \brief Returns a string describing the type of the object. */ Glib::ustring get_type() const; diff --git a/src/main.cc b/src/main.cc index 4e98b60..b4b091c 100644 --- a/src/main.cc +++ b/src/main.cc @@ -31,7 +31,7 @@ #include "backend/schedulable_queue.hh" #include "backend/schedulable_status.hh" #include "backend/slice.hh" -#include "backend/process.hh" +#include "backend/static_process.hh" #include "backend/policy.hh" #include "backend/policy_parameters.hh" #include "backend/global_preferences.hh" @@ -105,12 +105,12 @@ main(int argc, char* argv[]) load_pyloader_plugin(); // Create an INITIAL STATE - Process p1("P1", 0,5,1); - Process p2("P2", 0,5,2); - Process p3("P3", 5,3,3); - Process p4("P4", 6,2,3); - Process p5("P5", 1,2,3); - Process p6("P6", 10,2,1); + StaticProcess p1("P1", 0,5,1); + StaticProcess p2("P2", 0,5,2); + StaticProcess p3("P3", 5,3,3); + StaticProcess p4("P4", 6,2,3); + StaticProcess p5("P5", 1,2,3); + StaticProcess p6("P6", 10,2,1); SchedulableStatus ss1(p1); SchedulableStatus ss2(p2); diff --git a/src/testsuite/test-history.cc b/src/testsuite/test-history.cc index f502f6f..070e8dd 100644 --- a/src/testsuite/test-history.cc +++ b/src/testsuite/test-history.cc @@ -32,7 +32,7 @@ #include #include #include "backend/history.hh" -#include "backend/process.hh" +#include "backend/static_process.hh" #include "backend/slice.hh" #include "backend/observed_subject.hh" #include "backend/schedulable_queue.hh" @@ -191,26 +191,26 @@ main(int argc, char** argv) command = argv[1]; // sets up the test data - Process p1("P1", 1,5,1); - Process p2("P2", 5,55,2); - Process p3("P3", 36,30,3); - Process p4("P4", 4,26,3); - Process p5("P5", 15,200,3); - Process p6("P6", 6,250,1); - Process p7("P7", 8,42,15); - Process p8("P8", 8,56,1); - Process p9("P9", 9,42,1); - Process p10("PA", 12,42,1); - Process p11("PB", 106,42,1); - Process p12("PC", 100,42,1); - Process p13("PD", 29,42,18); - Process p14("PE", 0,42,1); - Process p15("PF", 2,88,1); - Process p16("PG", 3666,9,1); - Process p17("PH", 5,72,10); - Process p18("PJ", 6,26,1); - Process p19("PK", 10,24,17); - Process p20("PK2", 11,34,67); // not used! + StaticProcess p1("P1", 1,5,1); + StaticProcess p2("P2", 5,55,2); + StaticProcess p3("P3", 36,30,3); + StaticProcess p4("P4", 4,26,3); + StaticProcess p5("P5", 15,200,3); + StaticProcess p6("P6", 6,250,1); + StaticProcess p7("P7", 8,42,15); + StaticProcess p8("P8", 8,56,1); + StaticProcess p9("P9", 9,42,1); + StaticProcess p10("PA", 12,42,1); + StaticProcess p11("PB", 106,42,1); + StaticProcess p12("PC", 100,42,1); + StaticProcess p13("PD", 29,42,18); + StaticProcess p14("PE", 0,42,1); + StaticProcess p15("PF", 2,88,1); + StaticProcess p16("PG", 3666,9,1); + StaticProcess p17("PH", 5,72,10); + StaticProcess p18("PJ", 6,26,1); + StaticProcess p19("PK", 10,24,17); + StaticProcess p20("PK2", 11,34,67); // not used! SchedulableStatus ss1(p1); SchedulableStatus ss2(p2); diff --git a/src/testsuite/test-parse_command.cc b/src/testsuite/test-parse_command.cc index 576d7fb..3cac53d 100644 --- a/src/testsuite/test-parse_command.cc +++ b/src/testsuite/test-parse_command.cc @@ -36,7 +36,7 @@ #include #include -#include "backend/process.hh" +#include "backend/static_process.hh" #include "backend/slice.hh" #include "backend/observed_subject.hh" #include "backend/schedulable_queue.hh" diff --git a/src/testsuite/test-stepforward.cc b/src/testsuite/test-stepforward.cc index 1336e19..f03c53a 100644 --- a/src/testsuite/test-stepforward.cc +++ b/src/testsuite/test-stepforward.cc @@ -31,7 +31,7 @@ #include "glibmm/ustring.h" #include #include -#include "backend/process.hh" +#include "backend/static_process.hh" #include "backend/observed_subject.hh" #include "backend/schedulable_queue.hh" #include "backend/schedulable_status.hh" @@ -231,26 +231,26 @@ main(int argc, char** argv) { std::string command(ERERERT); // the sequence of commands to test // sets up the test data - Process p1("P1", 1,5,1); - Process p2("P2", 5,55,2); - Process p3("P3", 36,30,3); - Process p4("P4", 4,26,3); - Process p5("P5", 15,200,3); - Process p6("P6", 6,250,1); - Process p7("P7", 8,42,15); - Process p8("P8", 8,56,1); - Process p9("P9", 9,42,1); - Process p10("PA", 12,42,1); - Process p11("PB", 106,42,1); - Process p12("PC", 100,42,1); - Process p13("PD", 29,42,18); - Process p14("PE", 0,42,1); - Process p15("PF", 2,88,1); - Process p16("PG", 3666,9,1); - Process p17("PH", 5,72,10); - Process p18("PJ", 6,26,1); - Process p19("PK", 10,24,17); - Process p20("PK2", 11,34,67); // not used! + StaticProcess p1("P1", 1,5,1); + StaticProcess p2("P2", 5,55,2); + StaticProcess p3("P3", 36,30,3); + StaticProcess p4("P4", 4,26,3); + StaticProcess p5("P5", 15,200,3); + StaticProcess p6("P6", 6,250,1); + StaticProcess p7("P7", 8,42,15); + StaticProcess p8("P8", 8,56,1); + StaticProcess p9("P9", 9,42,1); + StaticProcess p10("PA", 12,42,1); + StaticProcess p11("PB", 106,42,1); + StaticProcess p12("PC", 100,42,1); + StaticProcess p13("PD", 29,42,18); + StaticProcess p14("PE", 0,42,1); + StaticProcess p15("PF", 2,88,1); + StaticProcess p16("PG", 3666,9,1); + StaticProcess p17("PH", 5,72,10); + StaticProcess p18("PJ", 6,26,1); + StaticProcess p19("PK", 10,24,17); + StaticProcess p20("PK2", 11,34,67); // not used! SchedulableStatus ss1(p1); SchedulableStatus ss2(p2);