X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs.c;h=ca13600caf6ff7933d684bde3f59830e35a5bde3;hb=661b0df2a780f14694463915ae6103e58a69cd12;hp=eedbced535a92550b9fb9c56abd6da70d4ca92fb;hpb=c8e5377ce867a1e4fbe193c3a61b2ce473184d70;p=bertos.git

diff --git a/bertos/fs/battfs.c b/bertos/fs/battfs.c
index eedbced5..ca13600c 100644
--- a/bertos/fs/battfs.c
+++ b/bertos/fs/battfs.c
@@ -195,6 +195,22 @@ static bool setBufferHdr(struct BattFsSuper *disk, struct BattFsPageHeader *hdr)
 	return true;
 }
 
+static bool getBufferHdr(struct BattFsSuper *disk, struct BattFsPageHeader *hdr)
+{
+	uint8_t buf[BATTFS_HEADER_LEN];
+
+	if (disk->bufferRead(disk, disk->page_size - BATTFS_HEADER_LEN, buf, BATTFS_HEADER_LEN)
+	    != BATTFS_HEADER_LEN)
+	{
+		LOG_ERR("reading from buffer\n");
+		return false;
+	}
+
+	disk_to_battfs(buf, hdr);
+
+	return true;
+}
+
 /**
  * Count the number of pages from
  * inode 0 to \a inode in \a filelen_table.
@@ -384,8 +400,7 @@ static bool flushBuffer(struct BattFsSuper *disk)
 	{
 		LOG_INFO("Flushing to disk page %d\n", disk->curr_page);
 
-		if (!(setBufferHdr(disk, &disk->curr_hdr)
-			&& disk->erase(disk, disk->curr_page)
+		if (!(disk->erase(disk, disk->curr_page)
 			&& disk->save(disk, disk->curr_page)))
 			return false;
 
@@ -397,26 +412,23 @@ static bool flushBuffer(struct BattFsSuper *disk)
 /**
  * Load \a new_page from \a disk in disk page buffer.
  * If a previuos page is still dirty in the buffer, will be
- * flushed first.
+ * flushed first. The new page header loaded will be put in \a new_hdr.
  * \return true if ok, false on errors.
  */
-static bool loadPage(struct BattFsSuper *disk, pgcnt_t new_page)
+static bool loadPage(struct BattFsSuper *disk, pgcnt_t new_page, BattFsPageHeader *new_hdr)
 {
 	if (disk->curr_page == new_page)
-		return true;
+		return getBufferHdr(disk, new_hdr);
 
 	LOG_INFO("Loading page %d\n", new_page);
 
 	if (!(flushBuffer(disk)
-		&& disk->load(disk, new_page)))
+		&& disk->load(disk, new_page)
+		&& getBufferHdr(disk, new_hdr)))
 		return false;
 
 	disk->curr_page = new_page;
 
-	/* Load current header */
-	if (!readHdr(disk, disk->curr_page, &disk->curr_hdr))
-		return false;
-
 	return true;
 }
 
@@ -462,7 +474,6 @@ bool battfs_init(struct BattFsSuper *disk)
 	disk->cache_dirty = false;
 	disk->curr_page = 0;
 	disk->load(disk, disk->curr_page);
-	readHdr(disk, disk->curr_page, &disk->curr_hdr);
 
 	/* Count pages per file */
 	if (!countDiskFilePages(disk, filelen_table))
@@ -483,12 +494,12 @@ bool battfs_init(struct BattFsSuper *disk)
 		LOG_ERR("filling page array\n");
 		return false;
 	}
-	#if LOG_LEVEL > LOG_LVL_INFO
-		dumpPageArray(disk)
+	#if LOG_LEVEL >= LOG_LVL_INFO
+		dumpPageArray(disk);
 	#endif
 	#warning TODO: shuffle free blocks
 	//#if LOG_LEVEL > LOG_LVL_INFO
-	//	dumpPageArray(disk)
+	//	dumpPageArray(disk);
 	//#endif
 	/* Init list for opened files. */
 	LIST_INIT(&disk->file_opened_list);
