yaffs commiting changes to timothy_tests

[yaffs2.git] / direct / timothy_tests / yaffs_tester.c

diff --git a/direct/timothy_tests/yaffs_tester.c b/direct/timothy_tests/yaffs_tester.c
index b050e00a05a5ac38b8d4f1280d55040386f5ca0f..e8d86711bd20e5d47565a463169105adaabb84a1 100644 (file)
--- a/direct/timothy_tests/yaffs_tester.c
+++ b/direct/timothy_tests/yaffs_tester.c
@@ -1,4 +1,18 @@
-/*yaffs_tester.c*/
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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.
+ *
+ * yaffs_tester.c designed to stress test yaffs2 direct.
+ */
+
 
 #include "yaffs_tester.h"
 
@@ -24,17 +38,21 @@ int main(){
 
 
 void init(char *yaffs_test_dir,char *yaffs_mount_dir){
+       char output=0;
        /*these variables are already set to zero, but it is better not to take chances*/
        message_buffer.head=0;                           
        message_buffer.tail=0;
        
-       add_to_buffer(&message_buffer,"welcome to the yaffs tester",MESSAGE_LEVEL_BASIC_TASKS);/* print boot up message*/       
+       add_to_buffer(&message_buffer,"welcome to the yaffs tester",MESSAGE_LEVEL_BASIC_TASKS,PRINT);/* print boot up message*/ 
        yaffs_start_up();
        yaffs_mount(yaffs_mount_dir);
 
        if (yaffs_access(yaffs_test_dir,0))
        {
-               yaffs_mkdir(yaffs_test_dir,S_IREAD | S_IWRITE);
+               add_to_buffer(&message_buffer,"creating dir: ",MESSAGE_LEVEL_BASIC_TASKS,NPRINT);
+               append_to_buffer(&message_buffer,yaffs_test_dir,MESSAGE_LEVEL_BASIC_TASKS,PRINT);       
+               output=yaffs_mkdir(yaffs_test_dir,S_IREAD | S_IWRITE);
+               yaffs_check_for_errors(output, &message_buffer,"could not create dir","created dir\n\n");
        }
        
 }
@@ -44,9 +62,10 @@ void join_paths(char *path1,char *path2,char *new_path ){
        printf("strlen path2:%d\n",strlen(path2));
        printf("path1; %s\n",path1);
 */
-       //add_to_buffer(&message_buffer, "joining paths\0",MESSAGE_LEVEL_BASIC_TASKS);
-       add_to_buffer(&message_buffer,path1,MESSAGE_LEVEL_BASIC_TASKS);
-       add_to_buffer(&message_buffer, path2,MESSAGE_LEVEL_BASIC_TASKS);
+       add_to_buffer(&message_buffer, "joining paths:",MESSAGE_LEVEL_BASIC_TASKS,NPRINT);
+       append_to_buffer(&message_buffer,path1,MESSAGE_LEVEL_BASIC_TASKS,NPRINT);
+       append_to_buffer(&message_buffer, " and ",MESSAGE_LEVEL_BASIC_TASKS,NPRINT);
+       append_to_buffer(&message_buffer, path2,MESSAGE_LEVEL_BASIC_TASKS,PRINT);
        if ( (path1[(sizeof(path1)/sizeof(char))-2]=='/') && path2[0]!='/') {
                /*paths are compatiable. concatanate them. note -2 is because of \0*/  
                strcat(new_path,path1);
@@ -115,8 +134,8 @@ void test(char*yaffs_test_dir){
                path[0]='\0';// this should clear the path
                generate_random_string(name);
                join_paths(yaffs_test_dir,name,path);
-               add_to_buffer(&message_buffer,"trying to open file",MESSAGE_LEVEL_BASIC_TASKS);
-               add_to_buffer(&message_buffer,path,MESSAGE_LEVEL_BASIC_TASKS);
+               add_to_buffer(&message_buffer,"trying to open file: ",MESSAGE_LEVEL_BASIC_TASKS,NPRINT);
+               append_to_buffer(&message_buffer,path,MESSAGE_LEVEL_BASIC_TASKS,PRINT);
                output=yaffs_open(path,O_CREAT | O_TRUNC| O_RDWR, S_IREAD | S_IWRITE);
                yaffs_check_for_errors(output, &message_buffer,"failed to open file","opened file");
        }
@@ -124,12 +143,17 @@ void test(char*yaffs_test_dir){
 void  generate_random_string(char *ptr){
        unsigned int x;
        unsigned int length=((rand() %MAX_FILE_NAME_SIZE)+1);   /*creates a int with the number of charecters been between 1 and 51*/           
+       char letter='\0';
        //printf("generating string\n");
        //printf("string length is %d\n",length);
        for (x=0; x <= (length-2) &&length>2 ; x++)
        {
                //printf("x=%d\n",x);   
-               ptr[x]=(rand() % 126-32)+32;    /*generate a number between 32 and 126 and uses it as a charecter (letter) */
+               /* keep generating a charecter until the charecter is legal*/
+               while((letter=='\0' )||(letter=='/')||(letter=='\\')){
+                       letter=(rand() % 126-32)+32;    /*generate a number between 32 and 126 and uses it as a charecter (letter) */
+               }       
+               ptr[x]=letter;
                //printf("charecter generated is %c\n",ptr[x]);
        }
        ptr[x+1]='\0';  /*adds NULL charecter to turn it into a string*/