abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

slight changes (memset IOSlot; if(.. < 0) -> CHECK_ERR)

Browse Source 
This was SVN commit r1171.
This commit is contained in:
janwas 2004-09-19 19:28:00 +00:00
parent b459e7e640
commit 85cf439f62
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/lib/res/file.cpp
View File

@ -794,13 +794,9 @@ static ssize_t block_issue(File* f, IOSlot* slot, const off_t issue_ofs, void* b
buf = slot->temp_buf = mem_alloc(BLOCK_SIZE, BLOCK_SIZE);
{
// if using buffer, set position in it; otherwise, use temp buffer
int err = file_start_io(f, issue_ofs, BLOCK_SIZE, buf, &slot->io);
// if using buffer, set position in it; otherwise, use temp buffer
CHECK_ERR(file_start_io(f, issue_ofs, BLOCK_SIZE, buf, &slot->io));
if(err < 0)
issue_size = (ssize_t)err;
}
skip_issue:
return issue_size;
@ -938,6 +934,7 @@ debug_out("file_io fd=%d size=%d ofs=%d\n", f->fd, data_size, data_ofs);
{
// get next free IO slot in ring buffer
IOSlot* slot = &ios[head];
memset(slot, 0, sizeof(IOSlot));
head = (head + 1) % MAX_IOS;
pending_ios++;
@ -953,6 +950,7 @@ debug_out("file_io fd=%d size=%d ofs=%d\n", f->fd, data_size, data_ofs);
issue_cnt += issued;
if(issue_cnt >= actual_size)
all_issued = true;
}
// IO pending: wait for it to complete, and process it.
else if(pending_ios)
@ -976,8 +974,6 @@ debug_out("file_io fd=%d size=%d ofs=%d\n", f->fd, data_size, data_ofs);
err = (ssize_t)ret;
}
// first time; skip past padding
void* data = block;
if(raw_transferred_cnt == 0)
@ -991,6 +987,7 @@ debug_out("file_io fd=%d size=%d ofs=%d\n", f->fd, data_size, data_ofs);
size = data_size - raw_transferred_cnt;
// we have useable data from a previous temp buffer,
// but it needs to be copied into the user's buffer
if(from_cache && !temp)
@ -1027,6 +1024,7 @@ if(from_cache && !temp)
if(!slot->cached_block)
block_add(slot->block_id, slot->temp_buf);
}
}
// (all issued OR error) AND no pending transfers - done.
else