ruby: Removed System name clash by renaming ruby's System to RubySystem

This commit is contained in:
Daniel Sanchez 2009-05-11 10:38:44 -07:00
parent 84a18e7fdc
commit ab5e4a22b3
14 changed files with 35 additions and 35 deletions

View file

@ -35,7 +35,7 @@
#include "NodeID.hh" #include "NodeID.hh"
#include "CacheRequestType.hh" #include "CacheRequestType.hh"
class System; class RubySystem;
class SubBlock; class SubBlock;
class Address; class Address;
class MachineID; class MachineID;

View file

@ -30,6 +30,6 @@
#include "Global.hh" #include "Global.hh"
EventQueue* g_eventQueue_ptr = NULL; EventQueue* g_eventQueue_ptr = NULL;
System* g_system_ptr = NULL; RubySystem* g_system_ptr = NULL;
Debug* g_debug_ptr = NULL; Debug* g_debug_ptr = NULL;

View file

@ -92,8 +92,8 @@ typedef int LinkID;
class EventQueue; class EventQueue;
extern EventQueue* g_eventQueue_ptr; extern EventQueue* g_eventQueue_ptr;
class System; class RubySystem;
extern System* g_system_ptr; extern RubySystem* g_system_ptr;
class Debug; class Debug;
extern Debug* g_debug_ptr; extern Debug* g_debug_ptr;

View file

@ -219,7 +219,7 @@ void init_simulator()
cout << "Creating system..." << endl; cout << "Creating system..." << endl;
cout << " Processors: " << RubyConfig::numberOfProcessors() << endl; cout << " Processors: " << RubyConfig::numberOfProcessors() << endl;
g_system_ptr = new System; g_system_ptr = new RubySystem;
cout << "Creating system done" << endl; cout << "Creating system done" << endl;
// if opal is loaded, its static interface object (inst) will be non-null, // if opal is loaded, its static interface object (inst) will be non-null,

View file

