matteo/sgpemv2
matteo
/
sgpemv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Renamed Process to StaticProcess 

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@627 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
elvez 2006-06-13 14:20:05 +00:00
parent 1f7972c308
commit dd6085a0a6
7 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -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 \

12
src/backend/process.cc → src/backend/static_process.cc
View File

@ -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";
}

14
src/backend/process.hh → src/backend/static_process.hh
View File

@ -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;

14
src/main.cc
View File

@ -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);

42
src/testsuite/test-history.cc
View File

@ -32,7 +32,7 @@
#include <vector>
#include <iostream>
#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);

2
src/testsuite/test-parse_command.cc
View File

@ -36,7 +36,7 @@
#include <vector>
#include <iostream>
#include "backend/process.hh"
#include "backend/static_process.hh"
#include "backend/slice.hh"
#include "backend/observed_subject.hh"
#include "backend/schedulable_queue.hh"

42
src/testsuite/test-stepforward.cc
View File

@ -31,7 +31,7 @@
#include "glibmm/ustring.h"
#include <vector>
#include <iostream>
#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);