greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove redundant rwlatch acquistions from pageHandle

Browse source
This commit is contained in:
Sears Russell 2011-08-19 22:11:51 +00:00
parent 6f3399a9a7
commit 41f57f46ba
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/stasis/pageHandle.c
View file

@ -11,12 +11,9 @@
*/
static void phWrite(stasis_page_handle_t * ph, Page * ret) {
DEBUG("\nPAGEWRITE %lld\n", ret->id);
// This lock is only held to make the page implementation happy. We should
// implicitly have exclusive access to the page before this function is called,
// or we'll deadlock.
int locked = trywritelock(ret->rwlatch,0);
assert(locked);
if(!ret->dirty) { unlock(ret->rwlatch); return; }
// The caller guarantees that we have exclusive access to the page, so
// no further latching is necessary.
if(!ret->dirty) { return; }
stasis_page_flushed(ret);
if(ph->log) { stasis_log_force(ph->log, ret->LSN, LOG_FORCE_WAL); }
int err = ((stasis_handle_t*)ph->impl)->write(ph->impl, PAGE_SIZE * ret->id, ret->memAddr, PAGE_SIZE);
@ -26,11 +23,10 @@ static void phWrite(stasis_page_handle_t * ph, Page * ret) {
abort();
}
stasis_dirty_page_table_set_clean(ph->dirtyPages, ret);
unlock(ret->rwlatch);
}
static void phRead(stasis_page_handle_t * ph, Page * ret, pagetype_t type) {
int locked = trywritelock(ret->rwlatch,0);
assert(locked);
// The caller guarantees that we have exclusive access to the page, so
// no further latching is necessary.
int err = ((stasis_handle_t*)ph->impl)->read(ph->impl, PAGE_SIZE * ret->id, ret->memAddr, PAGE_SIZE);
if(err) {
if(err == EDOM) {
@ -44,7 +40,6 @@ static void phRead(stasis_page_handle_t * ph, Page * ret, pagetype_t type) {
}
assert(!ret->dirty);
stasis_page_loaded(ret, type);
unlock(ret->rwlatch);
}
static void phPrefetchRange(stasis_page_handle_t *ph, pageid_t pageid, pageid_t count) {
// TODO RTFM and see if Linux provides a decent API for prefetch hints.