Make valgrind happy again

Author: dramninjasUMD

MemoryController.cpp

@@ -511,16 +511,6 @@ void MemoryController::update()
 				PRINT("  Col  : " << newTransactionColumn);
 			}
 
-			// If we have a read, save the transaction so when the data comes back
-			// in a bus packet, we can staple it back into a transaction and return it
-			if (transaction->transactionType == DATA_READ)
-			{
-				pendingReadTransactions.push_back(transaction);
-			}
-			else
-			{
-				//the transaction has been turned into a buspacket, so we don't need it anymore
-			}
 
 
 			//now that we know there is room in the command queue, we can remove from the transaction queue
@@ -538,20 +528,26 @@ void MemoryController::update()
 					newTransactionBank, transaction->data, dramsim_log);
 
 
-			/* only allow one transaction to be scheduled per cycle -- this should
-			 * be a reasonable assumption considering how much logic would be
-			 * required to schedule multiple entries per cycle (parallel data
-			 * lines, switching logic, decision logic)
-			 */
+
 			commandQueue.enqueue(ACTcommand);
 			commandQueue.enqueue(command);
 
-			// if the transaction isn't a read, we don't need to keep it around anymore 
-			if (transaction->transactionType != DATA_READ)
+			// If we have a read, save the transaction so when the data comes back
+			// in a bus packet, we can staple it back into a transaction and return it
+			if (transaction->transactionType == DATA_READ)
+			{
+				pendingReadTransactions.push_back(transaction);
+			}
+			else
 			{
+				// just delete the transaction now that it's a buspacket
 				delete transaction; 
 			}
-
+			/* only allow one transaction to be scheduled per cycle -- this should
+			 * be a reasonable assumption considering how much logic would be
+			 * required to schedule multiple entries per cycle (parallel data
+			 * lines, switching logic, decision logic)
+			 */
 			break;
 		}
 		else // no room, do nothing this cycle
@@ -687,6 +683,7 @@ void MemoryController::update()
 			ERROR("Can't find a matching transaction for 0x"<<hex<<returnTransaction[0]->address<<dec);
 			abort(); 
 		}
+		delete returnTransaction[0];
 		returnTransaction.erase(returnTransaction.begin());
 	}
 
@@ -962,6 +959,15 @@ MemoryController::~MemoryController()
 {
 	//ERROR("MEMORY CONTROLLER DESTRUCTOR");
 	//abort();
+	for (size_t i=0; i<pendingReadTransactions.size(); i++)
+	{
+		delete pendingReadTransactions[i];
+	}
+	for (size_t i=0; i<returnTransaction.size(); i++)
+	{
+		delete returnTransaction[i];
+	}
+
 }
 //inserts a latency into the latency histogram
 void MemoryController::insertHistogram(unsigned latencyValue, unsigned rank, unsigned bank)

MemorySystem.cpp

@@ -141,7 +141,6 @@ MemorySystem::MemorySystem(unsigned id, unsigned int megsOfMemory, ofstream &vis
 		ranks->push_back(r);
 	}
 
-
 	memoryController->attachRanks(ranks);
 
 }
@@ -155,6 +154,11 @@ MemorySystem::~MemorySystem()
 //	abort();
 
 	delete(memoryController);
+
+	for (size_t i=0; i<NUM_RANKS; i++)
+	{
+		delete (*ranks)[i];
+	}
 	ranks->clear();
 	delete(ranks);
 

MultiChannelMemorySystem.cpp

@@ -338,8 +338,13 @@ void MultiChannelMemorySystem::mkdirIfNotExist(string path)
 
 MultiChannelMemorySystem::~MultiChannelMemorySystem()
 {
-// Should only ever be called on exit, so don't bother to delete stuff, just
-// flush our streams and close em up
+	for (size_t i=0; i<NUM_CHANS; i++)
+	{
+		delete channels[i];
+	}
+	channels.clear(); 
+
+// flush our streams and close them up
 #ifdef LOG_OUTPUT
 	dramsim_log.flush();
 	dramsim_log.close();

Rank.cpp

@@ -70,7 +70,15 @@ void Rank::attachMemoryController(MemoryController *memoryController)
 {
 	this->memoryController = memoryController;
 }
-
+Rank::~Rank()
+{
+	for (size_t i=0; i<readReturnPacket.size(); i++)
+	{
+		delete readReturnPacket[i];
+	}
+	readReturnPacket.clear(); 
+	delete outgoingDataPacket; 
+}
 void Rank::receiveFromBus(BusPacket *packet)
 {
 	if (DEBUG_BUS)

Rank.h

@@ -59,6 +59,7 @@ class Rank : public SimulatorObject
 public:
 	//functions
 	Rank(ostream &dramsim_log_);
+	virtual ~Rank(); 
 	void receiveFromBus(BusPacket *packet);
 	void attachMemoryController(MemoryController *mc);
 	int getId() const;

TraceBasedSim.cpp

@@ -564,6 +564,8 @@ int main(int argc, char **argv)
 #ifdef RETURN_TRANSACTIONS
 							transactionReceiver.add_pending(trans, i); 
 #endif
+							// the memory system accepted our request so now it takes ownership of it
+							trans = NULL; 
 						}
 					}
 					else
@@ -592,6 +594,7 @@ int main(int argc, char **argv)
 #ifdef RETURN_TRANSACTIONS
 				transactionReceiver.add_pending(trans, i); 
 #endif
+				trans=NULL;
 			}
 		}
 
@@ -601,6 +604,10 @@ int main(int argc, char **argv)
 	traceFile.close();
 	(*memorySystem).printStats();
 	// make valgrind happy
+	if (trans)
+	{
+		delete trans;
+	}
 	delete(memorySystem);
 }
 #endif