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

the isolated flag must have higher precedence than the obsolete flag

Browse source
This commit is contained in:
nvt-se 2008-08-28 12:50:09 +00:00
parent dbde68654a
commit f122654317
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,14 +192,14 @@ get_sector_status(uint16_t sector, uint16_t *active,
last_pages_are_active = 1; last_pages_are_active = 1;
offset += hdr.max_pages * COFFEE_PAGE_SIZE; offset += hdr.max_pages * COFFEE_PAGE_SIZE;
*active += hdr.max_pages; *active += hdr.max_pages;
} else if(COFFEE_PAGE_OBSOLETE(hdr)) {
last_pages_are_active = 0;
offset += hdr.max_pages * COFFEE_PAGE_SIZE;
*obsolete += hdr.max_pages;
} else if(COFFEE_PAGE_ISOLATED(hdr)) { } else if(COFFEE_PAGE_ISOLATED(hdr)) {
last_pages_are_active = 0; last_pages_are_active = 0;
offset += COFFEE_PAGE_SIZE; offset += COFFEE_PAGE_SIZE;
*obsolete++; *obsolete++;
} else if(COFFEE_PAGE_OBSOLETE(hdr)) {
last_pages_are_active = 0;
offset += hdr.max_pages * COFFEE_PAGE_SIZE;
*obsolete += hdr.max_pages;
} else if(COFFEE_PAGE_FREE(hdr)) { } else if(COFFEE_PAGE_FREE(hdr)) {
*free = (end - offset) / COFFEE_PAGE_SIZE; *free = (end - offset) / COFFEE_PAGE_SIZE;
break; break;
@ -283,10 +283,10 @@ find_file(const char *name)
return page; return page;
} }
page += hdr.max_pages; page += hdr.max_pages;
} else if(COFFEE_PAGE_OBSOLETE(hdr)) {
page += hdr.max_pages;
} else if(COFFEE_PAGE_ISOLATED(hdr)) { } else if(COFFEE_PAGE_ISOLATED(hdr)) {
++page; ++page;
} else if(COFFEE_PAGE_OBSOLETE(hdr)) {
page += hdr.max_pages;
} else { } else {
/* It follows from the properties of the page allocation algorithm /* It follows from the properties of the page allocation algorithm
that if a free page is encountered, then the rest of the sector that if a free page is encountered, then the rest of the sector
@ -314,7 +314,7 @@ find_offset_in_file(int first_page)
search_limit = i + 1; search_limit = i + 1;
} }
} }
part_size = hdr.max_pages / (sizeof(hdr.eof_hint) * CHAR_BIT); part_size = hdr.max_pages / sizeof(hdr.eof_hint) / CHAR_BIT;
range_start = part_size * search_limit; range_start = part_size * search_limit;
range_end = range_start + part_size; range_end = range_start + part_size;
@ -497,16 +497,17 @@ read_log_page(struct file_header *hdr, int16_t last_entry, struct log_param *lp)
base -= current_batch_size * sizeof(indices[0]); base -= current_batch_size * sizeof(indices[0]);
COFFEE_READ(&indices, sizeof(indices[0]) * current_batch_size, base); COFFEE_READ(&indices, sizeof(indices[0]) * current_batch_size, base);
for(i = current_batch_size - 1; i >= 0; i--) { for(i = current_batch_size - 1; i >= 0; i--) {
if(indices[i] - 1 == page) { if(indices[i] - 1 == page) {
match_index = search_entries - processed - (current_batch_size - i); match_index = search_entries - processed - (current_batch_size - i);
break; break;
} }
} }
processed += current_batch_size; processed += current_batch_size;
} }
if(match_index == -1) { if(match_index == -1) {
return -1; return -1;
} }
@ -553,6 +554,7 @@ create_log(int16_t file_page, struct file_header *hdr)
size = log_entries * sizeof(uint16_t); size = log_entries * sizeof(uint16_t);
size += log_entries * log_entry_size; size += log_entries * log_entry_size;
log_page = cfs_coffee_reserve(create_log_name(log_name, sizeof(log_name), hdr->name), log_page = cfs_coffee_reserve(create_log_name(log_name, sizeof(log_name), hdr->name),
size); size);
if(log_page < 0) { if(log_page < 0) {
@ -757,6 +759,7 @@ cfs_open(const char *name, int flags)
fd = get_available_fd(); fd = get_available_fd();
if(fd < 0) { if(fd < 0) {
PRINTF("Coffee: failed to allocate a new file descriptor!\n");
return -1; return -1;
} }
@ -977,15 +980,14 @@ cfs_readdir(struct cfs_dir *dir, struct cfs_dirent *entry)
page = (page + COFFEE_PAGES_PER_SECTOR) & ~(COFFEE_PAGES_PER_SECTOR - 1); page = (page + COFFEE_PAGES_PER_SECTOR) & ~(COFFEE_PAGES_PER_SECTOR - 1);
} else if(COFFEE_PAGE_ISOLATED(hdr)) { } else if(COFFEE_PAGE_ISOLATED(hdr)) {
++page; ++page;
} else { } else if(COFFEE_PAGE_ACTIVE(hdr) && !COFFEE_PAGE_LOG(hdr)) {
if(COFFEE_PAGE_ACTIVE(hdr) && !COFFEE_PAGE_LOG(hdr)) {
memcpy(entry->name, hdr.name, sizeof(entry->name)); memcpy(entry->name, hdr.name, sizeof(entry->name));
entry->name[sizeof(entry->name) - 1] = '\0'; entry->name[sizeof(entry->name) - 1] = '\0';
entry->size = find_offset_in_file(page); entry->size = find_offset_in_file(page);
page += hdr.max_pages;
*(uint16_t *)dir->dummy_space = page; *(uint16_t *)dir->dummy_space = page;
page += hdr.max_pages;
return 0; return 0;
} } else {
page += hdr.max_pages; page += hdr.max_pages;
} }
} }