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

broke out the essence of the search algorithm to a separate function.

Browse source
This commit is contained in:
nvt-se 2009-02-19 21:35:38 +00:00
parent 710e5c621c
commit 957ae56b13
1 changed files with 27 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -279,6 +279,19 @@ cfs_garbage_collect(void)
watchdog_start(); watchdog_start();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static coffee_page_t
next_file(coffee_page_t page, struct file_header *hdr)
{
coffee_page_t next_page;
if(HDR_FREE(*hdr)) {
return (page + COFFEE_PAGES_PER_SECTOR) & ~(COFFEE_PAGES_PER_SECTOR - 1);
} else if(HDR_ISOLATED(*hdr)) {
return page + 1;
}
return page + hdr->max_pages;
}
/*---------------------------------------------------------------------------*/
static struct file * static struct file *
load_file(const char *name, struct file_header *hdr, coffee_page_t start) load_file(const char *name, struct file_header *hdr, coffee_page_t start)
{ {
@ -336,26 +349,12 @@ find_file(const char *name)
} }
/* Scan the flash memory sequentially otherwise. */ /* Scan the flash memory sequentially otherwise. */
page = 0; for(page = 0; page < COFFEE_PAGE_COUNT; page = next_file(page, &hdr)) {
do {
read_header(&hdr, page); read_header(&hdr, page);
if(HDR_ACTIVE(hdr)) { if(HDR_ACTIVE(hdr) && strcmp(name, hdr.name) == 0) {
if(strcmp(name, hdr.name) == 0) {
return load_file(name, &hdr, page); return load_file(name, &hdr, page);
} }
page += hdr.max_pages;
} else if(HDR_ISOLATED(hdr)) {
++page;
} else if(HDR_OBSOLETE(hdr)) {
page += hdr.max_pages;
} else {
/* It follows from the properties of the page allocation algorithm
that if a free page is encountered, then the rest of the sector
is also free. */
page = (page + COFFEE_PAGES_PER_SECTOR) & ~(COFFEE_PAGES_PER_SECTOR - 1);
} }
watchdog_periodic();
} while(page < COFFEE_PAGE_COUNT);
return NULL; return NULL;
} }
@ -460,15 +459,15 @@ find_contiguous_pages(coffee_page_t amount)
start = page; start = page;
} }
/* Jump to the next sector. */ /* All remaining pages in this sector are free -- jump to the next sector. */
page = (page + COFFEE_PAGES_PER_SECTOR) & ~(COFFEE_PAGES_PER_SECTOR - 1); page = next_file(page, &hdr);
if(start + amount <= page) { if(start + amount <= page) {
return start; return start;
} }
} else { } else {
start = -1; start = -1;
page += HDR_ISOLATED(hdr) ? 1 : hdr.max_pages; page = next_file(page, &hdr);
} }
} }
return -1; return -1;
@ -648,8 +647,7 @@ read_log_page(struct file_header *hdr, int16_t last_record, struct log_param *lp
return -1; return -1;
} }
base = hdr->log_page * COFFEE_PAGE_SIZE; base = absolute_offset(hdr->log_page, log_records * sizeof(region));
base += sizeof(struct file_header) + log_records * sizeof(region);
base += (coffee_offset_t)match_index * log_record_size; base += (coffee_offset_t)match_index * log_record_size;
base += lp->offset; base += lp->offset;
COFFEE_READ(lp->buf, lp->size, base); COFFEE_READ(lp->buf, lp->size, base);
@ -1139,20 +1137,14 @@ cfs_readdir(struct cfs_dir *dir, struct cfs_dirent *record)
for(page = *(coffee_page_t *)dir->dummy_space; page < COFFEE_PAGE_COUNT;) { for(page = *(coffee_page_t *)dir->dummy_space; page < COFFEE_PAGE_COUNT;) {
watchdog_periodic(); watchdog_periodic();
read_header(&hdr, page); read_header(&hdr, page);
if(HDR_FREE(hdr)) { if(HDR_ACTIVE(hdr) && !HDR_LOG(hdr)) {
page = (page + COFFEE_PAGES_PER_SECTOR) & ~(COFFEE_PAGES_PER_SECTOR - 1);
} else if(HDR_ISOLATED(hdr)) {
++page;
} else if(HDR_ACTIVE(hdr) && !HDR_LOG(hdr)) {
memcpy(record->name, hdr.name, sizeof(record->name)); memcpy(record->name, hdr.name, sizeof(record->name));
record->name[sizeof(record->name) - 1] = '\0'; record->name[sizeof(record->name) - 1] = '\0';
record->size = file_end(page); record->size = file_end(page);
page += hdr.max_pages; *(coffee_page_t *)dir->dummy_space = next_file(page, &hdr);
*(coffee_page_t *)dir->dummy_space = page;
return 0; return 0;
} else {
page += hdr.max_pages;
} }
page = next_file(page, &hdr);
} }
return -1; return -1;