Skip to content

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

Fixed bug in ibcremental gc method.

parent 14a2d800
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 12 deletions
src/Persistence/cPickleCache.c
View file @ ecd2654d
/* /*
$Id: cPickleCache.c,v 1.13 1998/02/05 14:34:40 jim Exp $ $Id: cPickleCache.c,v 1.14 1998/02/05 14:43:10 jim Exp $
C implementation of a pickle jar cache. C implementation of a pickle jar cache.
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
rights reserved. rights reserved.
***************************************************************************/ ***************************************************************************/
static char *what_string = "$Id: cPickleCache.c,v 1.13 1998/02/05 14:34:40 jim Exp $"; static char *what_string = "$Id: cPickleCache.c,v 1.14 1998/02/05 14:43:10 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))
...@@ -344,6 +344,14 @@ cc_report(ccobject *self, PyObject *args) ...@@ -344,6 +344,14 @@ cc_report(ccobject *self, PyObject *args)
return Py_None; return Py_None;
} }
static PyObject *
cc_incrgc(ccobject *self, PyObject *args)
{
if(maybegc(self,NULL) < 0) return NULL;
Py_INCREF(Py_None);
return Py_None;
}
static struct PyMethodDef cc_methods[] = { static struct PyMethodDef cc_methods[] = {
{"full_sweep", (PyCFunction)cc_full_sweep, 1, {"full_sweep", (PyCFunction)cc_full_sweep, 1,
"full_sweep([age]) -- Perform a full sweep of the cache\n\n" "full_sweep([age]) -- Perform a full sweep of the cache\n\n"
...@@ -362,7 +370,7 @@ static struct PyMethodDef cc_methods[] = { ...@@ -362,7 +370,7 @@ static struct PyMethodDef cc_methods[] = {
{"items", (PyCFunction)ccitems, 1, {"items", (PyCFunction)ccitems, 1,
"items() -- Return the cache items." "items() -- Return the cache items."
}, },
{"incrgc", (PyCFunction)maybegc, 1, {"incrgc", (PyCFunction)cc_incrgc, 1,
"incrgc() -- Perform incremental garbage collection"}, "incrgc() -- Perform incremental garbage collection"},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
...@@ -623,7 +631,7 @@ void ...@@ -623,7 +631,7 @@ void
initcPickleCache() initcPickleCache()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.13 $"; char *rev="$Revision: 1.14 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
...@@ -653,6 +661,9 @@ initcPickleCache() ...@@ -653,6 +661,9 @@ initcPickleCache()
/****************************************************************************** /******************************************************************************
$Log: cPickleCache.c,v $ $Log: cPickleCache.c,v $
Revision 1.14 1998/02/05 14:43:10 jim
Fixed bug in ibcremental gc method.
Revision 1.13 1998/02/05 14:34:40 jim Revision 1.13 1998/02/05 14:34:40 jim
Added getattr option to get cache data. Added getattr option to get cache data.
......
src/ZODB/cPickleCache.c
View file @ ecd2654d
/* /*
$Id: cPickleCache.c,v 1.13 1998/02/05 14:34:40 jim Exp $ $Id: cPickleCache.c,v 1.14 1998/02/05 14:43:10 jim Exp $
C implementation of a pickle jar cache. C implementation of a pickle jar cache.
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
rights reserved. rights reserved.
***************************************************************************/ ***************************************************************************/
static char *what_string = "$Id: cPickleCache.c,v 1.13 1998/02/05 14:34:40 jim Exp $"; static char *what_string = "$Id: cPickleCache.c,v 1.14 1998/02/05 14:43:10 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))
...@@ -344,6 +344,14 @@ cc_report(ccobject *self, PyObject *args) ...@@ -344,6 +344,14 @@ cc_report(ccobject *self, PyObject *args)
return Py_None; return Py_None;
} }
static PyObject *
cc_incrgc(ccobject *self, PyObject *args)
{
if(maybegc(self,NULL) < 0) return NULL;
Py_INCREF(Py_None);
return Py_None;
}
static struct PyMethodDef cc_methods[] = { static struct PyMethodDef cc_methods[] = {
{"full_sweep", (PyCFunction)cc_full_sweep, 1, {"full_sweep", (PyCFunction)cc_full_sweep, 1,
"full_sweep([age]) -- Perform a full sweep of the cache\n\n" "full_sweep([age]) -- Perform a full sweep of the cache\n\n"
...@@ -362,7 +370,7 @@ static struct PyMethodDef cc_methods[] = { ...@@ -362,7 +370,7 @@ static struct PyMethodDef cc_methods[] = {
{"items", (PyCFunction)ccitems, 1, {"items", (PyCFunction)ccitems, 1,
"items() -- Return the cache items." "items() -- Return the cache items."
}, },
{"incrgc", (PyCFunction)maybegc, 1, {"incrgc", (PyCFunction)cc_incrgc, 1,
"incrgc() -- Perform incremental garbage collection"}, "incrgc() -- Perform incremental garbage collection"},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
...@@ -623,7 +631,7 @@ void ...@@ -623,7 +631,7 @@ void
initcPickleCache() initcPickleCache()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.13 $"; char *rev="$Revision: 1.14 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
...@@ -653,6 +661,9 @@ initcPickleCache() ...@@ -653,6 +661,9 @@ initcPickleCache()
/****************************************************************************** /******************************************************************************
$Log: cPickleCache.c,v $ $Log: cPickleCache.c,v $
Revision 1.14 1998/02/05 14:43:10 jim
Fixed bug in ibcremental gc method.
Revision 1.13 1998/02/05 14:34:40 jim Revision 1.13 1998/02/05 14:34:40 jim
Added getattr option to get cache data. Added getattr option to get cache data.
......
src/persistent/cPickleCache.c
View file @ ecd2654d
/* /*
$Id: cPickleCache.c,v 1.13 1998/02/05 14:34:40 jim Exp $ $Id: cPickleCache.c,v 1.14 1998/02/05 14:43:10 jim Exp $
C implementation of a pickle jar cache. C implementation of a pickle jar cache.
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
rights reserved. rights reserved.
***************************************************************************/ ***************************************************************************/
static char *what_string = "$Id: cPickleCache.c,v 1.13 1998/02/05 14:34:40 jim Exp $"; static char *what_string = "$Id: cPickleCache.c,v 1.14 1998/02/05 14:43:10 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))
...@@ -344,6 +344,14 @@ cc_report(ccobject *self, PyObject *args) ...@@ -344,6 +344,14 @@ cc_report(ccobject *self, PyObject *args)
return Py_None; return Py_None;
} }
static PyObject *
cc_incrgc(ccobject *self, PyObject *args)
{
if(maybegc(self,NULL) < 0) return NULL;
Py_INCREF(Py_None);
return Py_None;
}
static struct PyMethodDef cc_methods[] = { static struct PyMethodDef cc_methods[] = {
{"full_sweep", (PyCFunction)cc_full_sweep, 1, {"full_sweep", (PyCFunction)cc_full_sweep, 1,
"full_sweep([age]) -- Perform a full sweep of the cache\n\n" "full_sweep([age]) -- Perform a full sweep of the cache\n\n"
...@@ -362,7 +370,7 @@ static struct PyMethodDef cc_methods[] = { ...@@ -362,7 +370,7 @@ static struct PyMethodDef cc_methods[] = {
{"items", (PyCFunction)ccitems, 1, {"items", (PyCFunction)ccitems, 1,
"items() -- Return the cache items." "items() -- Return the cache items."
}, },
{"incrgc", (PyCFunction)maybegc, 1, {"incrgc", (PyCFunction)cc_incrgc, 1,
"incrgc() -- Perform incremental garbage collection"}, "incrgc() -- Perform incremental garbage collection"},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
...@@ -623,7 +631,7 @@ void ...@@ -623,7 +631,7 @@ void
initcPickleCache() initcPickleCache()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.13 $"; char *rev="$Revision: 1.14 $";
Cctype.ob_type=&PyType_Type; Cctype.ob_type=&PyType_Type;
...@@ -653,6 +661,9 @@ initcPickleCache() ...@@ -653,6 +661,9 @@ initcPickleCache()
/****************************************************************************** /******************************************************************************
$Log: cPickleCache.c,v $ $Log: cPickleCache.c,v $
Revision 1.14 1998/02/05 14:43:10 jim
Fixed bug in ibcremental gc method.
Revision 1.13 1998/02/05 14:34:40 jim Revision 1.13 1998/02/05 14:34:40 jim
Added getattr option to get cache data. Added getattr option to get cache data.
......
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