X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs.c;h=f40d310d8d3bae3d77f500dbd6640f30b9054700;hb=b30ca67e54f665181d85a49bff3af2862e86601e;hp=3bac5f08a2a79630f21ecb5d17ccdb977048139e;hpb=e3ac88edc8a5021cfd2709483368dde576047b48;p=bertos.git

diff --git a/bertos/fs/battfs.c b/bertos/fs/battfs.c
index 3bac5f08..f40d310d 100644
--- a/bertos/fs/battfs.c
+++ b/bertos/fs/battfs.c
@@ -32,7 +32,6 @@
  *
  * \brief BattFS: a filesystem for embedded platforms (implementation).
  *
- * \version $Id$
  *
  * \author Francesco Sacchi <batt@develer.com>
  *
@@ -367,6 +366,7 @@ bool battfs_mount(struct BattFsSuper *disk, struct KBlock *dev, pgcnt_t *page_ar
 	pgoff_t filelen_table[BATTFS_MAX_FILES];
 
 	ASSERT(dev);
+	ASSERT(kblock_partialWrite(dev));
 	disk->dev = dev;
 
 	ASSERT(disk->dev->blk_size > BATTFS_HEADER_LEN);
@@ -583,22 +583,33 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 
 	if (fd->seek_pos > fd->size)
 	{
-		// TODO: renew this last page only if needed
 		if (!readHdr(disk, fdb->start[fdb->max_off], &curr_hdr))
 		{
 			fdb->errors |= BATTFS_DISK_READ_ERR;
 			return total_write;
 		}
 
-		new_page = renewPage(disk, fdb->start[fdb->max_off]);
-		if (new_page == NO_SPACE)
+		/*
+		 * Renew page only if is not in cache.
+		 * This avoids rewriting the same page continuously
+		 * if the user code keeps writing in the same portion
+		 * of the file.
+		 */
+		if (kblock_buffered(disk->dev)
+			&& ((fdb->start[fdb->max_off] != kblock_cachedBlock(disk->dev)) || !kblock_cacheDirty(disk->dev)))
 		{
-			fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
-			return total_write;
-		}
+			new_page = renewPage(disk, fdb->start[fdb->max_off]);
+			if (new_page == NO_SPACE)
+			{
+				fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
+				return total_write;
+			}
 
-		kblock_copy(disk->dev, fdb->start[fdb->max_off], new_page);
-		fdb->start[fdb->max_off] = new_page;
+			kblock_copy(disk->dev, fdb->start[fdb->max_off], new_page);
+			fdb->start[fdb->max_off] = new_page;
+		}
+		else
+			new_page = fdb->start[fdb->max_off];
 
 		/* Fill unused space of first page with 0s */
 		uint8_t dummy = 0;
@@ -692,27 +703,37 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 		}
 		else
 		{
-			// TODO: do not renew page if its cached
 			if (!readHdr(disk, fdb->start[pg_offset], &curr_hdr))
 			{
 				fdb->errors |= BATTFS_DISK_READ_ERR;
 				return total_write;
 			}
 
-			new_page = renewPage(disk, fdb->start[pg_offset]);
-			if (new_page == NO_SPACE)
+			/* Renew page only if is not in cache. */
+			if (kblock_buffered(disk->dev)
+				&& ((fdb->start[fdb->max_off] != kblock_cachedBlock(disk->dev)) || !kblock_cacheDirty(disk->dev)))
 			{
-				fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
-				return total_write;
-			}
+				new_page = renewPage(disk, fdb->start[pg_offset]);
+				if (new_page == NO_SPACE)
+				{
+					fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
+					return total_write;
+				}
 
-			LOG_INFO("Re-writing page %d to %d\n", fdb->start[pg_offset], new_page);
-			if (kblock_copy(disk->dev, fdb->start[pg_offset], new_page) != 0)
+				LOG_INFO("Re-writing page %d to %d\n", fdb->start[pg_offset], new_page);
+				if (kblock_copy(disk->dev, fdb->start[pg_offset], new_page) != 0)
+				{
+					fdb->errors |= BATTFS_DISK_WRITE_ERR;
+					return total_write;
+				}
+				fdb->start[pg_offset] = new_page;
+			}
+			else
 			{
-				fdb->errors |= BATTFS_DISK_WRITE_ERR;
-				return total_write;
+				LOG_INFO("Using cached block %d\n", fdb->start[pg_offset]);
+				new_page = fdb->start[pg_offset];
 			}
-			fdb->start[pg_offset] = new_page;
+
 			curr_hdr.seq++;
 		}
 		//LOG_INFO("writing to buffer for page %d, offset %d, size %d\n", disk->curr_page, addr_offset, wr_len);