ruby: eliminate type Time

There is another type Time in src/base class which results in a conflict.
This commit is contained in:
Nilay Vaish
2014-09-01 16:55:41 -05:00
parent 82d136285d
commit cc2cc58869
12 changed files with 16 additions and 16 deletions

View File

@@ -266,7 +266,7 @@ Check::initiateCheck()
}
void
Check::performCallback(NodeID proc, SubBlock* data, Time curTime)
Check::performCallback(NodeID proc, SubBlock* data, Cycles curTime)
{
Address address = data->getAddress();

View File

@@ -50,7 +50,7 @@ class Check
int _num_readers, RubyTester* _tester);
void initiate(); // Does Action or Check or nether
void performCallback(NodeID proc, SubBlock* data, Time curTime);
void performCallback(NodeID proc, SubBlock* data, Cycles curTime);
const Address& getAddress() { return m_address; }
void changeAddress(const Address& address);

View File

@@ -102,7 +102,7 @@ RubyTester::init()
m_last_progress_vector.resize(m_num_cpus);
for (int i = 0; i < m_last_progress_vector.size(); i++) {
m_last_progress_vector[i] = 0;
m_last_progress_vector[i] = Cycles(0);
}
m_num_writers = writePorts.size();
@@ -225,7 +225,7 @@ void
RubyTester::checkForDeadlock()
{
int size = m_last_progress_vector.size();
Time current_time = curCycle();
Cycles current_time = curCycle();
for (int processor = 0; processor < size; processor++) {
if ((current_time - m_last_progress_vector[processor]) >
m_deadlock_threshold) {

View File

@@ -141,7 +141,7 @@ class RubyTester : public MemObject
RubyTester& operator=(const RubyTester& obj);
CheckTable* m_checkTable_ptr;
std::vector<Time> m_last_progress_vector;
std::vector<Cycles> m_last_progress_vector;
int m_num_cpus;
uint64 m_checks_completed;