X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftests%2Fnor_stress.c;h=bb614d8481363b380a48850aefee081908f01269;hp=5a7b5297fde80cce4d16f673e018ff6c1abc75c9;hb=d22f3456a462be87d8fa7c69c06bd22a95522a0f;hpb=6104166e07b5ffbc8a6004639c9ba3da200bc7a7

diff --git a/direct/tests/nor_stress.c b/direct/tests/nor_stress.c
index 5a7b529..bb614d8 100644
--- a/direct/tests/nor_stress.c
+++ b/direct/tests/nor_stress.c
@@ -1,3 +1,17 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
 #include "nor_stress.h"
 
 
@@ -35,6 +49,8 @@ static unsigned cycleEnds;
 
 static int interleave_fsx;
 
+static int no_verification;
+ 
 char fullPathName[100];
 char fullPowerUpName[100];
 char fullStartName[100];
@@ -105,8 +121,9 @@ static void UpdateCounter(const char *name, unsigned *val,  int initialise)
       yaffs_close(inh);
     }
 
-    if(nread != sizeof(x) ||
-       x[0] + 1 != x[1]){
+    if(!no_verification &&
+      (nread != sizeof(x) ||
+       x[0] + 1 != x[1])){
       printf("Error reading counter %s handle %d, x[0] %u x[1] %u last error %d\n",
               name, inh, x[0], x[1],yaffsfs_GetLastError());
       FatalError(__LINE__);
@@ -118,12 +135,14 @@ static void UpdateCounter(const char *name, unsigned *val,  int initialise)
   
   FSX();
   outh = yaffs_open(fullTempCounterName, O_RDWR | O_TRUNC | O_CREAT, S_IREAD | S_IWRITE);
+  
   if(outh >= 0){
    struct yaffs_stat tmpstat, oldstat, tmpfstat;
    FSX(); 
+    yaffs_fstat(outh,&tmpfstat);
+    printf("\n\n\n*** Writing file %s inode %d\n",fullTempCounterName,tmpfstat.st_ino);
     nwritten = yaffs_write(outh,x,sizeof(x));
     FSX();
-    yaffs_fstat(outh,&tmpfstat);
     yaffs_close(outh);
     FSX();
 
@@ -204,7 +223,7 @@ static void dump_directory_tree_worker(const char *dname,int recursive)
 							
 		}
 		
-		if(error_line)
+		if(error_line && !no_verification)
 			FatalError(error_line);
 		
 		yaffs_closedir(d);
@@ -238,7 +257,7 @@ static int yWriteFile(const char *fname, unsigned sz32)
 	FSX();
 	h = yaffs_open(fname,O_RDWR | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE);
 	yaffs_fstat(h,&st);
-	printf("Writing file %s inode %d\n",fname, st.st_ino);
+	printf("\n\n\n**** Open writing file %s inode %d\n",fname, st.st_ino);
 	
 	FSX();
 
@@ -275,6 +294,7 @@ static int yWriteFile(const char *fname, unsigned sz32)
 	
 	FSX();
 	yaffs_close(h);
+	printf("File closed\n");
 	return 0;
 
 WRITE_ERROR:
@@ -295,6 +315,8 @@ static int yVerifyFile(const char *fName)
 	int i;
 	int retval = 0;
 
+	if(no_verification)
+		return 0;
 
         printf("Verifying file %s\n",fName);
         	
@@ -367,8 +389,9 @@ static void DoUpdateMainFile(void)
         
 	result = yWriteFile(fullTempMainName,sz32);
 	FSX();
-	if(result)
+	if(!no_verification && result)
 	    FatalError(__LINE__);
+	printf("Raname file %s to %s\n",fullTempMainName,fullMainName);
 	yaffs_rename(fullTempMainName,fullMainName);
 	FSX();
 }
@@ -376,6 +399,8 @@ static void DoUpdateMainFile(void)
 static void DoVerifyMainFile(void)
 {
         int result;
+	if(no_verification)
+		return;
 	result = yVerifyFile(fullMainName);
 	if(result)
 	    FatalError(__LINE__);
@@ -396,10 +421,14 @@ void NorStressTestInitialise(const char *prefix)
 }
 
 
-void NorStressTestRun(const char *prefix, int n_cycles, int do_fsx)
+void NorStressTestRun(const char *prefix, int n_cycles, int do_fsx, int skip_verification)
 {
+
   interleave_fsx = do_fsx;
+  no_verification = skip_verification;
+ 
   MakeFullNames(prefix);
+  dump_directory_tree(fullPathName);
   FSX_INIT(prefix);
     
   dump_directory_tree(fullPathName);