[Zodb-checkins] SVN: ZODB/trunk/src/ We recently added estimated_size. We originally added it as a new
Jim Fulton
jim at zope.com
Sat Sep 27 15:29:36 EDT 2008
Log message for revision 91565:
We recently added estimated_size. We originally added it as a new
unsigned long field after a signed char state field and a 3-character
reserved field. This didn't work because there are packages in the
wild that have their own copies of cPersistence.h that didn't see the
update.
To get around this, we used the reserved space by making
estimated_size a 24-bit bit field in the space occupied by the old
3-character reserved field. To fit in 24 bits, we made the units of
estimated_size 64-character blocks. This allows is to handle up to a
GB. We should never see that, but to be paranoid, we also truncate
sizes greater than 1GB. We also set the minimum size to 64 bytes.
Changed:
U ZODB/trunk/src/BTrees/BTreeModuleTemplate.c
U ZODB/trunk/src/persistent/cPersistence.c
U ZODB/trunk/src/persistent/cPersistence.h
U ZODB/trunk/src/persistent/cPickleCache.c
U ZODB/trunk/src/persistent/tests/persistent.txt
-=-
Modified: ZODB/trunk/src/BTrees/BTreeModuleTemplate.c
===================================================================
--- ZODB/trunk/src/BTrees/BTreeModuleTemplate.c 2008-09-27 17:39:15 UTC (rev 91564)
+++ ZODB/trunk/src/BTrees/BTreeModuleTemplate.c 2008-09-27 19:29:35 UTC (rev 91565)
@@ -323,8 +323,23 @@
trailing = first;
PER_USE_OR_RETURN(first, -1);
first = first->next;
- PER_UNUSE(trailing);
+
+
+
+
+
+
+ ((trailing)->state==cPersistent_STICKY_STATE
+ &&
+ ((trailing)->state=cPersistent_UPTODATE_STATE));
+
+ PER_ACCESSED(trailing);
+
+
+
+
+
if (first == *current) {
*current = trailing;
result = 1;
Modified: ZODB/trunk/src/persistent/cPersistence.c
===================================================================
--- ZODB/trunk/src/persistent/cPersistence.c 2008-09-27 17:39:15 UTC (rev 91564)
+++ ZODB/trunk/src/persistent/cPersistence.c 2008-09-27 19:29:35 UTC (rev 91565)
@@ -89,7 +89,8 @@
if (self->cache) {
/* Create a node in the ring for this unghostified object. */
self->cache->non_ghost_count++;
- self->cache->total_estimated_size += self->estimated_size;
+ self->cache->total_estimated_size +=
+ _estimated_size_in_bytes(self->estimated_size);
ring_add(&self->cache->ring_home, &self->ring);
Py_INCREF(self);
}
@@ -145,7 +146,8 @@
/* if we're ghostifying an object, we better have some non-ghosts */
assert(self->cache->non_ghost_count > 0);
self->cache->non_ghost_count--;
- self->cache->total_estimated_size -= self->estimated_size;
+ self->cache->total_estimated_size -=
+ _estimated_size_in_bytes(self->estimated_size);
ring_del(&self->ring);
}
@@ -176,7 +178,8 @@
/* If we're ghostifying an object, we better have some non-ghosts. */
assert(self->cache->non_ghost_count > 0);
self->cache->non_ghost_count--;
- self->cache->total_estimated_size -= self->estimated_size;
+ self->cache->total_estimated_size -=
+ _estimated_size_in_bytes(self->estimated_size);
ring_del(&self->ring);
self->state = cPersistent_GHOST_STATE;
dictptr = _PyObject_GetDictPtr((PyObject *)self);
@@ -1017,29 +1020,30 @@
static PyObject *
Per_get_estimated_size(cPersistentObject *self)
{
- return PyInt_FromLong(self->estimated_size);
+ return PyInt_FromLong(_estimated_size_in_bytes(self->estimated_size));
}
static int
Per_set_estimated_size(cPersistentObject *self, PyObject *v)
{
- if (v) {
- if (PyInt_Check(v)) {
- if (PyInt_AS_LONG(v) < 0) {
- PyErr_SetString(PyExc_ValueError,
- "_p_estimated_size must not be negative");
- return -1;
- }
- self->estimated_size = PyInt_AS_LONG(v);
- }
- else {
- PyErr_SetString(PyExc_ValueError,
- "_p_estimated_size must be an integer");
- return -1;
- }
- } else
- self->estimated_size = 0;
- return 0;
+ if (v) {
+ if (PyInt_Check(v)) {
+ long lv = PyInt_AS_LONG(v);
+ if (lv < 0) {
+ PyErr_SetString(PyExc_ValueError,
+ "_p_estimated_size must not be negative");
+ return -1;
+ }
+ self->estimated_size = _estimated_size_in_24_bits(lv);
+ }
+ else {
+ PyErr_SetString(PyExc_ValueError,
+ "_p_estimated_size must be an integer");
+ return -1;
+ }
+ } else
+ self->estimated_size = 0;
+ return 0;
}
static PyGetSetDef Per_getsets[] = {
Modified: ZODB/trunk/src/persistent/cPersistence.h
===================================================================
--- ZODB/trunk/src/persistent/cPersistence.h 2008-09-27 17:39:15 UTC (rev 91564)
+++ ZODB/trunk/src/persistent/cPersistence.h 2008-09-27 19:29:35 UTC (rev 91565)
@@ -24,7 +24,7 @@
PyObject_HEAD \
CPersistentRing ring_home; \
int non_ghost_count; \
- PY_LONG_LONG total_estimated_size; /* total estimated size of items in cache */
+ PY_LONG_LONG total_estimated_size;
struct ccobject_head_struct;
@@ -60,10 +60,29 @@
PerCache *cache; \
CPersistentRing ring; \
char serial[8]; \
- signed char state; \
- unsigned char reserved[3]; \
- unsigned long estimated_size;
+ signed state:8; \
+ unsigned estimated_size:24;
+/* We recently added estimated_size. We originally added it as a new
+ unsigned long field after a signed char state field and a
+ 3-character reserved field. This didn't work because there
+ are packages in the wild that have their own copies of cPersistence.h
+ that didn't see the update.
+
+ To get around this, we used the reserved space by making
+ estimated_size a 24-bit bit field in the space occupied by the old
+ 3-character reserved field. To fit in 24 bits, we made the units
+ of estimated_size 64-character blocks. This allows is to handle up
+ to a GB. We should never see that, but to be paranoid, we also
+ truncate sizes greater than 1GB. We also set the minimum size to
+ 64 bytes.
+
+ We use the _estimated_size_in_24_bits and _estimated_size_in_bytes
+ macros both to avoid repetition and to make intent a little clearer.
+*/
+#define _estimated_size_in_24_bits(I) ((I) > 1073741696 ? 16777215 : (I)/64+1)
+#define _estimated_size_in_bytes(I) ((I)*64)
+
#define cPersistent_GHOST_STATE -1
#define cPersistent_UPTODATE_STATE 0
#define cPersistent_CHANGED_STATE 1
Modified: ZODB/trunk/src/persistent/cPickleCache.c
===================================================================
--- ZODB/trunk/src/persistent/cPickleCache.c 2008-09-27 17:39:15 UTC (rev 91564)
+++ ZODB/trunk/src/persistent/cPickleCache.c 2008-09-27 19:29:35 UTC (rev 91565)
@@ -638,27 +638,29 @@
static PyObject *
cc_update_object_size_estimation(ccobject *self, PyObject *args)
{
- PyObject *oid;
- cPersistentObject *v;
- unsigned int new_size;
- if (!PyArg_ParseTuple(args, "OI:updateObjectSizeEstimation", &oid, &new_size))
- return NULL;
- /* Note: reference borrowed */
- v = (cPersistentObject *)PyDict_GetItem(self->data, oid);
- if (v) {
- /* we know this object -- update our "total_size_estimation"
- we must only update when the object is in the ring
- */
- if (v->ring.r_next) {
- self->total_estimated_size += new_size - v->estimated_size;
- /* we do this in "Connection" as we need it even when the
- object is not in the cache (or not the ring)
- */
- /* v->estimated_size = new_size; */
- }
+ PyObject *oid;
+ cPersistentObject *v;
+ unsigned int new_size;
+ if (!PyArg_ParseTuple(args, "OI:updateObjectSizeEstimation", &oid, &new_size))
+ return NULL;
+ /* Note: reference borrowed */
+ v = (cPersistentObject *)PyDict_GetItem(self->data, oid);
+ if (v) {
+ /* we know this object -- update our "total_size_estimation"
+ we must only update when the object is in the ring
+ */
+ if (v->ring.r_next) {
+ self->total_estimated_size += _estimated_size_in_bytes(
+ _estimated_size_in_24_bits(new_size) - v->estimated_size
+ );
+ /* we do this in "Connection" as we need it even when the
+ object is not in the cache (or not the ring)
+ */
+ /* v->estimated_size = new_size; */
}
- Py_RETURN_NONE;
- }
+ }
+ Py_RETURN_NONE;
+}
static struct PyMethodDef cc_methods[] = {
@@ -1058,7 +1060,8 @@
static PyMemberDef cc_members[] = {
{"cache_size", T_INT, offsetof(ccobject, cache_size)},
{"cache_size_bytes", T_LONG, offsetof(ccobject, cache_size_bytes)},
- {"total_estimated_size", T_LONG, offsetof(ccobject, total_estimated_size), RO},
+ {"total_estimated_size", T_LONG, offsetof(ccobject, total_estimated_size),
+ RO},
{"cache_drain_resistance", T_INT,
offsetof(ccobject, cache_drain_resistance)},
{"cache_non_ghost_count", T_INT, offsetof(ccobject, non_ghost_count), RO},
Modified: ZODB/trunk/src/persistent/tests/persistent.txt
===================================================================
--- ZODB/trunk/src/persistent/tests/persistent.txt 2008-09-27 17:39:15 UTC (rev 91564)
+++ ZODB/trunk/src/persistent/tests/persistent.txt 2008-09-27 19:29:35 UTC (rev 91565)
@@ -94,7 +94,13 @@
0
>>> p._p_estimated_size = 1000
>>> p._p_estimated_size
- 1000
+ 1024
+
+Huh? Why is the estimated size coming out different than what we put
+in? The reason is that the size isn't stored exactly. For backward
+compatibility reasons, the size needs to fit in 24 bits, so,
+internally, it is adjusted somewhat.
+
>>> p._p_estimated_size = -1
Traceback (most recent call last):
....
More information about the Zodb-checkins
mailing list