deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

increased sequential read performance by eliminating a header reading.

Browse source
This commit is contained in:
nvt-se 2008-09-21 15:01:48 +00:00
parent 4b6abd4fb7
commit ac6ce4cbf1
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/cfs/cfs-coffee.c
View file

@ -62,10 +62,11 @@
#define kb * 1024UL #define kb * 1024UL
#define Mb * (1024 kb) #define Mb * (1024 kb)
#define COFFEE_FD_FREE 0x0
#define COFFEE_FD_READ 0x1 #define COFFEE_FD_READ 0x1
#define COFFEE_FD_WRITE 0x2 #define COFFEE_FD_WRITE 0x2
#define COFFEE_FD_APPEND 0x4 #define COFFEE_FD_APPEND 0x4
#define COFFEE_FD_FREE 0x0 #define COFFEE_FD_MODIFIED 0x8
#define FD_VALID(fd) \ #define FD_VALID(fd) \
((fd) >= 0 && (fd) < COFFEE_FD_SET_SIZE && \ ((fd) >= 0 && (fd) < COFFEE_FD_SET_SIZE && \
@ -73,6 +74,7 @@
#define FD_READABLE(fd) (coffee_fd_set[(fd)].flags & CFS_READ) #define FD_READABLE(fd) (coffee_fd_set[(fd)].flags & CFS_READ)
#define FD_WRITABLE(fd) (coffee_fd_set[(fd)].flags & CFS_WRITE) #define FD_WRITABLE(fd) (coffee_fd_set[(fd)].flags & CFS_WRITE)
#define FD_APPENDABLE(fd) (coffee_fd_set[(fd)].flags & CFS_APPEND) #define FD_APPENDABLE(fd) (coffee_fd_set[(fd)].flags & CFS_APPEND)
#define FD_MODIFIED(fd) (coffee_fd_set[(fd)].flags & COFFEE_FD_MODIFIED)
/* File header flags. */ /* File header flags. */
#define COFFEE_FLAG_VALID 0x1 /* Completely written header. */ #define COFFEE_FLAG_VALID 0x1 /* Completely written header. */
@ -550,6 +552,7 @@ create_log(int16_t file_page, struct file_header *hdr)
unsigned char log_name[sizeof(hdr->name)]; unsigned char log_name[sizeof(hdr->name)];
uint16_t log_entry_size, log_entries; uint16_t log_entry_size, log_entries;
uint32_t size; uint32_t size;
int i;
log_entry_size = hdr->log_entry_size == 0 ? log_entry_size = hdr->log_entry_size == 0 ?
COFFEE_PAGE_SIZE : hdr->log_entry_size; COFFEE_PAGE_SIZE : hdr->log_entry_size;
@ -570,6 +573,11 @@ create_log(int16_t file_page, struct file_header *hdr)
READ_HEADER(hdr, log_page); READ_HEADER(hdr, log_page);
hdr->flags |= COFFEE_FLAG_LOG; hdr->flags |= COFFEE_FLAG_LOG;
WRITE_HEADER(hdr, log_page); WRITE_HEADER(hdr, log_page);
for(i = 0; i < COFFEE_FD_SET_SIZE; i++) {
if(coffee_fd_set[i].file_page == file_page) {
coffee_fd_set[i].flags |= COFFEE_FD_MODIFIED;
}
}
return log_page; return log_page;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -785,6 +793,9 @@ cfs_open(const char *name, int flags)
COFFEE_PAGE_SIZE - 1) / COFFEE_PAGE_SIZE; COFFEE_PAGE_SIZE - 1) / COFFEE_PAGE_SIZE;
} else { } else {
READ_HEADER(&hdr, page); READ_HEADER(&hdr, page);
if(COFFEE_PAGE_MODIFIED(hdr)) {
coffee_fd_set[fd].flags |= COFFEE_FD_MODIFIED;
}
coffee_fd_set[fd].max_pages = hdr.max_pages; coffee_fd_set[fd].max_pages = hdr.max_pages;
} }
@ -870,7 +881,7 @@ cfs_read(int fd, void *buf, unsigned size)
int32_t base, offset; int32_t base, offset;
struct log_param lp; struct log_param lp;
if(!FD_VALID(fd) || !FD_READABLE(fd)) { if(!(FD_VALID(fd) && FD_READABLE(fd))) {
return -1; return -1;
} }
@ -879,8 +890,6 @@ cfs_read(int fd, void *buf, unsigned size)
size = fdp->end - fdp->offset; size = fdp->end - fdp->offset;
} }
READ_HEADER(&hdr, fdp->file_page);
remains = size; remains = size;
base = fdp->offset; base = fdp->offset;
offset = 0; offset = 0;
@ -891,10 +900,11 @@ cfs_read(int fd, void *buf, unsigned size)
while(remains) { while(remains) {
watchdog_periodic(); watchdog_periodic();
r = -1; r = -1;
if(COFFEE_PAGE_MODIFIED(hdr)) { if(FD_MODIFIED(fd)) {
lp.offset = base + offset; lp.offset = base + offset;
lp.buf = (char *)buf + offset; lp.buf = (char *)buf + offset;
lp.size = remains; lp.size = remains;
READ_HEADER(&hdr, fdp->file_page);
r = read_log_page(&hdr, r = read_log_page(&hdr,
fdp->next_log_entry > 0 ? fdp->next_log_entry - 1 : -1, &lp); fdp->next_log_entry > 0 ? fdp->next_log_entry - 1 : -1, &lp);
if(r >= 0) { if(r >= 0) {
@ -921,7 +931,7 @@ cfs_write(int fd, const void *buf, unsigned size)
int i; int i;
struct log_param lp; struct log_param lp;
if(!FD_VALID(fd) || !FD_WRITABLE(fd)) { if(!(FD_VALID(fd) && FD_WRITABLE(fd))) {
return -1; return -1;
} }