Remove the ostream from Transaction; fix SST API

Author: dramninjasUMD

MemoryController.cpp

@@ -114,7 +114,7 @@ void MemoryController::receiveFromBus(BusPacket *bpacket)
 	}
 
 	//add to return read data queue
-	returnTransaction.push_back(new Transaction(RETURN_DATA, bpacket->physicalAddress, bpacket->data,dramsim_log));
+	returnTransaction.push_back(new Transaction(RETURN_DATA, bpacket->physicalAddress, bpacket->data));
 	totalReadsPerBank[SEQUENTIAL(bpacket->rank,bpacket->bank)]++;
 
 	// this delete statement saves a mindboggling amount of memory
@@ -650,8 +650,7 @@ void MemoryController::update()
 	{
 		if (DEBUG_BUS)
 		{
-			PRINTN(" -- MC Issuing to CPU bus : ");
-			returnTransaction[0]->print();
+			PRINTN(" -- MC Issuing to CPU bus : " << *returnTransaction[0]);
 		}
 		totalTransactions++;
 
@@ -701,8 +700,7 @@ void MemoryController::update()
 		PRINT("== Printing transaction queue");
 		for (size_t i=0;i<transactionQueue.size();i++)
 		{
-			PRINTN("  " << i << "]");
-			transactionQueue[i]->print();
+			PRINTN("  " << i << "] "<< *transactionQueue[i]);
 		}
 	}
 

MemorySystem.cpp

@@ -177,7 +177,7 @@ bool MemorySystem::WillAcceptTransaction()
 bool MemorySystem::addTransaction(bool isWrite, uint64_t addr)
 {
 	TransactionType type = isWrite ? DATA_WRITE : DATA_READ;
-	Transaction *trans = new Transaction(type,addr,NULL,dramsim_log);
+	Transaction *trans = new Transaction(type,addr,NULL);
 	// push_back in memoryController will make a copy of this during
 	// addTransaction so it's kosher for the reference to be local 
 

MultiChannelMemorySystem.cpp

@@ -421,6 +421,12 @@ ostream &MultiChannelMemorySystem::getLogFile()
 {
 	return dramsim_log; 
 }
+bool MultiChannelMemorySystem::addTransaction(const Transaction &trans)
+{
+	// copy the transaction and send the pointer to the new transaction 
+	return addTransaction(new Transaction(trans)); 
+}
+
 bool MultiChannelMemorySystem::addTransaction(Transaction *trans)
 {
 	unsigned channelNumber = findChannelNumber(trans->address); 

MultiChannelMemorySystem.h

@@ -45,6 +45,7 @@ class MultiChannelMemorySystem : public SimulatorObject
 	MultiChannelMemorySystem(const string &dev, const string &sys, const string &pwd, const string &trc, unsigned megsOfMemory, string *visFilename=NULL, const IniReader::OverrideMap *paramOverrides=NULL);
 		virtual ~MultiChannelMemorySystem();
 			bool addTransaction(Transaction *trans);
+			bool addTransaction(const Transaction &trans);
 			bool addTransaction(bool isWrite, uint64_t addr);
 			bool willAcceptTransaction(); 
 			bool willAcceptTransaction(uint64_t addr); 

TraceBasedSim.cpp

@@ -552,7 +552,7 @@ int main(int argc, char **argv)
 				if (line.size() > 0)
 				{
 					data = parseTraceFileLine(line, addr, transType,clockCycle, traceType,useClockCycle);
-					trans = new Transaction(transType, addr, data, dramsim_logfile);
+					trans = new Transaction(transType, addr, data);
 					alignTransactionAddress(*trans); 
 
 					if (i>=clockCycle)

Transaction.cpp

@@ -37,29 +37,46 @@
 #include "Transaction.h"
 #include "PrintMacros.h"
 
-using namespace DRAMSim;
-using namespace std;
+using std::endl;
+using std::hex; 
+using std::dec; 
 
-Transaction::Transaction(TransactionType transType, uint64_t addr, void *dat, ostream &dramsim_log_) :
-	dramsim_log(dramsim_log_),
+namespace DRAMSim {
+
+Transaction::Transaction(TransactionType transType, uint64_t addr, void *dat) :
 	transactionType(transType),
 	address(addr),
 	data(dat)
 {}
 
-void Transaction::print()
+Transaction::Transaction(const Transaction &t)
+	: transactionType(t.transactionType)
+	  , address(t.address)
+	  , data(NULL)
+	  , timeAdded(t.timeAdded)
+	  , timeReturned(t.timeReturned)
 {
-	if (transactionType == DATA_READ)
+	#ifndef NO_STORAGE
+	ERROR("Data storage is really outdated and these copies happen in an \n improper way, which will eventually cause problems. Please send an \n email to dramninjas [at] gmail [dot] com if you need data storage");
+	abort(); 
+	#endif
+}
+
+ostream &operator<<(ostream &os, const Transaction &t)
+{
+	if (t.transactionType == DATA_READ)
 	{
-		PRINT("T [Read] [0x" << hex << address << "]" << dec );
+		os<<"T [Read] [0x" << hex << t.address << "]" << dec <<endl;
 	}
-	else if (transactionType == DATA_WRITE)
+	else if (t.transactionType == DATA_WRITE)
 	{
-		PRINT("T [Write] [0x" << hex << address << "] [" << dec << data << "]" );
+		os<<"T [Write] [0x" << hex << t.address << "] [" << dec << t.data << "]" <<endl;
 	}
-	else if (transactionType == RETURN_DATA)
+	else if (t.transactionType == RETURN_DATA)
 	{
-		PRINT("T [Data] [0x" << hex << address << "] [" << dec << data << "]" );
+		os<<"T [Data] [0x" << hex << t.address << "] [" << dec << t.data << "]" <<endl;
 	}
+	return os; 
+}
 }
 

Transaction.h

@@ -38,7 +38,7 @@
 #include "SystemConfiguration.h"
 #include "BusPacket.h"
 
-using namespace std;
+using std::ostream; 
 
 namespace DRAMSim
 {
@@ -51,7 +51,6 @@ enum TransactionType
 
 class Transaction
 {
-	ostream &dramsim_log; 
 	Transaction();
 public:
 	//fields
@@ -62,10 +61,10 @@ class Transaction
 	uint64_t timeReturned;
 
 
+	friend ostream &operator<<(ostream &os, const Transaction &t);
 	//functions
-	Transaction(TransactionType transType, uint64_t addr, void *data, ostream &dramsim_log_);
-
-	void print();
+	Transaction(TransactionType transType, uint64_t addr, void *data);
+	Transaction(const Transaction &t);
 
 	BusPacketType getBusPacketType()
 	{
@@ -107,6 +106,7 @@ class Transaction
 		}
 	}
 };
+
 }
 
 #endif