@@ -523,7 +534,7 @@ static int battfs_fileclose(struct KFile *fd)
 }
 
 
-static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode, pgoff_t pgoff)
+static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode, pgoff_t pgoff, BattFsPageHeader *new_hdr)
 {
 	if (disk->free_page_start >= disk->page_count)
 	{
@@ -551,12 +562,11 @@ static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode,
 	disk->page_array[new_pos] = disk->curr_page;
 	disk->cache_dirty = true;
 
-	disk->curr_hdr.inode = inode;
-	disk->curr_hdr.pgoff =  pgoff;
-	disk->curr_hdr.fill = 0;
-	disk->curr_hdr.seq = 0;
-	setBufferHdr(disk, &disk->curr_hdr);
-	return true;
+	new_hdr->inode = inode;
+	new_hdr->pgoff =  pgoff;
+	new_hdr->fill = 0;
+	new_hdr->seq = 0;
+	return setBufferHdr(disk, new_hdr);
 }
 
 /**
@@ -572,8 +582,59 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 	pgoff_t pg_offset;
 	pgaddr_t addr_offset;
 	pgaddr_t wr_len;
+	BattFsPageHeader curr_hdr;
 
-	#warning TODO seek_pos > size?
+	if (fd->seek_pos < 0)
+		return total_write;
+
+	if ((fd->seek_pos / (fdb->disk->page_size - BATTFS_HEADER_LEN)) > fdb->max_off)
+	{
+		/*
+		 * Handle writing when seek pos if far over EOF,
+		 * We need to allocate the missing pages first.
+		 */
+		pgoff_t missing_pages = fd->seek_pos / (fdb->disk->page_size - BATTFS_HEADER_LEN) - fdb->max_off;
+
+		LOG_INFO("missing pages: %d\n", missing_pages);
+		if (!loadPage(fdb->disk, fdb->start[fdb->max_off], &curr_hdr))
+		{
+				#warning TODO set error?
+				return total_write;
+		}
+
+		uint8_t dummy = 0xff;
+		/* Add missing pages to reach current seek_pos */
+		while (missing_pages--)
+		{
+			/* Update size and free space left */
+			fd->size += (fdb->disk->page_size - BATTFS_HEADER_LEN) - curr_hdr.fill;
+			fdb->disk->free_bytes -= (fdb->disk->page_size - BATTFS_HEADER_LEN) - curr_hdr.fill;
+
+			/* Fill empty space with 0xFF */
+			for (addr_offset = curr_hdr.fill; addr_offset < (fdb->disk->page_size - BATTFS_HEADER_LEN); addr_offset++)
+			{
+				if (fdb->disk->bufferWrite(fdb->disk, addr_offset, &dummy, 1) != 1)
+				{
+					#warning TODO set error?
+				}
+			}
+			curr_hdr.fill = (fdb->disk->page_size - BATTFS_HEADER_LEN);
+			setBufferHdr(fdb->disk, &curr_hdr);
+
+			/* Get the new page needed */
+			if (!getNewPage(fdb->disk, (fdb->start - fdb->disk->page_array) + fdb->max_off + 1, fdb->inode, fdb->max_off + 1, &curr_hdr))
+				return total_write;
+
+			fdb->max_off++;
+		}
+		/* Fix sizes for the last new page (could be only partially full) */
+		curr_hdr.fill = fd->seek_pos % (fdb->disk->page_size - BATTFS_HEADER_LEN);
+		setBufferHdr(fdb->disk, &curr_hdr);
+		fd->size += curr_hdr.fill;
+		fdb->disk->free_bytes -= curr_hdr.fill;
+	}
+	else if (!getBufferHdr(fdb->disk, &curr_hdr))
+		return total_write;
 
 	while (size)
 	{
@@ -585,7 +646,7 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 		if (pg_offset > fdb->max_off)
 		{
 			LOG_INFO("New page needed, pg_offset %d, pos %d\n", pg_offset, (fdb->start - fdb->disk->page_array) + pg_offset);
-			if (!getNewPage(fdb->disk, (fdb->start - fdb->disk->page_array) + pg_offset, fdb->inode, pg_offset))
+			if (!getNewPage(fdb->disk, (fdb->start - fdb->disk->page_array) + pg_offset, fdb->inode, pg_offset, &curr_hdr))
 				return total_write;
 			fdb->max_off = pg_offset;
 		}
@@ -593,7 +654,7 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 		else if (fdb->start[pg_offset] != fdb->disk->curr_page)
 		{
 			LOG_INFO("Re-writing page %d to %d\n", fdb->start[pg_offset], fdb->disk->page_array[fdb->disk->free_page_start]);
-			if (!loadPage(fdb->disk, fdb->start[pg_offset]))
+			if (!loadPage(fdb->disk, fdb->start[pg_offset], &curr_hdr))
 			{
 				#warning TODO set error?
 				return total_write;
@@ -608,7 +669,7 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 			fdb->disk->page_array[fdb->disk->page_count - 1] = fdb->start[pg_offset];
 			/* Assign new page */
 			fdb->start[pg_offset] = fdb->disk->curr_page;
-			fdb->disk->curr_hdr.seq++;
+			curr_hdr.seq++;
 		}
 
 
@@ -623,11 +684,15 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 		fd->seek_pos += wr_len;
 		total_write += wr_len;
 		buf += wr_len;
-		fill_t fill_delta = MAX((int32_t)(addr_offset + wr_len) - fdb->disk->curr_hdr.fill, (int32_t)0);
+		fill_t fill_delta = MAX((int32_t)(addr_offset + wr_len) - curr_hdr.fill, (int32_t)0);
 		fdb->disk->free_bytes -= fill_delta;
-		fdb->disk->curr_hdr.fill += fill_delta;
 		fd->size += fill_delta;
-		//LOG_INFO("free_bytes %d, seek_pos %d, size %d, curr_hdr.fill %d\n", fdb->disk->free_bytes, fd->seek_pos, fd->size, fdb->disk->curr_hdr.fill);
+		curr_hdr.fill += fill_delta;
+
+		if (!setBufferHdr(fdb->disk, &curr_hdr))
+			return total_write;
+
+		//LOG_INFO("free_bytes %d, seek_pos %d, size %d, curr_hdr.fill %d\n", fdb->disk->free_bytes, fd->seek_pos, fd->size, curr_hdr.fill);
 	}
 	return total_write;
 }
