X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fdtest.c;h=a48c618124e548e8e72e91665d747f7717124370;hp=096ea7e1932ed59fe7b629b11bdeb9f5bd49555f;hb=f8ce690845de29ca75d312207c8e59eac8bf85d4;hpb=9625e7b16224f286bb177324f2c1283b9db08286;ds=sidebyside

diff --git a/direct/dtest.c b/direct/dtest.c
index 096ea7e..a48c618 100644
--- a/direct/dtest.c
+++ b/direct/dtest.c
@@ -855,6 +855,30 @@ int yaffs_scan_test(const char *path)
 }
 
 
+void rename_over_test(const char *mountpt)
+{
+	int i;
+	char a[100];
+	char b[100];
+	
+	sprintf(a,"%s/a",mountpt);
+	sprintf(b,"%s/b",mountpt);
+	
+	yaffs_StartUp();
+	
+	yaffs_mount(mountpt);
+	i = yaffs_open(a,O_CREAT | O_TRUNC | O_RDWR, 0); 
+	yaffs_close(i);
+	i = yaffs_open(b,O_CREAT | O_TRUNC | O_RDWR, 0);
+	yaffs_close(i);
+	yaffs_rename(a,b); // rename over
+	yaffs_rename(b,a); // rename back again (not renaimng over)
+	yaffs_rename(a,b); // rename back again (not renaimng over)
+	
+	
+	yaffs_unmount(mountpt);
+	
+}
 
 int resize_stress_test(const char *path)
 {
@@ -1256,28 +1280,167 @@ void fill_disk_test(const char *mountpt)
 	
 }
 
-void rename_over_test(const char *mountpt)
+
+
+void lookup_test(const char *mountpt)
 {
 	int i;
+	int h;
 	char a[100];
 	char b[100];
 	
-	sprintf(a,"%s/a",mountpt);
-	sprintf(b,"%s/b",mountpt);
+
+	yaffs_DIR *d;
+	yaffs_dirent *de;
+	struct yaffs_stat s;
+	char str[100];
+
+	yaffs_StartUp();
+	
+	yaffs_mount(mountpt);
+				
+	d = yaffs_opendir(mountpt);
+	
+	if(!d)
+	{
+		printf("opendir failed\n");
+	}
+	else
+	{
+		
+		for(i = 0; (de = yaffs_readdir(d)) != NULL; i++)
+		{
+			printf("unlinking %s\n",de->d_name);
+			yaffs_unlink(de->d_name);
+		}
+		
+		printf("%d files deleted\n",i);
+	}
+	
+	
+	for(i = 0; i < 2000; i++){
+	sprintf(a,"%s/%d",mountpt,i);
+		h =  yaffs_open(a,O_CREAT | O_TRUNC | O_RDWR, 0);
+		yaffs_close(h);
+	}
+
+	yaffs_rewinddir(d);
+	for(i = 0; (de = yaffs_readdir(d)) != NULL; i++)
+	{
+		printf("%d  %s\n",i,de->d_name);
+	}	
+	
+	printf("%d files listed\n\n\n",i);
+	
+	yaffs_rewinddir(d);
+	yaffs_readdir(d);
+	yaffs_readdir(d);
+	yaffs_readdir(d);
+	
+	for(i = 0; i < 2000; i++){
+		sprintf(a,"%s/%d",mountpt,i);
+		yaffs_unlink(a);
+	}
+	
+		
+	yaffs_unmount(mountpt);
+	
+}
+
+void freespace_test(const char *mountpt)
+{
+	int i;
+	int h;
+	char a[100];
+	char b[100];
+	
+	int  f0;
+	int f1;
+	int f2;
+	int f3;
+	sprintf(a,"%s/aaa",mountpt);
 	
 	yaffs_StartUp();
 	
 	yaffs_mount(mountpt);
-	i = yaffs_open(a,O_CREAT | O_TRUNC | O_RDWR, 0); 
-	yaffs_close(i);
-	i = yaffs_open(b,O_CREAT | O_TRUNC | O_RDWR, 0);
-	yaffs_close(i);
-	yaffs_rename(a,b);
 	
+	f0 = yaffs_freespace(mountpt);
+	
+	h = yaffs_open(a, O_CREAT | O_TRUNC | O_RDWR, S_IREAD | S_IWRITE);
+	
+	for(i = 0; i < 100; i++)
+		yaffs_write(h,a,100);
+	
+	yaffs_close(h);
+	
+	f1 = yaffs_freespace(mountpt);
 	
+	yaffs_unlink(a);
+	
+	f2 = yaffs_freespace(mountpt);
+	
+		
 	yaffs_unmount(mountpt);
+	yaffs_mount(mountpt);
+	
+	f3 = yaffs_freespace(mountpt);
+	
+	printf("%d\n%d\n%d\n%d\n",f0, f1,f2,f3);
+	
+	
+}
+
+void simple_rw_test(const char *mountpt)
+{
+	int i;
+	int h;
+	char a[100];
+	
+	int x;
+	int result;
+
+	sprintf(a,"%s/aaa",mountpt);
+	
+	yaffs_StartUp();
+	
+	yaffs_mount(mountpt);
+	
+	yaffs_unlink(a);
+	
+	h = yaffs_open(a,O_CREAT| O_TRUNC | O_RDWR, S_IREAD | S_IWRITE);
+	
+	for(i = 100000;i < 200000; i++){
+		result = yaffs_write(h,&i,sizeof(i));
+		
+		if(result != 4)
+		{
+			printf("write error\n");
+			exit(1);
+		}
+	}
+	
+	//yaffs_close(h);
+	
+	// h = yaffs_open(a,O_RDWR, S_IREAD | S_IWRITE);
+	
+	
+	yaffs_lseek(h,0,SEEK_SET);
+	
+	for(i = 100000; i < 200000; i++){
+		result = yaffs_read(h,&x,sizeof(x));
+		
+		if(result != 4 || x != i){
+			printf("read error %d %x %x\n",i,result,x);
+		}
+	}
+	
+	printf("Simple rw test passed\n");
+	
+	
 	
 }
+
+
 void scan_deleted_files_test(const char *mountpt)
 {
 	char fn[100];
@@ -1380,9 +1543,9 @@ void write_200k_file(const char *fn, const char *fdel, const char *fdel1)
    yaffs_unlink(fdel1);
    
    
-   
 }
 
+
 void verify_200k_file(const char *fn)
 {
    int h1;
@@ -1401,8 +1564,7 @@ void verify_200k_file(const char *fn)
 	}
    }
       
-   yaffs_close(h1);
-   
+   yaffs_close(h1);	   
 	
 }
 
@@ -1461,8 +1623,11 @@ int main(int argc, char *argv[])
 	
 	//long_test_on_path("/ram2k");
 	// long_test_on_path("/flash");
-	//fill_disk_test("/flash");
-	rename_over_test("/flash");
+	simple_rw_test("/flash/flash");
+	fill_disk_test("/flash/flash");
+	// rename_over_test("/flash");
+	//lookup_test("/flash");
+	freespace_test("/flash/flash");