|
 |
69b435 |
Index: lock/lock.c
|
|
|
69b435 |
===================================================================
|
|
|
69b435 |
RCS file: /a/CVSROOT/db/lock/lock.c,v
|
|
|
69b435 |
retrieving revision 12.61
|
|
|
69b435 |
diff -c -r12.61 lock.c
|
|
|
69b435 |
*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61
|
|
|
69b435 |
--- lock/lock.c 19 Aug 2008 17:28:24 -0000
|
|
|
69b435 |
***************
|
|
|
69b435 |
*** 1278,1287 ****
|
|
|
69b435 |
SH_TAILQ_REMOVE(
|
|
|
69b435 |
<->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
|
|
|
69b435 |
if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
|
|
|
69b435 |
! LOCK_REGION_LOCK(env);
|
|
|
69b435 |
__env_alloc_free(<->reginfo,
|
|
|
69b435 |
SH_DBT_PTR(&sh_obj->lockobj));
|
|
|
69b435 |
! LOCK_REGION_UNLOCK(env);
|
|
|
69b435 |
}
|
|
|
69b435 |
SH_TAILQ_INSERT_HEAD(
|
|
|
69b435 |
&FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
|
|
|
69b435 |
--- 1278,1289 ----
|
|
|
69b435 |
SH_TAILQ_REMOVE(
|
|
|
69b435 |
<->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
|
|
|
69b435 |
if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
|
|
|
69b435 |
! if (region->part_t_size != 1)
|
|
|
69b435 |
! LOCK_REGION_LOCK(env);
|
|
|
69b435 |
__env_alloc_free(<->reginfo,
|
|
|
69b435 |
SH_DBT_PTR(&sh_obj->lockobj));
|
|
|
69b435 |
! if (region->part_t_size != 1)
|
|
|
69b435 |
! LOCK_REGION_UNLOCK(env);
|
|
|
69b435 |
}
|
|
|
69b435 |
SH_TAILQ_INSERT_HEAD(
|
|
|
69b435 |
&FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
|
|
|
69b435 |
***************
|
|
|
69b435 |
*** 1470,1484 ****
|
|
|
69b435 |
if (obj->size <= sizeof(sh_obj->objdata))
|
|
|
69b435 |
p = sh_obj->objdata;
|
|
|
69b435 |
else {
|
|
|
69b435 |
! LOCK_REGION_LOCK(env);
|
|
|
69b435 |
if ((ret =
|
|
|
69b435 |
__env_alloc(<->reginfo, obj->size, &p)) != 0) {
|
|
|
69b435 |
__db_errx(env,
|
|
|
69b435 |
"No space for lock object storage");
|
|
|
69b435 |
! LOCK_REGION_UNLOCK(env);
|
|
|
69b435 |
goto err;
|
|
|
69b435 |
}
|
|
|
69b435 |
! LOCK_REGION_UNLOCK(env);
|
|
|
69b435 |
}
|
|
|
69b435 |
|
|
|
69b435 |
memcpy(p, obj->data, obj->size);
|
|
|
69b435 |
--- 1472,1492 ----
|
|
|
69b435 |
if (obj->size <= sizeof(sh_obj->objdata))
|
|
|
69b435 |
p = sh_obj->objdata;
|
|
|
69b435 |
else {
|
|
|
69b435 |
! /*
|
|
|
69b435 |
! * If we have only one partition, the region is locked.
|
|
|
69b435 |
! */
|
|
|
69b435 |
! if (region->part_t_size != 1)
|
|
|
69b435 |
! LOCK_REGION_LOCK(env);
|
|
|
69b435 |
if ((ret =
|
|
|
69b435 |
__env_alloc(<->reginfo, obj->size, &p)) != 0) {
|
|
|
69b435 |
__db_errx(env,
|
|
|
69b435 |
"No space for lock object storage");
|
|
|
69b435 |
! if (region->part_t_size != 1)
|
|
|
69b435 |
! LOCK_REGION_UNLOCK(env);
|
|
|
69b435 |
goto err;
|
|
|
69b435 |
}
|
|
|
69b435 |
! if (region->part_t_size != 1)
|
|
|
69b435 |
! LOCK_REGION_UNLOCK(env);
|
|
|
69b435 |
}
|
|
|
69b435 |
|
|
|
69b435 |
memcpy(p, obj->data, obj->size);
|