@ -819,7 +819,7 @@ void Profiler::printStats(ostream& out, bool short_stats)
} // XACT_MEMORY } // XACT_MEMORY
if (!short_stats) { if (!short_stats) {
out << "Request vs. System State Profile" << endl; out << "Request vs. RubySystem State Profile" << endl;
out << "--------------------------------" << endl; out << "--------------------------------" << endl;
out << endl; out << endl;

View file

@ -69,7 +69,7 @@ public:
TransactionInterfaceManager* getTransactionInterfaceManager(int index) const { return m_L1Cache_xact_mgr_vec[index]; }; TransactionInterfaceManager* getTransactionInterfaceManager(int index) const { return m_L1Cache_xact_mgr_vec[index]; };
void setTransactionInterfaceManager(TransactionInterfaceManager* manager, int index) { m_L1Cache_xact_mgr_vec[index] = manager; } void setTransactionInterfaceManager(TransactionInterfaceManager* manager, int index) { m_L1Cache_xact_mgr_vec[index] = manager; }
// used when CHECK_COHERENCE is enabled. See System::checkGlobalCoherence() // used when CHECK_COHERENCE is enabled. See RubySystem::checkGlobalCoherence()
virtual bool isBlockExclusive(const Address& addr) const { return false; } virtual bool isBlockExclusive(const Address& addr) const { return false; }
virtual bool isBlockShared(const Address& addr) const { return false; } virtual bool isBlockShared(const Address& addr) const { return false; }

View file

@ -28,9 +28,9 @@
*/ */
/* /*
* System.C * RubySystem.C
* *
* Description: See System.h * Description: See RubySystem.h
* *
* $Id$ * $Id$
* *
@ -52,7 +52,7 @@
//#include "XactVisualizer.hh" //#include "XactVisualizer.hh"
#include "M5Driver.hh" #include "M5Driver.hh"
System::System() RubySystem::RubySystem()
{ {
DEBUG_MSG(SYSTEM_COMP, MedPrio,"initializing"); DEBUG_MSG(SYSTEM_COMP, MedPrio,"initializing");
@ -129,7 +129,7 @@ System::System()
} }
System::~System() RubySystem::~RubySystem()
{ {
for (int i = 0; i < m_chip_vector.size(); i++) { for (int i = 0; i < m_chip_vector.size(); i++) {
delete m_chip_vector[i]; delete m_chip_vector[i];
@ -142,19 +142,19 @@ System::~System()
*/ */
} }
void System::printConfig(ostream& out) const void RubySystem::printConfig(ostream& out) const
{ {
out << "\n================ Begin System Configuration Print ================\n\n"; out << "\n================ Begin RubySystem Configuration Print ================\n\n";
RubyConfig::printConfiguration(out); RubyConfig::printConfiguration(out);
out << endl; out << endl;
getChip(0)->printConfig(out); getChip(0)->printConfig(out);
m_network_ptr->printConfig(out); m_network_ptr->printConfig(out);
m_driver_ptr->printConfig(out); m_driver_ptr->printConfig(out);
m_profiler_ptr->printConfig(out); m_profiler_ptr->printConfig(out);
out << "\n================ End System Configuration Print ================\n\n"; out << "\n================ End RubySystem Configuration Print ================\n\n";
} }
void System::printStats(ostream& out) void RubySystem::printStats(ostream& out)
{ {
const time_t T = time(NULL); const time_t T = time(NULL);
tm *localTime = localtime(&T); tm *localTime = localtime(&T);
@ -174,7 +174,7 @@ void System::printStats(ostream& out)
Chip::printStats(out); Chip::printStats(out);
} }
void System::clearStats() const void RubySystem::clearStats() const
{ {
m_profiler_ptr->clearStats(); m_profiler_ptr->clearStats();
m_network_ptr->clearStats(); m_network_ptr->clearStats();
@ -187,7 +187,7 @@ void System::clearStats() const
} }
} }
void System::recordCacheContents(CacheRecorder& tr) const void RubySystem::recordCacheContents(CacheRecorder& tr) const
{ {
for (int i = 0; i < m_chip_vector.size(); i++) { for (int i = 0; i < m_chip_vector.size(); i++) {
for (int m_version = 0; m_version < RubyConfig::numberOfProcsPerChip(); m_version++) { for (int m_version = 0; m_version < RubyConfig::numberOfProcsPerChip(); m_version++) {
@ -220,7 +220,7 @@ void System::opalLoadNotify()
// in setState. The SLICC spec must also define methods "isBlockShared" // in setState. The SLICC spec must also define methods "isBlockShared"
// and "isBlockExclusive" that are specific to that protocol // and "isBlockExclusive" that are specific to that protocol
// //
void System::checkGlobalCoherenceInvariant(const Address& addr ) { void RubySystem::checkGlobalCoherenceInvariant(const Address& addr ) {
NodeID exclusive = -1; NodeID exclusive = -1;
bool sharedDetected = false; bool sharedDetected = false;

View file

@ -28,7 +28,7 @@
*/ */
/* /*
* System.h * RubySystem.h
* *
* Description: Contains all of the various parts of the system we are * Description: Contains all of the various parts of the system we are
* simulating. Performs allocation, deallocation, and setup of all * simulating. Performs allocation, deallocation, and setup of all
@ -59,13 +59,13 @@ class XactCommitArbiter;
class XactVisualizer; class XactVisualizer;
class TransactionInterfaceManager; class TransactionInterfaceManager;
class System { class RubySystem {
public: public:
// Constructors // Constructors
System(); RubySystem();
// Destructor // Destructor
~System(); ~RubySystem();
// Public Methods // Public Methods
int getNumProcessors() { return RubyConfig::numberOfProcessors(); } int getNumProcessors() { return RubyConfig::numberOfProcessors(); }
@ -103,8 +103,8 @@ private:
// Private Methods // Private Methods
// Private copy constructor and assignment operator // Private copy constructor and assignment operator
System(const System& obj); RubySystem(const RubySystem& obj);
System& operator=(const System& obj); RubySystem& operator=(const RubySystem& obj);
// Data Members (m_ prefix) // Data Members (m_ prefix)
Network* m_network_ptr; Network* m_network_ptr;
@ -118,13 +118,13 @@ private:
}; };
// Output operator declaration // Output operator declaration
ostream& operator<<(ostream& out, const System& obj); ostream& operator<<(ostream& out, const RubySystem& obj);
// ******************* Definitions ******************* // ******************* Definitions *******************
// Output operator definition // Output operator definition
inline inline
ostream& operator<<(ostream& out, const System& obj) ostream& operator<<(ostream& out, const RubySystem& obj)
{ {
// obj.print(out); // obj.print(out);
out << flush; out << flush;

View file

@ -43,7 +43,7 @@
#include "SubBlock.hh" #include "SubBlock.hh"
#include "Chip.hh" #include "Chip.hh"
DeterministicDriver::DeterministicDriver(System* sys_ptr) DeterministicDriver::DeterministicDriver(RubySystem* sys_ptr)
{ {
if (g_SIMICS) { if (g_SIMICS) {
ERROR_MSG("g_SIMICS should not be defined."); ERROR_MSG("g_SIMICS should not be defined.");

View file

@ -42,13 +42,13 @@
#include "Histogram.hh" #include "Histogram.hh"
#include "CacheRequestType.hh" #include "CacheRequestType.hh"
class System; class RubySystem;
class SpecifiedGenerator; class SpecifiedGenerator;
class DeterministicDriver : public Driver, public Consumer { class DeterministicDriver : public Driver, public Consumer {
public: public:
// Constructors // Constructors
DeterministicDriver(System* sys_ptr); DeterministicDriver(RubySystem* sys_ptr);
// Destructor // Destructor
~DeterministicDriver(); ~DeterministicDriver();

View file

@ -44,7 +44,7 @@
#include "SubBlock.hh" #include "SubBlock.hh"
#include "Chip.hh" #include "Chip.hh"
SyntheticDriver::SyntheticDriver(System* sys_ptr) SyntheticDriver::SyntheticDriver(RubySystem* sys_ptr)
{ {
cout << "SyntheticDriver::SyntheticDriver" << endl; cout << "SyntheticDriver::SyntheticDriver" << endl;
if (g_SIMICS) { if (g_SIMICS) {

View file

@ -42,13 +42,13 @@
#include "Histogram.hh" #include "Histogram.hh"
#include "CacheRequestType.hh" #include "CacheRequestType.hh"
class System; class RubySystem;
class RequestGenerator; class RequestGenerator;
class SyntheticDriver : public Driver, public Consumer { class SyntheticDriver : public Driver, public Consumer {
public: public:
// Constructors // Constructors
SyntheticDriver(System* sys_ptr); SyntheticDriver(RubySystem* sys_ptr);
// Destructor // Destructor
~SyntheticDriver(); ~SyntheticDriver();

View file

@ -40,7 +40,7 @@
#include "Check.hh" #include "Check.hh"
#include "Chip.hh" #include "Chip.hh"
Tester::Tester(System* sys_ptr) Tester::Tester(RubySystem* sys_ptr)
{ {
if (g_SIMICS) { if (g_SIMICS) {
ERROR_MSG("g_SIMICS should not be defined."); ERROR_MSG("g_SIMICS should not be defined.");

View file

@ -42,12 +42,12 @@
#include "CheckTable.hh" #include "CheckTable.hh"
#include "CacheRequestType.hh" #include "CacheRequestType.hh"
class System; class RubySystem;
class Tester : public Driver, public Consumer { class Tester : public Driver, public Consumer {
public: public:
// Constructors // Constructors
Tester(System* sys_ptr); Tester(RubySystem* sys_ptr);
// Destructor // Destructor
~Tester(); ~Tester();