Fix double accounting in erases.

Author: MatiasBjorling

FTLs/bast_ftl.cpp

@@ -406,3 +406,9 @@ void FtlImpl_Bast::update_map_block(Event &event)
 	controller.stats.numFTLWrite++;
 }
 
+
+void FtlImpl_Bast::print_ftl_statistics()
+{
+	Block_manager::instance()->print_statistics();
+}
+

FTLs/bdftl_ftl.cpp

@@ -456,5 +456,6 @@ void FtlImpl_BDftl::print_ftl_statistics()
 	}
 
 	printf(" Blocks optimal: %i\n", numOptimal);
+	Block_manager::instance()->print_statistics();
 }
 

FTLs/dftl_ftl.cpp

@@ -215,3 +215,8 @@ void FtlImpl_Dftl::cleanup_block(Event &event, Block *block)
 	}
 
 }
+
+void FtlImpl_Dftl::print_ftl_statistics()
+{
+	Block_manager::instance()->print_statistics();
+}

FTLs/fast_ftl.cpp

@@ -596,3 +596,9 @@ void FtlImpl_Fast::update_map_block(Event &event)
 	controller.stats.numFTLWrite++;
 }
 
+
+void FtlImpl_Fast::print_ftl_statistics()
+{
+	Block_manager::instance()->print_statistics();
+}
+

run_ufliptrace.cpp

@@ -70,10 +70,10 @@ int main(int argc, char **argv){
 	printf("Writes %i pages for startup out of %i total pages.\n", preIO, SSD_SIZE * PACKAGE_SIZE * DIE_SIZE * PLANE_SIZE * BLOCK_SIZE);
 
 //	srand(1);
-//	for (int i=0; i<preIO;i++)
+//	for (int i=0; i<preIO*3;i++)
 //	{
 //		long int r = random()%deviceSize;
-//		double d = ssd.event_arrive(WRITE, i, 1, i*1000);
+//		double d = ssd.event_arrive(WRITE, r, 1, (double)i*1000.0);
 //		//double d = ssd.event_arrive(WRITE, i, 1, i*1000);
 //		afterFormatStartTime += 1000;
 //
@@ -102,6 +102,8 @@ int main(int argc, char **argv){
 	double timeMultiplier = 10000;
 
 
+	long writeEvent = 0;
+	long readEvent = 0;
 	for (int i=0; i<files.size();i++)
 	{
 		char *filename = NULL;
@@ -146,6 +148,7 @@ int main(int argc, char **argv){
 				for (int i=0;i<ioSize;i++)
 				{
 					local_loop_time += ssd.event_arrive(READ, ((vaddr+(i*(int)multiplier))/addressDivisor)%deviceSize, 1, ((start_time+arrive_time)*timeMultiplier)+local_loop_time);
+					readEvent++;
 				}
 
 
@@ -155,6 +158,7 @@ int main(int argc, char **argv){
 				for (int i=0;i<ioSize;i++)
 				{
 					local_loop_time += ssd.event_arrive(WRITE, ((vaddr+(i*(int)multiplier))/addressDivisor)%deviceSize, 1, ((start_time+arrive_time)*timeMultiplier)+local_loop_time);
+					writeEvent++;
 				}
 
 
@@ -166,6 +170,12 @@ int main(int argc, char **argv){
 		fclose(trace);
 	}
 
+	printf("Pre write done------------------------------\n");
+	ssd.print_ftl_statistics();
+	printf("Num read %li write %li\n", readEvent, writeEvent);
+	getchar();
+
+
 	FILE *logFile = NULL;
 	if ((logFile = fopen("output.log", "w")) == NULL)
 	{

ssd.conf

@@ -38,7 +38,7 @@ BUS_TABLE_SIZE 512
 
 # Ssd class:
 #    number of Packages per Ssd (size)
-SSD_SIZE 6
+SSD_SIZE 4
 
 # Package class:
 #    number of Dies per Package (size)
@@ -74,8 +74,7 @@ BLOCK_ERASE_DELAY 2000
 #    Size of pages (in bytes)
 PAGE_READ_DELAY 25
 PAGE_WRITE_DELAY 300
-PAGE_ENABLE_DATA 0
-PAGE_SIZE 2048
+PAGE_ENABLE_DATA 2048
 
 # MAPPING 
 # Specify reservation of 

ssd.h

@@ -793,6 +793,8 @@ class FtlImpl_Bast : public FtlParent
 
 	void update_map_block(Event &event);
 
+	void print_ftl_statistics();
+
 	int addressShift;
 	int addressSize;
 };
@@ -821,6 +823,8 @@ class FtlImpl_Fast : public FtlParent
 
 	void update_map_block(Event &event);
 
+	void print_ftl_statistics();
+
 	long sequential_logicalblock_address;
 	Address sequential_address;
 	uint sequential_offset;
@@ -907,6 +911,7 @@ class FtlImpl_Dftl : public FtlImpl_DftlParent
 	enum status write(Event &event);
 	enum status trim(Event &event);
 	void cleanup_block(Event &event, Block *block);
+	void print_ftl_statistics();
 };
 
 class FtlImpl_BDftl : public FtlImpl_DftlParent

ssd_block.cpp

@@ -156,8 +156,6 @@ enum status Block::_erase(Event &event)
 		Block_manager::instance()->update_block(this);
 	}
 
-	event.incr_time_taken(erase_delay);
-
 	return SUCCESS;
 }
 

ssd_bm.cpp

@@ -139,7 +139,10 @@ void Block_manager::print_statistics()
 	printf("Data blocks: %lu\n", data_active);
 	printf("Free blocks: %lu\n", (max_blocks - (simpleCurrentFree/BLOCK_SIZE)) + free_list.size());
 	printf("Invalid blocks: %lu\n", invalid_list.size());
+	printf("Free2 blocks: %lu\n", (int)invalid_list.size() + (int)log_active + (int)data_active - (int)free_list.size());
 	printf("-----------------\n");
+
+
 }
 
 void Block_manager::invalidate(Address address, block_type type)