@@ -647,7 +712,10 @@ static size_t battfs_read(struct KFile *fd, void *_buf, size_t size)
 	pgaddr_t addr_offset;
 	pgaddr_t read_len;
 
-	size = MIN((kfile_off_t)size, fd->size - fd->seek_pos);
+	if (fd->seek_pos < 0)
+		return total_read;
+
+	size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, 0));
 
 	while (size)
 	{
@@ -655,6 +723,7 @@ static size_t battfs_read(struct KFile *fd, void *_buf, size_t size)
 		addr_offset = fd->seek_pos % (fdb->disk->page_size - BATTFS_HEADER_LEN);
 		read_len = MIN(size, (size_t)(fdb->disk->page_size - BATTFS_HEADER_LEN - addr_offset));
 
+		//LOG_INFO("reading from page %d, offset %d, size %d\n", fdb->start[pg_offset], addr_offset, read_len);
 		/* Read from disk */
 		if (diskRead(fdb->disk, fdb->start[pg_offset], addr_offset, buf, read_len) != read_len)
 		{
@@ -764,7 +833,8 @@ bool battfs_fileopen(BattFsSuper *disk, BattFs *fd, inode_t inode, filemode_t mo
 		if (!(mode & BATTFS_CREATE))
 			return false;
 		/* Create the file */
-		if (!(getNewPage(disk, start_pos, inode, 0)))
+		BattFsPageHeader hdr;
+		if (!(getNewPage(disk, start_pos, inode, 0, &hdr)))
 			return false;
 	}
 	fd->start = &disk->page_array[start_pos];