Skip to content

Z
ZEO
Commit 5cd55aa4 authored by Jeremy Hylton's avatar Jeremy Hylton
Browse files
Options

Cache cleanups. 

Remove use of staticforward.

Avoid forward reference to Cctype by defining newccobject after type
struct.
parent 09125899
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 108 deletions
src/Persistence/cPickleCache.c
View file @ 5cd55aa4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.43 2002/04/01 23:36:34 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.44 2002/04/01 23:45:48 jeremy Exp $\n";
#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))
...@@ -26,10 +26,8 @@ static char cPickleCache_doc_string[] = ...@@ -26,10 +26,8 @@ static char cPickleCache_doc_string[] =
#include "cPersistence.h" #include "cPersistence.h"
#include <time.h> #include <time.h>
#include <stddef.h> #include <stddef.h>
#undef Py_FindMethod #undef Py_FindMethod
static PyObject *py__p_oid, *py_reload, *py__p_jar, *py__p_changed; static PyObject *py__p_oid, *py_reload, *py__p_jar, *py__p_changed;
/* define this for extra debugging checks, and lousy performance */ /* define this for extra debugging checks, and lousy performance */
...@@ -55,16 +53,13 @@ typedef struct { ...@@ -55,16 +53,13 @@ typedef struct {
int cache_drain_resistance; int cache_drain_resistance;
} ccobject; } ccobject;
staticforward PyTypeObject Cctype; static int present_in_ring(ccobject *self, CPersistentRing *target);
static int check_ring(ccobject *self, const char *context);
static int cc_ass_sub(ccobject *self, PyObject *key, PyObject *v);
staticforward int present_in_ring(ccobject *self,CPersistentRing *target);
staticforward int check_ring(ccobject *self,const char *context);
staticforward int cc_ass_sub(ccobject *self, PyObject *key, PyObject *v);
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
static PyObject *object_from_oid(ccobject *self,PyObject *key) static PyObject *object_from_oid(ccobject *self, PyObject *key)
/* somewhat of a replacement for PyDict_GetItem(self->data.... /* somewhat of a replacement for PyDict_GetItem(self->data....
however this returns a *new* reference */ however this returns a *new* reference */
{ {
...@@ -537,32 +532,6 @@ static struct PyMethodDef cc_methods[] = { ...@@ -537,32 +532,6 @@ static struct PyMethodDef cc_methods[] = {
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
static ccobject *
newccobject(PyObject *jar, int cache_size, int cache_age)
{
ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL;
self->setklassstate=self->jar=NULL;
if((self->data=PyDict_New()))
{
self->jar=jar;
Py_INCREF(jar);
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate"))
return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
}
Py_DECREF(self);
return NULL;
}
static void static void
cc_dealloc(ccobject *self) cc_dealloc(ccobject *self)
{ {
...@@ -921,6 +890,32 @@ static PyTypeObject Cctype = { ...@@ -921,6 +890,32 @@ static PyTypeObject Cctype = {
"" ""
}; };
static ccobject *
newccobject(PyObject *jar, int cache_size, int cache_age)
{
ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL;
self->setklassstate=self->jar=NULL;
if((self->data=PyDict_New()))
{
self->jar=jar;
Py_INCREF(jar);
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate"))
return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
}
Py_DECREF(self);
return NULL;
}
static PyObject * static PyObject *
cCM_new(PyObject *self, PyObject *args) cCM_new(PyObject *self, PyObject *args)
{ {
......
src/ZODB/cPickleCache.c
View file @ 5cd55aa4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.43 2002/04/01 23:36:34 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.44 2002/04/01 23:45:48 jeremy Exp $\n";
#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))
...@@ -26,10 +26,8 @@ static char cPickleCache_doc_string[] = ...@@ -26,10 +26,8 @@ static char cPickleCache_doc_string[] =
#include "cPersistence.h" #include "cPersistence.h"
#include <time.h> #include <time.h>
#include <stddef.h> #include <stddef.h>
#undef Py_FindMethod #undef Py_FindMethod
static PyObject *py__p_oid, *py_reload, *py__p_jar, *py__p_changed; static PyObject *py__p_oid, *py_reload, *py__p_jar, *py__p_changed;
/* define this for extra debugging checks, and lousy performance */ /* define this for extra debugging checks, and lousy performance */
...@@ -55,16 +53,13 @@ typedef struct { ...@@ -55,16 +53,13 @@ typedef struct {
int cache_drain_resistance; int cache_drain_resistance;
} ccobject; } ccobject;
staticforward PyTypeObject Cctype; static int present_in_ring(ccobject *self, CPersistentRing *target);
static int check_ring(ccobject *self, const char *context);
static int cc_ass_sub(ccobject *self, PyObject *key, PyObject *v);
staticforward int present_in_ring(ccobject *self,CPersistentRing *target);
staticforward int check_ring(ccobject *self,const char *context);
staticforward int cc_ass_sub(ccobject *self, PyObject *key, PyObject *v);
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
static PyObject *object_from_oid(ccobject *self,PyObject *key) static PyObject *object_from_oid(ccobject *self, PyObject *key)
/* somewhat of a replacement for PyDict_GetItem(self->data.... /* somewhat of a replacement for PyDict_GetItem(self->data....
however this returns a *new* reference */ however this returns a *new* reference */
{ {
...@@ -537,32 +532,6 @@ static struct PyMethodDef cc_methods[] = { ...@@ -537,32 +532,6 @@ static struct PyMethodDef cc_methods[] = {
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
static ccobject *
newccobject(PyObject *jar, int cache_size, int cache_age)
{
ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL;
self->setklassstate=self->jar=NULL;
if((self->data=PyDict_New()))
{
self->jar=jar;
Py_INCREF(jar);
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate"))
return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
}
Py_DECREF(self);
return NULL;
}
static void static void
cc_dealloc(ccobject *self) cc_dealloc(ccobject *self)
{ {
...@@ -921,6 +890,32 @@ static PyTypeObject Cctype = { ...@@ -921,6 +890,32 @@ static PyTypeObject Cctype = {
"" ""
}; };
static ccobject *
newccobject(PyObject *jar, int cache_size, int cache_age)
{
ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL;
self->setklassstate=self->jar=NULL;
if((self->data=PyDict_New()))
{
self->jar=jar;
Py_INCREF(jar);
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate"))
return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
}
Py_DECREF(self);
return NULL;
}
static PyObject * static PyObject *
cCM_new(PyObject *self, PyObject *args) cCM_new(PyObject *self, PyObject *args)
{ {
......
src/persistent/cPickleCache.c
View file @ 5cd55aa4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.43 2002/04/01 23:36:34 jeremy Exp $\n"; "$Id: cPickleCache.c,v 1.44 2002/04/01 23:45:48 jeremy Exp $\n";
#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))
...@@ -26,10 +26,8 @@ static char cPickleCache_doc_string[] = ...@@ -26,10 +26,8 @@ static char cPickleCache_doc_string[] =
#include "cPersistence.h" #include "cPersistence.h"
#include <time.h> #include <time.h>
#include <stddef.h> #include <stddef.h>
#undef Py_FindMethod #undef Py_FindMethod
static PyObject *py__p_oid, *py_reload, *py__p_jar, *py__p_changed; static PyObject *py__p_oid, *py_reload, *py__p_jar, *py__p_changed;
/* define this for extra debugging checks, and lousy performance */ /* define this for extra debugging checks, and lousy performance */
...@@ -55,16 +53,13 @@ typedef struct { ...@@ -55,16 +53,13 @@ typedef struct {
int cache_drain_resistance; int cache_drain_resistance;
} ccobject; } ccobject;
staticforward PyTypeObject Cctype; static int present_in_ring(ccobject *self, CPersistentRing *target);
static int check_ring(ccobject *self, const char *context);
static int cc_ass_sub(ccobject *self, PyObject *key, PyObject *v);
staticforward int present_in_ring(ccobject *self,CPersistentRing *target);
staticforward int check_ring(ccobject *self,const char *context);
staticforward int cc_ass_sub(ccobject *self, PyObject *key, PyObject *v);
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
static PyObject *object_from_oid(ccobject *self,PyObject *key) static PyObject *object_from_oid(ccobject *self, PyObject *key)
/* somewhat of a replacement for PyDict_GetItem(self->data.... /* somewhat of a replacement for PyDict_GetItem(self->data....
however this returns a *new* reference */ however this returns a *new* reference */
{ {
...@@ -537,32 +532,6 @@ static struct PyMethodDef cc_methods[] = { ...@@ -537,32 +532,6 @@ static struct PyMethodDef cc_methods[] = {
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
static ccobject *
newccobject(PyObject *jar, int cache_size, int cache_age)
{
ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL;
self->setklassstate=self->jar=NULL;
if((self->data=PyDict_New()))
{
self->jar=jar;
Py_INCREF(jar);
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate"))
return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
}
Py_DECREF(self);
return NULL;
}
static void static void
cc_dealloc(ccobject *self) cc_dealloc(ccobject *self)
{ {
...@@ -921,6 +890,32 @@ static PyTypeObject Cctype = { ...@@ -921,6 +890,32 @@ static PyTypeObject Cctype = {
"" ""
}; };
static ccobject *
newccobject(PyObject *jar, int cache_size, int cache_age)
{
ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL;
self->setklassstate=self->jar=NULL;
if((self->data=PyDict_New()))
{
self->jar=jar;
Py_INCREF(jar);
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate"))
return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
}
Py_DECREF(self);
return NULL;
}
static PyObject * static PyObject *
cCM_new(PyObject *self, PyObject *args) cCM_new(PyObject *self, PyObject *args)
{ {
......
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