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

Added persistified recursive updates. Should be tested.

Browse source
This commit is contained in:
Gilad Arnold 2004-12-16 23:41:57 +00:00
parent d401010e27
commit a7b1b70f74
2 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pobj/pobj.h
View file

@ -99,7 +99,7 @@ int pobj_update_range (void *, void *, size_t);
#define POBJ_UPDATE_FLD(obj,fld) \
pobj_update_range((obj), &((obj)->fld), sizeof((obj)->fld))
#define POBJ_UPDATE(obj) pobj_update_range ((obj), NULL, 0)
int pobj_update_recursive (void *);
int pobj_update_recursive (void *, int);
int pobj_static_set_ref (void *, void *);
int pobj_static_update_ref (void *);

58
src/pobj/pobj.c
View file

@ -959,7 +959,7 @@ pobj_update_range (void *obj, void *fld, size_t len)
int
pobj_update_recursive (void *obj)
pobj_update_recursive (void *obj, int persist)
{
void *pobj_update_queue[UPDATE_QUEUE_MAX];
struct hash_table *pobj_update_hash;
@ -977,6 +977,7 @@ pobj_update_recursive (void *obj)
int bit, complement;
void **ref;
void *next;
int fresh;
int ret;
/* Allocate temporary (growable) buffer. */
@ -1010,37 +1011,54 @@ pobj_update_recursive (void *obj)
if (q_head == UPDATE_QUEUE_MAX)
q_head = 0;
p = OBJ2POBJ (obj);
pobj_slot = POBJ2REPSLOT (p);
/* Mark visited. */
hash_insert (pobj_update_hash, OBJ2KEY (obj), 1);
/* Don't process a non-persistent object. */
if (p->rep_index < 1)
continue;
/* Persistify / skip object, as necessary. */
if (p->rep_index < 1) {
if (persist) {
debug ("persistifying %p (%p)", obj, (void *) p);
if (pobj_persistify (obj) < 0) {
debug ("error: persistification failed");
break;
}
fresh = 1;
}
else
continue;
}
else
fresh = 0;
processed++;
pobj_slot = POBJ2REPSLOT (p);
/* Grow temporary buffer as necessary. */
if (POBJ_SIZE (p->size) > tmp_size) {
XFREE (tmp);
tmp_size *= TMPBUF_GROW_FACTOR;
tmp = XMALLOC (tmp_size);
if (! tmp) {
debug ("error: allocation of temporary buffer failed");
ret = -1;
break;
/* Read persistent copy into temporary buffer (stale objects only). */
if (! fresh) {
/* Grow temporary buffer as necessary. */
if (POBJ_SIZE (p->size) > tmp_size) {
XFREE (tmp);
tmp_size *= TMPBUF_GROW_FACTOR;
tmp = XMALLOC (tmp_size);
if (! tmp) {
debug ("error: allocation of temporary buffer failed");
ret = -1;
break;
}
}
Tread (xid, pobj_slot->rid, tmp);
}
/* Read persistent copy into temporary buffer and compare. */
Tread (xid, pobj_slot->rid, tmp);
if (memcmp (p, tmp, p->size)) {
if (fresh || memcmp (p, tmp, p->size)) {
debug (" processing %p (%p): object changed, updating...",
obj, (void *) p);
/* Update persistent image. */
Tset (xid, pobj_slot->rid, p);
/* Update persistent image (stale only). */
if (! fresh)
Tset (xid, pobj_slot->rid, p);
/* Enqueue successors, if not yet processed. */
ref = (void **) obj;