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

- new log semantics: read the previous log entry only if the new one doesn't completely overshadow it.

Browse source 
- bug fix: prohibit file reservations with names that already exist.
This commit is contained in:
nvt-se 2008-10-16 12:54:36 +00:00
parent ea9c3ab98c
commit 8bb7e37baf
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -730,12 +730,12 @@ write_log_page(struct file_desc *fdp, struct log_param *lp)
{ {
unsigned char copy_buf[log_entry_size]; unsigned char copy_buf[log_entry_size];
lp_out.offset = page * log_entry_size; lp_out.offset = page * log_entry_size;
lp_out.buf = copy_buf; lp_out.buf = copy_buf;
lp_out.size = log_entry_size; lp_out.size = log_entry_size;
if((lp->offset > 0 || log_entry_size == COFFEE_PAGE_SIZE) && if((lp->offset > 0 || lp->size != log_entry_size) &&
read_log_page(&hdr, fdp->next_log_entry > 0 ? fdp->next_log_entry - 1 : -1, &lp_out) < 0) { read_log_page(&hdr, fdp->next_log_entry > 0 ? fdp->next_log_entry - 1 : -1, &lp_out) < 0) {
COFFEE_READ(copy_buf, sizeof(copy_buf), COFFEE_READ(copy_buf, sizeof(copy_buf),
ABS_OFFSET(fdp->file_page, page * log_entry_size)); ABS_OFFSET(fdp->file_page, page * log_entry_size));
@ -1043,6 +1043,10 @@ cfs_coffee_reserve(const char *name, uint32_t size)
unsigned need_pages; unsigned need_pages;
int page; int page;
if(find_file(name) >= 0) {
return -1;
}
need_pages = (size + sizeof(hdr) + COFFEE_PAGE_SIZE - 1) / COFFEE_PAGE_SIZE; need_pages = (size + sizeof(hdr) + COFFEE_PAGE_SIZE - 1) / COFFEE_PAGE_SIZE;
watchdog_stop(); watchdog_stop();