Fix problem with checkpoint free space handling

diff --git a/direct/dtest.c b/direct/dtest.c
index ed552e75d5232b1e496135d4ba80a0d5b36d2f71..714cd0f9f4e012ddba066e9cd4cb19893bbbd290 100644 (file)
--- a/direct/dtest.c
+++ b/direct/dtest.c
@@ -1769,7 +1769,7 @@ void checkpoint_fill_test(const char *mountpt,int nmounts)
                
                yaffs_close(h);
                
-               for(j = 0; j < 100; j++){
+               for(j = 0; j < 2; j++){
                        printf("touch %d\n",j);
                        yaffs_touch(b);
                        yaffs_unmount(mountpt);
@@ -1782,6 +1782,95 @@ void checkpoint_fill_test(const char *mountpt,int nmounts)
 }
 
 
+int make_file2(const char *name1, const char *name2,int syz)
+{
+
+       char xx[2500];
+       int i;
+       int h1=-1,h2=-1;
+       int n = 1;
+
+
+       if(name1)
+               h1 = yaffs_open(name1,O_CREAT | O_TRUNC | O_RDWR, S_IREAD | S_IWRITE);
+       if(name2)
+               h2 = yaffs_open(name2,O_CREAT | O_TRUNC | O_RDWR, S_IREAD | S_IWRITE);
+       
+       while(syz > 0 && n > 0){
+               i = (syz > 2500) ? 2500 : syz;
+               n = yaffs_write(h1,xx,i);
+               n = yaffs_write(h2,xx,i);
+               syz -= 500;
+       }
+       yaffs_close(h1);
+       yaffs_close(h2);
+       
+}
+
+
+extern void SetCheckpointReservedBlocks(int n);
+
+void checkpoint_upgrade_test(const char *mountpt,int nmounts)
+{
+
+       char a[50];
+       char b[50];
+       char c[50];
+       char d[50];
+       
+       int i;
+       int j;
+       int h;
+       
+       sprintf(a,"%s/a",mountpt);
+       
+
+       
+       
+       printf("Create start condition\n");
+       yaffs_StartUp();
+       SetCheckpointReservedBlocks(0);
+       yaffs_mount(mountpt);
+       yaffs_mkdir(a,0);
+       sprintf(b,"%s/zz",a);
+       sprintf(c,"%s/xx",a);
+       make_file2(b,c,2000000);
+       sprintf(d,"%s/aa",a);
+       make_file2(d,NULL,500000000);
+       dump_directory_tree(mountpt);
+       
+       printf("Umount/mount attempt full\n");
+       yaffs_unmount(mountpt);
+       
+       SetCheckpointReservedBlocks(10);
+       yaffs_mount(mountpt);
+       
+       printf("unlink small file\n");
+       yaffs_unlink(c);
+       dump_directory_tree(mountpt);
+               
+       printf("Umount/mount attempt\n");
+       yaffs_unmount(mountpt);
+       yaffs_mount(mountpt);
+       
+       for(j = 0; j < 500; j++){
+               printf("***** touch %d\n",j);
+               dump_directory_tree(mountpt);
+               yaffs_touch(b);
+               yaffs_unmount(mountpt);
+               yaffs_mount(mountpt);
+       }
+
+       for(j = 0; j < 500; j++){
+               printf("***** touch %d\n",j);
+               dump_directory_tree(mountpt);
+               yaffs_touch(b);
+               yaffs_unmount(mountpt);
+               yaffs_mount(mountpt);
+       }
+}
+       
+
 
 int main(int argc, char *argv[])
 {
@@ -1800,7 +1889,8 @@ int main(int argc, char *argv[])
         //scan_pattern_test("/flash",10000,10);
        //short_scan_test("/flash/flash",40000,200);
         //multi_mount_test("/flash/flash",20);
-        checkpoint_fill_test("/flash/flash",20);
+        //checkpoint_fill_test("/flash/flash",20);
+        checkpoint_upgrade_test("/flash/flash",20);
 
 
        

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index 77cbbdf1f22088c097a7a8534cb85de8ea7d6db0..849a56d4b9555b0d28dcdc63462f0210477c3e1c 100644 (file)
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -13,7 +13,7 @@
 
 #include <errno.h>
 
-unsigned yaffs_traceMask = YAFFS_TRACE_SCAN |  YAFFS_TRACE_GC | YAFFS_TRACE_GC_DETAIL | YAFFS_TRACE_WRITE | YAFFS_TRACE_ERASE | YAFFS_TRACE_TRACING | YAFFS_TRACE_ALLOCATE | YAFFS_TRACE_CHECKPOINT;
+unsigned yaffs_traceMask = YAFFS_TRACE_SCAN |  YAFFS_TRACE_GC /*| YAFFS_TRACE_GC_DETAIL | YAFFS_TRACE_WRITE */ | YAFFS_TRACE_ERASE | YAFFS_TRACE_TRACING | YAFFS_TRACE_ALLOCATE | YAFFS_TRACE_CHECKPOINT;
 
 
 void yaffsfs_SetError(int err)
@@ -171,4 +171,8 @@ int yaffs_StartUp(void)
 
 
 
+void SetCheckpointReservedBlocks(int n)
+{
+       flashDev.nCheckpointReservedBlocks = n;
+}
 

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index f56b311bbae4a814a4aeb836feccbad3bec214e5..6ed976db80f795e3b34b2341d2e77784093e947c 100644 (file)
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -13,7 +13,7 @@
  */
 
 const char *yaffs_checkptrw_c_version =
-    "$Id: yaffs_checkptrw.c,v 1.3 2006-05-21 09:39:12 charles Exp $";
+    "$Id: yaffs_checkptrw.c,v 1.4 2006-05-23 19:08:41 charles Exp $";
 
 
 #include "yaffs_checkptrw.h"
@@ -80,7 +80,6 @@ static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
                        yaffs_BlockInfo *bi = &dev->blockInfo[i];
                        if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
                                dev->checkpointNextBlock = i + 1;
-                               dev->nErasedBlocks--;
                                dev->checkpointCurrentBlock = i;
                                T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
                                return;
@@ -136,7 +135,7 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
                return 0;
                        
        if(!dev->checkpointBuffer)
-               dev->checkpointBuffer = YMALLOC(dev->nBytesPerChunk);
+               dev->checkpointBuffer = YMALLOC_DMA(dev->nBytesPerChunk);
        if(!dev->checkpointBuffer)
                return 0;
 
@@ -193,6 +192,13 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
        tags.chunkId = dev->checkpointPageSequence + 1;
        tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
        tags.byteCount = dev->nBytesPerChunk;
+       if(dev->checkpointCurrentChunk == 0){
+               /* First chunk we write for the block? Set block state to
+                  checkpoint */
+               yaffs_BlockInfo *bi = &dev->blockInfo[dev->checkpointCurrentBlock];
+               bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
+               dev->blocksInCheckpoint++;
+       }
        
        chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;