Skip to content

Z
ZEO
Commit 7d3371e5 authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Changed object header layout and added sticky feature.

parent afdc1bbd
Show whitespace changes
Inline Side-by-side
Showing with 222 additions and 147 deletions
src/Persistence/cPickleCache.c
View file @ 7d3371e5
/* /*
$Id: cPickleCache.c,v 1.5 1997/04/15 19:03:29 jim Exp $ $Id: cPickleCache.c,v 1.6 1997/04/22 02:45:24 jim Exp $
C implementation of a pickle jar cache. C implementation of a pickle jar cache.
...@@ -56,16 +56,18 @@ ...@@ -56,16 +56,18 @@
(540) 371-6909 (540) 371-6909
***************************************************************************/ ***************************************************************************/
static char *what_string = "$Id: cPickleCache.c,v 1.5 1997/04/15 19:03:29 jim Exp $"; static char *what_string = "$Id: cPickleCache.c,v 1.6 1997/04/22 02:45:24 jim Exp $";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
#define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V) #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
#define Py_ASSIGN(P,E) if(!PyObject_AssignExpression(&(P),(E))) return NULL #define Py_ASSIGN(P,E) if(!PyObject_AssignExpression(&(P),(E))) return NULL
#include "Python.h" #include "cPersistence.h"
#include <time.h> #include <time.h>
#undef Py_FindMethod
static PyObject *py_reload, *py__p_jar, *py__p_atime, *py__p___reinit__; static PyObject *py_reload, *py__p_jar, *py__p_atime, *py__p___reinit__;
...@@ -83,11 +85,6 @@ staticforward PyTypeObject Cctype; ...@@ -83,11 +85,6 @@ staticforward PyTypeObject Cctype;
static PyObject *PATimeType=NULL; static PyObject *PATimeType=NULL;
typedef struct {
PyObject_HEAD
time_t value;
} PATimeobject;
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
...@@ -95,21 +92,25 @@ static int ...@@ -95,21 +92,25 @@ static int
gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt) gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt)
{ {
PyObject *atime; PyObject *atime;
time_t t;
if(v && key) if(v && key)
{ {
if(PyTuple_GET_ITEM(v,0)->ob_refcnt <= 1) if(v->ob_type==(PyTypeObject*)PATimeType)
{
if(((PATimeobject*)v)->object->ob_refcnt <= 1)
{ {
UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1; UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1;
} }
else if(! dt || else
((atime=PyTuple_GET_ITEM(v,1)) && {
now-((PATimeobject*)atime)->value >dt)) t=((PATimeobject*)v)->object->atime;
if(t != (time_t)1 && (! dt || now-t > dt))
{ {
/* We have a cPersistent object that hasn't been used in /* We have a cPersistent object that hasn't been used in
a while. Reinitialize it, hopefully freeing it's state. a while. Reinitialize it, hopefully freeing it's state.
*/ */
v=PyTuple_GET_ITEM(v,0); v=(PyObject*)(((PATimeobject*)v)->object);
if(key=PyObject_GetAttr(v,py__p___reinit__)) if(key=PyObject_GetAttr(v,py__p___reinit__))
{ {
ASSIGN(key,PyObject_CallObject(key,NULL)); ASSIGN(key,PyObject_CallObject(key,NULL));
...@@ -119,6 +120,12 @@ gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt) ...@@ -119,6 +120,12 @@ gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt)
PyErr_Clear(); PyErr_Clear();
} }
} }
}
else if(v->ob_refcnt <= 1)
{
UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1;
}
}
return 0; return 0;
} }
...@@ -129,6 +136,7 @@ fullgc(ccobject *self) ...@@ -129,6 +136,7 @@ fullgc(ccobject *self)
int i; int i;
time_t now, dt; time_t now, dt;
if(self->cache_size < 1) return 0;
i=PyDict_Size(self->data)-3/self->cache_size; i=PyDict_Size(self->data)-3/self->cache_size;
if(i < 3) i=3; if(i < 3) i=3;
dt=self->cache_age*3/i; dt=self->cache_age*3/i;
...@@ -161,27 +169,37 @@ reallyfullgc(ccobject *self) ...@@ -161,27 +169,37 @@ reallyfullgc(ccobject *self)
static int static int
maybegc(ccobject *self, PyObject *thisv) maybegc(ccobject *self, PyObject *thisv)
{ {
int n, s; int n, s, size;
time_t now,dt; time_t now,dt;
PyObject *key=0, *v=0; PyObject *key=0, *v=0;
/*printf("m");*/
if(self->cache_size < 1) return 0;
s=PyDict_Size(self->data)-3; s=PyDict_Size(self->data)-3;
if(s < self->cache_size) return 0; if(s < self->cache_size) return 0;
n=s/self->cache_size; size=self->cache_size;
self->cache_size=0;
n=s/size;
if(n < 3) n=3; if(n < 3) n=3;
dt=3 * self->cache_age/n; dt=self->cache_age;
if(dt < 60) dt=60; if(dt < 1) dt=1;
now=time(NULL); now=time(NULL);
while(--n >= 0) while(--n >= 0)
{ {
if(PyDict_Next(self->data, &(self->position), &key, &v)) if(PyDict_Next(self->data, &(self->position), &key, &v))
{ {
if(v != thisv && gc_item(self,key,v,now,dt) < 0) return -1; if(v != thisv && gc_item(self,key,v,now,dt) < 0)
{
self->cache_size=size;
return -1;
}
} }
else else
self->position=0; self->position=0;
} }
self->cache_size=size;
return 0; return 0;
} }
...@@ -225,8 +243,8 @@ newccobject(int cache_size, int cache_age) ...@@ -225,8 +243,8 @@ newccobject(int cache_size, int cache_age)
if(self->data=PyDict_New()) if(self->data=PyDict_New())
{ {
self->position=0; self->position=0;
self->cache_size=cache_size < 1 ? 1 : cache_size; self->cache_size=cache_size;
self->cache_age=cache_size < 1 ? 1 : cache_age; self->cache_age=cache_age < 1 ? 1 : cache_age;
return self; return self;
} }
Py_DECREF(self); Py_DECREF(self);
...@@ -277,7 +295,7 @@ cc_setattr(ccobject *self, char *name, PyObject *value) ...@@ -277,7 +295,7 @@ cc_setattr(ccobject *self, char *name, PyObject *value)
if(strcmp(name,"cache_size")==0) if(strcmp(name,"cache_size")==0)
{ {
UNLESS(PyArg_Parse(value,"i",&v)) return -1; UNLESS(PyArg_Parse(value,"i",&v)) return -1;
if(v > 0)self->cache_size=v; self->cache_size=v;
return 0; return 0;
} }
} }
...@@ -322,38 +340,42 @@ cc_subscript(ccobject *self, PyObject *key) ...@@ -322,38 +340,42 @@ cc_subscript(ccobject *self, PyObject *key)
Py_DECREF(r); Py_DECREF(r);
return NULL; return NULL;
} }
ASSIGN(r,PySequence_GetItem(r,0)); if(r->ob_type==(PyTypeObject *)PATimeType)
{
Py_DECREF(r);
r=(PyObject*)(((PATimeobject*)r)->object);
Py_INCREF(r);
}
return r; return r;
} }
static int static int
cc_ass_sub(ccobject *self, PyObject *key, PyObject *v) cc_ass_sub(ccobject *self, PyObject *key, PyObject *v)
{ {
if(v) if(v)
{ {
PyObject *t; int r;
PyObject *t=0;
/* Create a tuple to hold object and object access time */
UNLESS(t=PyTuple_New(2)) return -1;
/* Save value as first item in tuple */
Py_INCREF(v);
PyTuple_SET_ITEM(t,0,v);
/* Now get and save the access time */ /* Now get and save the access time */
if(v=PyObject_GetAttr(v,py__p_atime)) if(t=PyObject_GetAttr(v,py__p_atime))
{
if(t->ob_type != (PyTypeObject *)PATimeType)
{ {
if(v->ob_type == (PyTypeObject *)PATimeType) Py_DECREF(t);
PyTuple_SET_ITEM(t,1,v); t=0;
}
else else
Py_DECREF(v); v=t;
} }
else else
PyErr_Clear(); PyErr_Clear();
UNLESS(-1 != PyDict_SetItem(self->data,key,t)) return -1; r=PyDict_SetItem(self->data,key,v);
Py_DECREF(t); Py_XDECREF(t);
return maybegc(self, t); if(r < 0) return -1;
return maybegc(self, v);
} }
else else
{ {
...@@ -436,7 +458,7 @@ void ...@@ -436,7 +458,7 @@ void
initcPickleCache() initcPickleCache()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.5 $"; char *rev="$Revision: 1.6 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
...@@ -464,6 +486,9 @@ initcPickleCache() ...@@ -464,6 +486,9 @@ initcPickleCache()
/****************************************************************************** /******************************************************************************
$Log: cPickleCache.c,v $ $Log: cPickleCache.c,v $
Revision 1.6 1997/04/22 02:45:24 jim
Changed object header layout and added sticky feature.
Revision 1.5 1997/04/15 19:03:29 jim Revision 1.5 1997/04/15 19:03:29 jim
Fixed leak introduced in last revision. :-( Fixed leak introduced in last revision. :-(
......
src/ZODB/cPickleCache.c
View file @ 7d3371e5
/* /*
$Id: cPickleCache.c,v 1.5 1997/04/15 19:03:29 jim Exp $ $Id: cPickleCache.c,v 1.6 1997/04/22 02:45:24 jim Exp $
C implementation of a pickle jar cache. C implementation of a pickle jar cache.
...@@ -56,16 +56,18 @@ ...@@ -56,16 +56,18 @@
(540) 371-6909 (540) 371-6909
***************************************************************************/ ***************************************************************************/
static char *what_string = "$Id: cPickleCache.c,v 1.5 1997/04/15 19:03:29 jim Exp $"; static char *what_string = "$Id: cPickleCache.c,v 1.6 1997/04/22 02:45:24 jim Exp $";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
#define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V) #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
#define Py_ASSIGN(P,E) if(!PyObject_AssignExpression(&(P),(E))) return NULL #define Py_ASSIGN(P,E) if(!PyObject_AssignExpression(&(P),(E))) return NULL
#include "Python.h" #include "cPersistence.h"
#include <time.h> #include <time.h>
#undef Py_FindMethod
static PyObject *py_reload, *py__p_jar, *py__p_atime, *py__p___reinit__; static PyObject *py_reload, *py__p_jar, *py__p_atime, *py__p___reinit__;
...@@ -83,11 +85,6 @@ staticforward PyTypeObject Cctype; ...@@ -83,11 +85,6 @@ staticforward PyTypeObject Cctype;
static PyObject *PATimeType=NULL; static PyObject *PATimeType=NULL;
typedef struct {
PyObject_HEAD
time_t value;
} PATimeobject;
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
...@@ -95,21 +92,25 @@ static int ...@@ -95,21 +92,25 @@ static int
gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt) gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt)
{ {
PyObject *atime; PyObject *atime;
time_t t;
if(v && key) if(v && key)
{ {
if(PyTuple_GET_ITEM(v,0)->ob_refcnt <= 1) if(v->ob_type==(PyTypeObject*)PATimeType)
{
if(((PATimeobject*)v)->object->ob_refcnt <= 1)
{ {
UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1; UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1;
} }
else if(! dt || else
((atime=PyTuple_GET_ITEM(v,1)) && {
now-((PATimeobject*)atime)->value >dt)) t=((PATimeobject*)v)->object->atime;
if(t != (time_t)1 && (! dt || now-t > dt))
{ {
/* We have a cPersistent object that hasn't been used in /* We have a cPersistent object that hasn't been used in
a while. Reinitialize it, hopefully freeing it's state. a while. Reinitialize it, hopefully freeing it's state.
*/ */
v=PyTuple_GET_ITEM(v,0); v=(PyObject*)(((PATimeobject*)v)->object);
if(key=PyObject_GetAttr(v,py__p___reinit__)) if(key=PyObject_GetAttr(v,py__p___reinit__))
{ {
ASSIGN(key,PyObject_CallObject(key,NULL)); ASSIGN(key,PyObject_CallObject(key,NULL));
...@@ -119,6 +120,12 @@ gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt) ...@@ -119,6 +120,12 @@ gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt)
PyErr_Clear(); PyErr_Clear();
} }
} }
}
else if(v->ob_refcnt <= 1)
{
UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1;
}
}
return 0; return 0;
} }
...@@ -129,6 +136,7 @@ fullgc(ccobject *self) ...@@ -129,6 +136,7 @@ fullgc(ccobject *self)
int i; int i;
time_t now, dt; time_t now, dt;
if(self->cache_size < 1) return 0;
i=PyDict_Size(self->data)-3/self->cache_size; i=PyDict_Size(self->data)-3/self->cache_size;
if(i < 3) i=3; if(i < 3) i=3;
dt=self->cache_age*3/i; dt=self->cache_age*3/i;
...@@ -161,27 +169,37 @@ reallyfullgc(ccobject *self) ...@@ -161,27 +169,37 @@ reallyfullgc(ccobject *self)
static int static int
maybegc(ccobject *self, PyObject *thisv) maybegc(ccobject *self, PyObject *thisv)
{ {
int n, s; int n, s, size;
time_t now,dt; time_t now,dt;
PyObject *key=0, *v=0; PyObject *key=0, *v=0;
/*printf("m");*/
if(self->cache_size < 1) return 0;
s=PyDict_Size(self->data)-3; s=PyDict_Size(self->data)-3;
if(s < self->cache_size) return 0; if(s < self->cache_size) return 0;
n=s/self->cache_size; size=self->cache_size;
self->cache_size=0;
n=s/size;
if(n < 3) n=3; if(n < 3) n=3;
dt=3 * self->cache_age/n; dt=self->cache_age;
if(dt < 60) dt=60; if(dt < 1) dt=1;
now=time(NULL); now=time(NULL);
while(--n >= 0) while(--n >= 0)
{ {
if(PyDict_Next(self->data, &(self->position), &key, &v)) if(PyDict_Next(self->data, &(self->position), &key, &v))
{ {
if(v != thisv && gc_item(self,key,v,now,dt) < 0) return -1; if(v != thisv && gc_item(self,key,v,now,dt) < 0)
{
self->cache_size=size;
return -1;
}
} }
else else
self->position=0; self->position=0;
} }
self->cache_size=size;
return 0; return 0;
} }
...@@ -225,8 +243,8 @@ newccobject(int cache_size, int cache_age) ...@@ -225,8 +243,8 @@ newccobject(int cache_size, int cache_age)
if(self->data=PyDict_New()) if(self->data=PyDict_New())
{ {
self->position=0; self->position=0;
self->cache_size=cache_size < 1 ? 1 : cache_size; self->cache_size=cache_size;
self->cache_age=cache_size < 1 ? 1 : cache_age; self->cache_age=cache_age < 1 ? 1 : cache_age;
return self; return self;
} }
Py_DECREF(self); Py_DECREF(self);
...@@ -277,7 +295,7 @@ cc_setattr(ccobject *self, char *name, PyObject *value) ...@@ -277,7 +295,7 @@ cc_setattr(ccobject *self, char *name, PyObject *value)
if(strcmp(name,"cache_size")==0) if(strcmp(name,"cache_size")==0)
{ {
UNLESS(PyArg_Parse(value,"i",&v)) return -1; UNLESS(PyArg_Parse(value,"i",&v)) return -1;
if(v > 0)self->cache_size=v; self->cache_size=v;
return 0; return 0;
} }
} }
...@@ -322,38 +340,42 @@ cc_subscript(ccobject *self, PyObject *key) ...@@ -322,38 +340,42 @@ cc_subscript(ccobject *self, PyObject *key)
Py_DECREF(r); Py_DECREF(r);
return NULL; return NULL;
} }
ASSIGN(r,PySequence_GetItem(r,0)); if(r->ob_type==(PyTypeObject *)PATimeType)
{
Py_DECREF(r);
r=(PyObject*)(((PATimeobject*)r)->object);
Py_INCREF(r);
}
return r; return r;
} }
static int static int
cc_ass_sub(ccobject *self, PyObject *key, PyObject *v) cc_ass_sub(ccobject *self, PyObject *key, PyObject *v)
{ {
if(v) if(v)
{ {
PyObject *t; int r;
PyObject *t=0;
/* Create a tuple to hold object and object access time */
UNLESS(t=PyTuple_New(2)) return -1;
/* Save value as first item in tuple */
Py_INCREF(v);
PyTuple_SET_ITEM(t,0,v);
/* Now get and save the access time */ /* Now get and save the access time */
if(v=PyObject_GetAttr(v,py__p_atime)) if(t=PyObject_GetAttr(v,py__p_atime))
{
if(t->ob_type != (PyTypeObject *)PATimeType)
{ {
if(v->ob_type == (PyTypeObject *)PATimeType) Py_DECREF(t);
PyTuple_SET_ITEM(t,1,v); t=0;
}
else else
Py_DECREF(v); v=t;
} }
else else
PyErr_Clear(); PyErr_Clear();
UNLESS(-1 != PyDict_SetItem(self->data,key,t)) return -1; r=PyDict_SetItem(self->data,key,v);
Py_DECREF(t); Py_XDECREF(t);
return maybegc(self, t); if(r < 0) return -1;
return maybegc(self, v);
} }
else else
{ {
...@@ -436,7 +458,7 @@ void ...@@ -436,7 +458,7 @@ void
initcPickleCache() initcPickleCache()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.5 $"; char *rev="$Revision: 1.6 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
...@@ -464,6 +486,9 @@ initcPickleCache() ...@@ -464,6 +486,9 @@ initcPickleCache()
/****************************************************************************** /******************************************************************************
$Log: cPickleCache.c,v $ $Log: cPickleCache.c,v $
Revision 1.6 1997/04/22 02:45:24 jim
Changed object header layout and added sticky feature.
Revision 1.5 1997/04/15 19:03:29 jim Revision 1.5 1997/04/15 19:03:29 jim
Fixed leak introduced in last revision. :-( Fixed leak introduced in last revision. :-(
......
src/persistent/cPickleCache.c
View file @ 7d3371e5
/* /*
$Id: cPickleCache.c,v 1.5 1997/04/15 19:03:29 jim Exp $ $Id: cPickleCache.c,v 1.6 1997/04/22 02:45:24 jim Exp $
C implementation of a pickle jar cache. C implementation of a pickle jar cache.
...@@ -56,16 +56,18 @@ ...@@ -56,16 +56,18 @@
(540) 371-6909 (540) 371-6909
***************************************************************************/ ***************************************************************************/
static char *what_string = "$Id: cPickleCache.c,v 1.5 1997/04/15 19:03:29 jim Exp $"; static char *what_string = "$Id: cPickleCache.c,v 1.6 1997/04/22 02:45:24 jim Exp $";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
#define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V) #define UNLESS_ASSIGN(V,E) ASSIGN(V,E) UNLESS(V)
#define Py_ASSIGN(P,E) if(!PyObject_AssignExpression(&(P),(E))) return NULL #define Py_ASSIGN(P,E) if(!PyObject_AssignExpression(&(P),(E))) return NULL
#include "Python.h" #include "cPersistence.h"
#include <time.h> #include <time.h>
#undef Py_FindMethod
static PyObject *py_reload, *py__p_jar, *py__p_atime, *py__p___reinit__; static PyObject *py_reload, *py__p_jar, *py__p_atime, *py__p___reinit__;
...@@ -83,11 +85,6 @@ staticforward PyTypeObject Cctype; ...@@ -83,11 +85,6 @@ staticforward PyTypeObject Cctype;
static PyObject *PATimeType=NULL; static PyObject *PATimeType=NULL;
typedef struct {
PyObject_HEAD
time_t value;
} PATimeobject;
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
...@@ -95,21 +92,25 @@ static int ...@@ -95,21 +92,25 @@ static int
gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt) gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt)
{ {
PyObject *atime; PyObject *atime;
time_t t;
if(v && key) if(v && key)
{ {
if(PyTuple_GET_ITEM(v,0)->ob_refcnt <= 1) if(v->ob_type==(PyTypeObject*)PATimeType)
{
if(((PATimeobject*)v)->object->ob_refcnt <= 1)
{ {
UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1; UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1;
} }
else if(! dt || else
((atime=PyTuple_GET_ITEM(v,1)) && {
now-((PATimeobject*)atime)->value >dt)) t=((PATimeobject*)v)->object->atime;
if(t != (time_t)1 && (! dt || now-t > dt))
{ {
/* We have a cPersistent object that hasn't been used in /* We have a cPersistent object that hasn't been used in
a while. Reinitialize it, hopefully freeing it's state. a while. Reinitialize it, hopefully freeing it's state.
*/ */
v=PyTuple_GET_ITEM(v,0); v=(PyObject*)(((PATimeobject*)v)->object);
if(key=PyObject_GetAttr(v,py__p___reinit__)) if(key=PyObject_GetAttr(v,py__p___reinit__))
{ {
ASSIGN(key,PyObject_CallObject(key,NULL)); ASSIGN(key,PyObject_CallObject(key,NULL));
...@@ -119,6 +120,12 @@ gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt) ...@@ -119,6 +120,12 @@ gc_item(ccobject *self, PyObject *key, PyObject *v, time_t now, time_t dt)
PyErr_Clear(); PyErr_Clear();
} }
} }
}
else if(v->ob_refcnt <= 1)
{
UNLESS(-1 != PyDict_DelItem(self->data, key)) return -1;
}
}
return 0; return 0;
} }
...@@ -129,6 +136,7 @@ fullgc(ccobject *self) ...@@ -129,6 +136,7 @@ fullgc(ccobject *self)
int i; int i;
time_t now, dt; time_t now, dt;
if(self->cache_size < 1) return 0;
i=PyDict_Size(self->data)-3/self->cache_size; i=PyDict_Size(self->data)-3/self->cache_size;
if(i < 3) i=3; if(i < 3) i=3;
dt=self->cache_age*3/i; dt=self->cache_age*3/i;
...@@ -161,27 +169,37 @@ reallyfullgc(ccobject *self) ...@@ -161,27 +169,37 @@ reallyfullgc(ccobject *self)
static int static int
maybegc(ccobject *self, PyObject *thisv) maybegc(ccobject *self, PyObject *thisv)
{ {
int n, s; int n, s, size;
time_t now,dt; time_t now,dt;
PyObject *key=0, *v=0; PyObject *key=0, *v=0;
/*printf("m");*/
if(self->cache_size < 1) return 0;
s=PyDict_Size(self->data)-3; s=PyDict_Size(self->data)-3;
if(s < self->cache_size) return 0; if(s < self->cache_size) return 0;
n=s/self->cache_size; size=self->cache_size;
self->cache_size=0;
n=s/size;
if(n < 3) n=3; if(n < 3) n=3;
dt=3 * self->cache_age/n; dt=self->cache_age;
if(dt < 60) dt=60; if(dt < 1) dt=1;
now=time(NULL); now=time(NULL);
while(--n >= 0) while(--n >= 0)
{ {
if(PyDict_Next(self->data, &(self->position), &key, &v)) if(PyDict_Next(self->data, &(self->position), &key, &v))
{ {
if(v != thisv && gc_item(self,key,v,now,dt) < 0) return -1; if(v != thisv && gc_item(self,key,v,now,dt) < 0)
{
self->cache_size=size;
return -1;
}
} }
else else
self->position=0; self->position=0;
} }
self->cache_size=size;
return 0; return 0;
} }
...@@ -225,8 +243,8 @@ newccobject(int cache_size, int cache_age) ...@@ -225,8 +243,8 @@ newccobject(int cache_size, int cache_age)
if(self->data=PyDict_New()) if(self->data=PyDict_New())
{ {
self->position=0; self->position=0;
self->cache_size=cache_size < 1 ? 1 : cache_size; self->cache_size=cache_size;
self->cache_age=cache_size < 1 ? 1 : cache_age; self->cache_age=cache_age < 1 ? 1 : cache_age;
return self; return self;
} }
Py_DECREF(self); Py_DECREF(self);
...@@ -277,7 +295,7 @@ cc_setattr(ccobject *self, char *name, PyObject *value) ...@@ -277,7 +295,7 @@ cc_setattr(ccobject *self, char *name, PyObject *value)
if(strcmp(name,"cache_size")==0) if(strcmp(name,"cache_size")==0)
{ {
UNLESS(PyArg_Parse(value,"i",&v)) return -1; UNLESS(PyArg_Parse(value,"i",&v)) return -1;
if(v > 0)self->cache_size=v; self->cache_size=v;
return 0; return 0;
} }
} }
...@@ -322,38 +340,42 @@ cc_subscript(ccobject *self, PyObject *key) ...@@ -322,38 +340,42 @@ cc_subscript(ccobject *self, PyObject *key)
Py_DECREF(r); Py_DECREF(r);
return NULL; return NULL;
} }
ASSIGN(r,PySequence_GetItem(r,0)); if(r->ob_type==(PyTypeObject *)PATimeType)
{
Py_DECREF(r);
r=(PyObject*)(((PATimeobject*)r)->object);
Py_INCREF(r);
}
return r; return r;
} }
static int static int
cc_ass_sub(ccobject *self, PyObject *key, PyObject *v) cc_ass_sub(ccobject *self, PyObject *key, PyObject *v)
{ {
if(v) if(v)
{ {
PyObject *t; int r;
PyObject *t=0;
/* Create a tuple to hold object and object access time */
UNLESS(t=PyTuple_New(2)) return -1;
/* Save value as first item in tuple */
Py_INCREF(v);
PyTuple_SET_ITEM(t,0,v);
/* Now get and save the access time */ /* Now get and save the access time */
if(v=PyObject_GetAttr(v,py__p_atime)) if(t=PyObject_GetAttr(v,py__p_atime))
{
if(t->ob_type != (PyTypeObject *)PATimeType)
{ {
if(v->ob_type == (PyTypeObject *)PATimeType) Py_DECREF(t);
PyTuple_SET_ITEM(t,1,v); t=0;
}
else else
Py_DECREF(v); v=t;
} }
else else
PyErr_Clear(); PyErr_Clear();
UNLESS(-1 != PyDict_SetItem(self->data,key,t)) return -1; r=PyDict_SetItem(self->data,key,v);
Py_DECREF(t); Py_XDECREF(t);
return maybegc(self, t); if(r < 0) return -1;
return maybegc(self, v);
} }
else else
{ {
...@@ -436,7 +458,7 @@ void ...@@ -436,7 +458,7 @@ void
initcPickleCache() initcPickleCache()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.5 $"; char *rev="$Revision: 1.6 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
...@@ -464,6 +486,9 @@ initcPickleCache() ...@@ -464,6 +486,9 @@ initcPickleCache()
/****************************************************************************** /******************************************************************************
$Log: cPickleCache.c,v $ $Log: cPickleCache.c,v $
Revision 1.6 1997/04/22 02:45:24 jim
Changed object header layout and added sticky feature.
Revision 1.5 1997/04/15 19:03:29 jim Revision 1.5 1997/04/15 19:03:29 jim
Fixed leak introduced in last revision. :-( Fixed leak introduced in last revision. :-(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7