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

Refactor regions to avoid hack during startup. It used to allocate a dummy log entry, then free it. This causes trouble with the upcoming log api, since the log implementation will need to manage log entry memory for performance reasons.

Browse source
This commit is contained in:
Sears Russell 2010-01-07 21:57:13 +00:00
parent 0ac0a768aa
commit 44e5e8b4fc
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/stasis/operations/regions.c
View file

@ -19,20 +19,23 @@ static int readBoundaryTag(int xid, pageid_t page, boundary_tag* tag);
static void TsetBoundaryTag(int xid, pageid_t page, boundary_tag* tag); static void TsetBoundaryTag(int xid, pageid_t page, boundary_tag* tag);
static void TdeallocBoundaryTag(int xid, pageid_t page); static void TdeallocBoundaryTag(int xid, pageid_t page);
static int alloc_boundary_tag(int xid, Page *p, const boundary_tag *arg) {
stasis_page_slotted_initialize_page(p);
recordid rid = {p->id, 0, sizeof(boundary_tag)};
p->pageType = BOUNDARY_TAG_PAGE;
stasis_record_alloc_done(xid, p, rid);
byte *buf = stasis_record_write_begin(xid, p, rid);
memcpy(buf, arg, sizeof(boundary_tag));
stasis_record_write_done(xid, p, rid, buf);
return 0;
}
/** This doesn't need a latch since it is only initiated within nested /** This doesn't need a latch since it is only initiated within nested
top actions (and is local to this file. During abort(), the nested top actions (and is local to this file. During abort(), the nested
top action's logical undo grabs the necessary latches. top action's logical undo grabs the necessary latches.
*/ */
static int op_alloc_boundary_tag(const LogEntry* e, Page* p) { static int op_alloc_boundary_tag(const LogEntry* e, Page* p) {
stasis_page_slotted_initialize_page(p); return alloc_boundary_tag(e->xid, p, stasis_log_entry_update_args_cptr(e));
recordid rid = {p->id, 0, sizeof(boundary_tag)};
assert(e->update.arg_size == sizeof(boundary_tag));
p->pageType = BOUNDARY_TAG_PAGE;
stasis_record_alloc_done(e->xid, p, rid);
byte * buf = stasis_record_write_begin(e->xid, p, rid);
memcpy(buf, stasis_log_entry_update_args_cptr(e), stasis_record_length_read(e->xid, p, rid));
stasis_record_write_done(e->xid, p, rid, buf);
return 0;
} }
static int op_alloc_region(const LogEntry *e, Page* p) { static int op_alloc_region(const LogEntry *e, Page* p) {
@ -152,16 +155,9 @@ void regionsInit(stasis_log_t *log) {
// flush the page, since this code is deterministic, and will be // flush the page, since this code is deterministic, and will be
// re-run before recovery if this update doesn't make it to disk // re-run before recovery if this update doesn't make it to disk
// after a crash. // after a crash.
// recordid rid = {0,0,sizeof(boundary_tag)};
// hack; allocate a fake log entry; pass it into ourselves.
LogEntry * e = allocUpdateLogEntry(log, 0,0,OPERATION_ALLOC_BOUNDARY_TAG,
p->id, sizeof(boundary_tag));
memcpy(stasis_log_entry_update_args_ptr(e), &t, sizeof(boundary_tag));
writelock(p->rwlatch,0); writelock(p->rwlatch,0);
op_alloc_boundary_tag(e,p); alloc_boundary_tag(-1, p, &t);
unlock(p->rwlatch); unlock(p->rwlatch);
freeLogEntry(log, e);
} }
holding_mutex = 0; holding_mutex = 0;
releasePage(p); releasePage(p);