Skip to content

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

Added exported C interface, so that other C classes could subclass 

from it.

Added _p_mtime attribute, which returns the persistent modification
time.
parent a100bedf
Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 144 deletions
src/Persistence/cPersistence.c
View file @ 61414401
/* /*
$Id: cPersistence.c,v 1.3 1997/03/11 20:53:07 jim Exp $ $Id: cPersistence.c,v 1.4 1997/03/14 22:51:40 jim Exp $
C Persistence Module C Persistence Module
...@@ -56,18 +56,17 @@ ...@@ -56,18 +56,17 @@
*****************************************************************************/ *****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.3 1997/03/11 20:53:07 jim Exp $"; static char *what_string = "$Id: cPersistence.c,v 1.4 1997/03/14 22:51:40 jim Exp $";
#include <time.h> #include <time.h>
#include "Python.h" #include "cPersistence.h"
#include "ExtensionClass.h"
#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)
static PyObject *py_store, *py_oops, *py_keys, *py_setstate, *py___changed__, static PyObject *py_store, *py_oops, *py_keys, *py_setstate, *py___changed__,
*py___dict__, *py_one; *py___dict__, *py_mtime, *py_onearg;
static void static void
init_strings() init_strings()
...@@ -77,9 +76,10 @@ init_strings() ...@@ -77,9 +76,10 @@ init_strings()
INIT_STRING(oops); INIT_STRING(oops);
INIT_STRING(keys); INIT_STRING(keys);
INIT_STRING(setstate); INIT_STRING(setstate);
INIT_STRING(mtime);
INIT_STRING(__changed__); INIT_STRING(__changed__);
INIT_STRING(__dict__); INIT_STRING(__dict__);
py_one=PyInt_FromLong(1); py_onearg=Py_BuildValue("(i)",1);
#undef INIT_STRING #undef INIT_STRING
} }
...@@ -154,11 +154,6 @@ PyString_BuildFormat(va_alist) va_dcl ...@@ -154,11 +154,6 @@ PyString_BuildFormat(va_alist) va_dcl
/****************************************************************************/ /****************************************************************************/
typedef struct {
PyObject_HEAD
time_t value;
} PATimeobject;
static void static void
PATime_dealloc(PATimeobject *self){ PyMem_DEL(self);} PATime_dealloc(PATimeobject *self){ PyMem_DEL(self);}
...@@ -186,25 +181,13 @@ PATimeType = { ...@@ -186,25 +181,13 @@ PATimeType = {
/* Declarations for objects of type Persistent */ /* Declarations for objects of type Persistent */
typedef struct {
PyObject_HEAD
PyObject *oid;
PyObject *jar;
PyObject *rtime;
PATimeobject *atime;
int state;
#define GHOST_STATE -1 #define GHOST_STATE -1
#define UPTODATE_STATE 0 #define UPTODATE_STATE 0
#define CHANGED_STATE 1 #define CHANGED_STATE 1
} Perobject;
staticforward PyExtensionClass Pertype; staticforward PyExtensionClass Pertype;
staticforward PyExtensionClass TPertype; staticforward PyExtensionClass TPertype;
/* ---------------------------------------------------------------- */
/* ---------------------------------------------------------------- */
static char Per___changed____doc__[] = static char Per___changed____doc__[] =
"__changed__([flag]) -- Flag or determine whether an object has changed\n" "__changed__([flag]) -- Flag or determine whether an object has changed\n"
" \n" " \n"
...@@ -218,7 +201,7 @@ static PyObject *changed_args=(PyObject*)Per___changed____doc__; ...@@ -218,7 +201,7 @@ static PyObject *changed_args=(PyObject*)Per___changed____doc__;
static PyObject * static PyObject *
Per___changed__(self, args) Per___changed__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *o; PyObject *o;
...@@ -241,10 +224,10 @@ static char Per___save____doc__[] = ...@@ -241,10 +224,10 @@ static char Per___save____doc__[] =
static PyObject * static PyObject *
Per___save__(self, args) Per___save__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
if(self->oid && self->jar && self->state != GHOST_STATE) if(self->oid && self->jar && self->state == CHANGED_STATE)
return callmethod1(self->jar,py_store,(PyObject*)self); return callmethod1(self->jar,py_store,(PyObject*)self);
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
...@@ -261,7 +244,7 @@ static char Per___inform_abort____doc__[] = ...@@ -261,7 +244,7 @@ static char Per___inform_abort____doc__[] =
static PyObject * static PyObject *
Per___inform_abort__(self, args) Per___inform_abort__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *transaction, *start_time; PyObject *transaction, *start_time;
...@@ -285,7 +268,7 @@ static char Per__p___init____doc__[] = ...@@ -285,7 +268,7 @@ static char Per__p___init____doc__[] =
static PyObject * static PyObject *
Per__p___init__(self, args) Per__p___init__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *oid, *jar; PyObject *oid, *jar;
...@@ -301,7 +284,7 @@ Per__p___init__(self, args) ...@@ -301,7 +284,7 @@ Per__p___init__(self, args)
} }
static PyObject * static PyObject *
Per__p___reinit__(Perobject *self, PyObject *args) Per__p___reinit__(cPersistentObject *self, PyObject *args)
{ {
PyObject *oid, *jar, *copy; PyObject *oid, *jar, *copy;
...@@ -321,9 +304,28 @@ Per__p___reinit__(Perobject *self, PyObject *args) ...@@ -321,9 +304,28 @@ Per__p___reinit__(Perobject *self, PyObject *args)
return Py_None; return Py_None;
} }
static int
Per_setstate(self)
cPersistentObject *self;
{
if(self->state==GHOST_STATE && self->jar)
{
PyObject *r;
self->state=UPTODATE_STATE;
UNLESS(r=callmethod1(self->jar,py_setstate,(PyObject*)self))
{
self->state=GHOST_STATE;
return -1;
}
Py_DECREF(r);
}
return 0;
}
static PyObject * static PyObject *
Per__getstate__(self,args) Per__getstate__(self,args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *__dict__, *d=0; PyObject *__dict__, *d=0;
...@@ -376,7 +378,7 @@ err: ...@@ -376,7 +378,7 @@ err:
static PyObject * static PyObject *
Per__setstate__(self,args) Per__setstate__(self,args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *__dict__, *v, *keys=0, *key=0, *e=0; PyObject *__dict__, *v, *keys=0, *key=0, *e=0;
...@@ -435,7 +437,7 @@ static struct PyMethodDef Per_methods[] = { ...@@ -435,7 +437,7 @@ static struct PyMethodDef Per_methods[] = {
static void static void
Per_dealloc(self) Per_dealloc(self)
Perobject *self; cPersistentObject *self;
{ {
Py_XDECREF(self->oid); Py_XDECREF(self->oid);
Py_XDECREF(self->jar); Py_XDECREF(self->jar);
...@@ -446,7 +448,7 @@ Per_dealloc(self) ...@@ -446,7 +448,7 @@ Per_dealloc(self)
} }
static void static void
Per_set_atime(Perobject *self) Per_set_atime(cPersistentObject *self)
{ {
/* Record access times */ /* Record access times */
UNLESS(self->atime) UNLESS(self->atime)
...@@ -457,7 +459,7 @@ Per_set_atime(Perobject *self) ...@@ -457,7 +459,7 @@ Per_set_atime(Perobject *self)
} }
static PyObject * static PyObject *
Per_atime(Perobject *self) Per_atime(cPersistentObject *self)
{ {
UNLESS(self->atime) Per_set_atime(self); UNLESS(self->atime) Per_set_atime(self);
Py_XINCREF(self->atime); Py_XINCREF(self->atime);
...@@ -465,7 +467,7 @@ Per_atime(Perobject *self) ...@@ -465,7 +467,7 @@ Per_atime(Perobject *self)
} }
static PyObject * static PyObject *
Per_getattr(Perobject *self, PyObject *oname, char *name) Per_getattr(cPersistentObject *self, PyObject *oname, char *name)
{ {
char *n=name; char *n=name;
...@@ -515,6 +517,15 @@ Per_getattr(Perobject *self, PyObject *oname, char *name) ...@@ -515,6 +517,15 @@ Per_getattr(Perobject *self, PyObject *oname, char *name)
return Per_atime(self); return Per_atime(self);
} }
break; break;
case 'm':
if(strcmp(n,"time")==0)
{
if(self->jar)
return callmethod1(self->jar,py_mtime,(PyObject*)self);
Py_INCREF(Py_None);
return Py_None;
}
break;
case 'r': case 'r':
if(strcmp(n,"ead_time")==0) if(strcmp(n,"ead_time")==0)
{ {
...@@ -551,7 +562,7 @@ Per_getattr(Perobject *self, PyObject *oname, char *name) ...@@ -551,7 +562,7 @@ Per_getattr(Perobject *self, PyObject *oname, char *name)
} }
static PyObject* static PyObject*
Per_getattro(Perobject *self, PyObject *name) Per_getattro(cPersistentObject *self, PyObject *name)
{ {
char *s; char *s;
...@@ -560,7 +571,18 @@ Per_getattro(Perobject *self, PyObject *name) ...@@ -560,7 +571,18 @@ Per_getattro(Perobject *self, PyObject *name)
} }
static int static int
Per_setattro(Perobject *self, PyObject *oname, PyObject *v) changed(PyObject *self)
{
PyObject *c;
UNLESS(c=PyObject_GetAttr(self,py___changed__)) return -1;
UNLESS_ASSIGN(c,PyObject_CallObject(c,py_onearg)) return -1;
Py_DECREF(c);
return 0;
}
static int
Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v)
{ {
char *name=""; char *name="";
...@@ -615,11 +637,7 @@ Per_setattro(Perobject *self, PyObject *oname, PyObject *v) ...@@ -615,11 +637,7 @@ Per_setattro(Perobject *self, PyObject *oname, PyObject *v)
if(! (*name=='_' && name[1]=='v' && name[2]=='_') if(! (*name=='_' && name[1]=='v' && name[2]=='_')
&& self->state != CHANGED_STATE && self->jar) && self->state != CHANGED_STATE && self->jar)
{ if(changed((PyObject*)self) < 0) return -1;
UNLESS(r=callmethod1((PyObject*)self,py___changed__,py_one))
return -1;
Py_DECREF(r);
}
} }
return PyEC_SetAttr((PyObject*)self,oname,v); return PyEC_SetAttr((PyObject*)self,oname,v);
...@@ -651,7 +669,7 @@ static PyExtensionClass Pertype = { ...@@ -651,7 +669,7 @@ static PyExtensionClass Pertype = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"Persistent", /*tp_name*/ "Persistent", /*tp_name*/
sizeof(Perobject), /*tp_basicsize*/ sizeof(cPersistentObject), /*tp_basicsize*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
/* methods */ /* methods */
(destructor)Per_dealloc, /*tp_dealloc*/ (destructor)Per_dealloc, /*tp_dealloc*/
...@@ -687,20 +705,25 @@ static struct PyMethodDef cP_methods[] = { ...@@ -687,20 +705,25 @@ static struct PyMethodDef cP_methods[] = {
/* Initialization function for the module (*must* be called initcPersistence) */ /* Initialization function for the module (*must* be called initcPersistence) */
static char cPersistence_module_documentation[] = static cPersistenceCAPIstruct
"" truecPersistenceCAPI = {
; &(Pertype.methods),
(getattrofunc)Per_getattro, /*tp_getattr with object key*/
(setattrofunc)Per_setattro, /*tp_setattr with object key*/
changed,
Per_setstate,
};
void void
initcPersistence() initcPersistence()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.3 $"; char *rev="$Revision: 1.4 $";
PATimeType.ob_type=&PyType_Type; PATimeType.ob_type=&PyType_Type;
m = Py_InitModule4("cPersistence", cP_methods, m = Py_InitModule4("cPersistence", cP_methods,
cPersistence_module_documentation, "",
(PyObject*)NULL,PYTHON_API_VERSION); (PyObject*)NULL,PYTHON_API_VERSION);
init_strings(); init_strings();
...@@ -710,12 +733,25 @@ initcPersistence() ...@@ -710,12 +733,25 @@ initcPersistence()
PyString_FromStringAndSize(rev+11,strlen(rev+11)-2)); PyString_FromStringAndSize(rev+11,strlen(rev+11)-2));
PyExtensionClass_Export(d,"Persistent",Pertype); PyExtensionClass_Export(d,"Persistent",Pertype);
PyDict_SetItemString(d,"atimeType",(PyObject*)&PATimeType); PyDict_SetItemString(d,"atimeType",(PyObject*)&PATimeType);
cPersistenceCAPI=&truecPersistenceCAPI;
PyDict_SetItemString(d, "CAPI",
PyCObject_FromVoidPtr(cPersistenceCAPI,NULL));
CHECK_FOR_ERRORS("can't initialize module dt"); CHECK_FOR_ERRORS("can't initialize module dt");
} }
/**************************************************************************** /****************************************************************************
$Log: cPersistence.c,v $ $Log: cPersistence.c,v $
Revision 1.4 1997/03/14 22:51:40 jim
Added exported C interface, so that other C classes could subclass
from it.
Added _p_mtime attribute, which returns the persistent modification
time.
Revision 1.3 1997/03/11 20:53:07 jim Revision 1.3 1997/03/11 20:53:07 jim
Added access-time tracking and special type for efficient access time Added access-time tracking and special type for efficient access time
management. management.
......
src/ZODB/cPersistence.c
View file @ 61414401
/* /*
$Id: cPersistence.c,v 1.3 1997/03/11 20:53:07 jim Exp $ $Id: cPersistence.c,v 1.4 1997/03/14 22:51:40 jim Exp $
C Persistence Module C Persistence Module
...@@ -56,18 +56,17 @@ ...@@ -56,18 +56,17 @@
*****************************************************************************/ *****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.3 1997/03/11 20:53:07 jim Exp $"; static char *what_string = "$Id: cPersistence.c,v 1.4 1997/03/14 22:51:40 jim Exp $";
#include <time.h> #include <time.h>
#include "Python.h" #include "cPersistence.h"
#include "ExtensionClass.h"
#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)
static PyObject *py_store, *py_oops, *py_keys, *py_setstate, *py___changed__, static PyObject *py_store, *py_oops, *py_keys, *py_setstate, *py___changed__,
*py___dict__, *py_one; *py___dict__, *py_mtime, *py_onearg;
static void static void
init_strings() init_strings()
...@@ -77,9 +76,10 @@ init_strings() ...@@ -77,9 +76,10 @@ init_strings()
INIT_STRING(oops); INIT_STRING(oops);
INIT_STRING(keys); INIT_STRING(keys);
INIT_STRING(setstate); INIT_STRING(setstate);
INIT_STRING(mtime);
INIT_STRING(__changed__); INIT_STRING(__changed__);
INIT_STRING(__dict__); INIT_STRING(__dict__);
py_one=PyInt_FromLong(1); py_onearg=Py_BuildValue("(i)",1);
#undef INIT_STRING #undef INIT_STRING
} }
...@@ -154,11 +154,6 @@ PyString_BuildFormat(va_alist) va_dcl ...@@ -154,11 +154,6 @@ PyString_BuildFormat(va_alist) va_dcl
/****************************************************************************/ /****************************************************************************/
typedef struct {
PyObject_HEAD
time_t value;
} PATimeobject;
static void static void
PATime_dealloc(PATimeobject *self){ PyMem_DEL(self);} PATime_dealloc(PATimeobject *self){ PyMem_DEL(self);}
...@@ -186,25 +181,13 @@ PATimeType = { ...@@ -186,25 +181,13 @@ PATimeType = {
/* Declarations for objects of type Persistent */ /* Declarations for objects of type Persistent */
typedef struct {
PyObject_HEAD
PyObject *oid;
PyObject *jar;
PyObject *rtime;
PATimeobject *atime;
int state;
#define GHOST_STATE -1 #define GHOST_STATE -1
#define UPTODATE_STATE 0 #define UPTODATE_STATE 0
#define CHANGED_STATE 1 #define CHANGED_STATE 1
} Perobject;
staticforward PyExtensionClass Pertype; staticforward PyExtensionClass Pertype;
staticforward PyExtensionClass TPertype; staticforward PyExtensionClass TPertype;
/* ---------------------------------------------------------------- */
/* ---------------------------------------------------------------- */
static char Per___changed____doc__[] = static char Per___changed____doc__[] =
"__changed__([flag]) -- Flag or determine whether an object has changed\n" "__changed__([flag]) -- Flag or determine whether an object has changed\n"
" \n" " \n"
...@@ -218,7 +201,7 @@ static PyObject *changed_args=(PyObject*)Per___changed____doc__; ...@@ -218,7 +201,7 @@ static PyObject *changed_args=(PyObject*)Per___changed____doc__;
static PyObject * static PyObject *
Per___changed__(self, args) Per___changed__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *o; PyObject *o;
...@@ -241,10 +224,10 @@ static char Per___save____doc__[] = ...@@ -241,10 +224,10 @@ static char Per___save____doc__[] =
static PyObject * static PyObject *
Per___save__(self, args) Per___save__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
if(self->oid && self->jar && self->state != GHOST_STATE) if(self->oid && self->jar && self->state == CHANGED_STATE)
return callmethod1(self->jar,py_store,(PyObject*)self); return callmethod1(self->jar,py_store,(PyObject*)self);
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
...@@ -261,7 +244,7 @@ static char Per___inform_abort____doc__[] = ...@@ -261,7 +244,7 @@ static char Per___inform_abort____doc__[] =
static PyObject * static PyObject *
Per___inform_abort__(self, args) Per___inform_abort__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *transaction, *start_time; PyObject *transaction, *start_time;
...@@ -285,7 +268,7 @@ static char Per__p___init____doc__[] = ...@@ -285,7 +268,7 @@ static char Per__p___init____doc__[] =
static PyObject * static PyObject *
Per__p___init__(self, args) Per__p___init__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *oid, *jar; PyObject *oid, *jar;
...@@ -301,7 +284,7 @@ Per__p___init__(self, args) ...@@ -301,7 +284,7 @@ Per__p___init__(self, args)
} }
static PyObject * static PyObject *
Per__p___reinit__(Perobject *self, PyObject *args) Per__p___reinit__(cPersistentObject *self, PyObject *args)
{ {
PyObject *oid, *jar, *copy; PyObject *oid, *jar, *copy;
...@@ -321,9 +304,28 @@ Per__p___reinit__(Perobject *self, PyObject *args) ...@@ -321,9 +304,28 @@ Per__p___reinit__(Perobject *self, PyObject *args)
return Py_None; return Py_None;
} }
static int
Per_setstate(self)
cPersistentObject *self;
{
if(self->state==GHOST_STATE && self->jar)
{
PyObject *r;
self->state=UPTODATE_STATE;
UNLESS(r=callmethod1(self->jar,py_setstate,(PyObject*)self))
{
self->state=GHOST_STATE;
return -1;
}
Py_DECREF(r);
}
return 0;
}
static PyObject * static PyObject *
Per__getstate__(self,args) Per__getstate__(self,args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *__dict__, *d=0; PyObject *__dict__, *d=0;
...@@ -376,7 +378,7 @@ err: ...@@ -376,7 +378,7 @@ err:
static PyObject * static PyObject *
Per__setstate__(self,args) Per__setstate__(self,args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *__dict__, *v, *keys=0, *key=0, *e=0; PyObject *__dict__, *v, *keys=0, *key=0, *e=0;
...@@ -435,7 +437,7 @@ static struct PyMethodDef Per_methods[] = { ...@@ -435,7 +437,7 @@ static struct PyMethodDef Per_methods[] = {
static void static void
Per_dealloc(self) Per_dealloc(self)
Perobject *self; cPersistentObject *self;
{ {
Py_XDECREF(self->oid); Py_XDECREF(self->oid);
Py_XDECREF(self->jar); Py_XDECREF(self->jar);
...@@ -446,7 +448,7 @@ Per_dealloc(self) ...@@ -446,7 +448,7 @@ Per_dealloc(self)
} }
static void static void
Per_set_atime(Perobject *self) Per_set_atime(cPersistentObject *self)
{ {
/* Record access times */ /* Record access times */
UNLESS(self->atime) UNLESS(self->atime)
...@@ -457,7 +459,7 @@ Per_set_atime(Perobject *self) ...@@ -457,7 +459,7 @@ Per_set_atime(Perobject *self)
} }
static PyObject * static PyObject *
Per_atime(Perobject *self) Per_atime(cPersistentObject *self)
{ {
UNLESS(self->atime) Per_set_atime(self); UNLESS(self->atime) Per_set_atime(self);
Py_XINCREF(self->atime); Py_XINCREF(self->atime);
...@@ -465,7 +467,7 @@ Per_atime(Perobject *self) ...@@ -465,7 +467,7 @@ Per_atime(Perobject *self)
} }
static PyObject * static PyObject *
Per_getattr(Perobject *self, PyObject *oname, char *name) Per_getattr(cPersistentObject *self, PyObject *oname, char *name)
{ {
char *n=name; char *n=name;
...@@ -515,6 +517,15 @@ Per_getattr(Perobject *self, PyObject *oname, char *name) ...@@ -515,6 +517,15 @@ Per_getattr(Perobject *self, PyObject *oname, char *name)
return Per_atime(self); return Per_atime(self);
} }
break; break;
case 'm':
if(strcmp(n,"time")==0)
{
if(self->jar)
return callmethod1(self->jar,py_mtime,(PyObject*)self);
Py_INCREF(Py_None);
return Py_None;
}
break;
case 'r': case 'r':
if(strcmp(n,"ead_time")==0) if(strcmp(n,"ead_time")==0)
{ {
...@@ -551,7 +562,7 @@ Per_getattr(Perobject *self, PyObject *oname, char *name) ...@@ -551,7 +562,7 @@ Per_getattr(Perobject *self, PyObject *oname, char *name)
} }
static PyObject* static PyObject*
Per_getattro(Perobject *self, PyObject *name) Per_getattro(cPersistentObject *self, PyObject *name)
{ {
char *s; char *s;
...@@ -560,7 +571,18 @@ Per_getattro(Perobject *self, PyObject *name) ...@@ -560,7 +571,18 @@ Per_getattro(Perobject *self, PyObject *name)
} }
static int static int
Per_setattro(Perobject *self, PyObject *oname, PyObject *v) changed(PyObject *self)
{
PyObject *c;
UNLESS(c=PyObject_GetAttr(self,py___changed__)) return -1;
UNLESS_ASSIGN(c,PyObject_CallObject(c,py_onearg)) return -1;
Py_DECREF(c);
return 0;
}
static int
Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v)
{ {
char *name=""; char *name="";
...@@ -615,11 +637,7 @@ Per_setattro(Perobject *self, PyObject *oname, PyObject *v) ...@@ -615,11 +637,7 @@ Per_setattro(Perobject *self, PyObject *oname, PyObject *v)
if(! (*name=='_' && name[1]=='v' && name[2]=='_') if(! (*name=='_' && name[1]=='v' && name[2]=='_')
&& self->state != CHANGED_STATE && self->jar) && self->state != CHANGED_STATE && self->jar)
{ if(changed((PyObject*)self) < 0) return -1;
UNLESS(r=callmethod1((PyObject*)self,py___changed__,py_one))
return -1;
Py_DECREF(r);
}
} }
return PyEC_SetAttr((PyObject*)self,oname,v); return PyEC_SetAttr((PyObject*)self,oname,v);
...@@ -651,7 +669,7 @@ static PyExtensionClass Pertype = { ...@@ -651,7 +669,7 @@ static PyExtensionClass Pertype = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"Persistent", /*tp_name*/ "Persistent", /*tp_name*/
sizeof(Perobject), /*tp_basicsize*/ sizeof(cPersistentObject), /*tp_basicsize*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
/* methods */ /* methods */
(destructor)Per_dealloc, /*tp_dealloc*/ (destructor)Per_dealloc, /*tp_dealloc*/
...@@ -687,20 +705,25 @@ static struct PyMethodDef cP_methods[] = { ...@@ -687,20 +705,25 @@ static struct PyMethodDef cP_methods[] = {
/* Initialization function for the module (*must* be called initcPersistence) */ /* Initialization function for the module (*must* be called initcPersistence) */
static char cPersistence_module_documentation[] = static cPersistenceCAPIstruct
"" truecPersistenceCAPI = {
; &(Pertype.methods),
(getattrofunc)Per_getattro, /*tp_getattr with object key*/
(setattrofunc)Per_setattro, /*tp_setattr with object key*/
changed,
Per_setstate,
};
void void
initcPersistence() initcPersistence()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.3 $"; char *rev="$Revision: 1.4 $";
PATimeType.ob_type=&PyType_Type; PATimeType.ob_type=&PyType_Type;
m = Py_InitModule4("cPersistence", cP_methods, m = Py_InitModule4("cPersistence", cP_methods,
cPersistence_module_documentation, "",
(PyObject*)NULL,PYTHON_API_VERSION); (PyObject*)NULL,PYTHON_API_VERSION);
init_strings(); init_strings();
...@@ -710,12 +733,25 @@ initcPersistence() ...@@ -710,12 +733,25 @@ initcPersistence()
PyString_FromStringAndSize(rev+11,strlen(rev+11)-2)); PyString_FromStringAndSize(rev+11,strlen(rev+11)-2));
PyExtensionClass_Export(d,"Persistent",Pertype); PyExtensionClass_Export(d,"Persistent",Pertype);
PyDict_SetItemString(d,"atimeType",(PyObject*)&PATimeType); PyDict_SetItemString(d,"atimeType",(PyObject*)&PATimeType);
cPersistenceCAPI=&truecPersistenceCAPI;
PyDict_SetItemString(d, "CAPI",
PyCObject_FromVoidPtr(cPersistenceCAPI,NULL));
CHECK_FOR_ERRORS("can't initialize module dt"); CHECK_FOR_ERRORS("can't initialize module dt");
} }
/**************************************************************************** /****************************************************************************
$Log: cPersistence.c,v $ $Log: cPersistence.c,v $
Revision 1.4 1997/03/14 22:51:40 jim
Added exported C interface, so that other C classes could subclass
from it.
Added _p_mtime attribute, which returns the persistent modification
time.
Revision 1.3 1997/03/11 20:53:07 jim Revision 1.3 1997/03/11 20:53:07 jim
Added access-time tracking and special type for efficient access time Added access-time tracking and special type for efficient access time
management. management.
......
src/persistent/cPersistence.c
View file @ 61414401
/* /*
$Id: cPersistence.c,v 1.3 1997/03/11 20:53:07 jim Exp $ $Id: cPersistence.c,v 1.4 1997/03/14 22:51:40 jim Exp $
C Persistence Module C Persistence Module
...@@ -56,18 +56,17 @@ ...@@ -56,18 +56,17 @@
*****************************************************************************/ *****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.3 1997/03/11 20:53:07 jim Exp $"; static char *what_string = "$Id: cPersistence.c,v 1.4 1997/03/14 22:51:40 jim Exp $";
#include <time.h> #include <time.h>
#include "Python.h" #include "cPersistence.h"
#include "ExtensionClass.h"
#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)
static PyObject *py_store, *py_oops, *py_keys, *py_setstate, *py___changed__, static PyObject *py_store, *py_oops, *py_keys, *py_setstate, *py___changed__,
*py___dict__, *py_one; *py___dict__, *py_mtime, *py_onearg;
static void static void
init_strings() init_strings()
...@@ -77,9 +76,10 @@ init_strings() ...@@ -77,9 +76,10 @@ init_strings()
INIT_STRING(oops); INIT_STRING(oops);
INIT_STRING(keys); INIT_STRING(keys);
INIT_STRING(setstate); INIT_STRING(setstate);
INIT_STRING(mtime);
INIT_STRING(__changed__); INIT_STRING(__changed__);
INIT_STRING(__dict__); INIT_STRING(__dict__);
py_one=PyInt_FromLong(1); py_onearg=Py_BuildValue("(i)",1);
#undef INIT_STRING #undef INIT_STRING
} }
...@@ -154,11 +154,6 @@ PyString_BuildFormat(va_alist) va_dcl ...@@ -154,11 +154,6 @@ PyString_BuildFormat(va_alist) va_dcl
/****************************************************************************/ /****************************************************************************/
typedef struct {
PyObject_HEAD
time_t value;
} PATimeobject;
static void static void
PATime_dealloc(PATimeobject *self){ PyMem_DEL(self);} PATime_dealloc(PATimeobject *self){ PyMem_DEL(self);}
...@@ -186,25 +181,13 @@ PATimeType = { ...@@ -186,25 +181,13 @@ PATimeType = {
/* Declarations for objects of type Persistent */ /* Declarations for objects of type Persistent */
typedef struct {
PyObject_HEAD
PyObject *oid;
PyObject *jar;
PyObject *rtime;
PATimeobject *atime;
int state;
#define GHOST_STATE -1 #define GHOST_STATE -1
#define UPTODATE_STATE 0 #define UPTODATE_STATE 0
#define CHANGED_STATE 1 #define CHANGED_STATE 1
} Perobject;
staticforward PyExtensionClass Pertype; staticforward PyExtensionClass Pertype;
staticforward PyExtensionClass TPertype; staticforward PyExtensionClass TPertype;
/* ---------------------------------------------------------------- */
/* ---------------------------------------------------------------- */
static char Per___changed____doc__[] = static char Per___changed____doc__[] =
"__changed__([flag]) -- Flag or determine whether an object has changed\n" "__changed__([flag]) -- Flag or determine whether an object has changed\n"
" \n" " \n"
...@@ -218,7 +201,7 @@ static PyObject *changed_args=(PyObject*)Per___changed____doc__; ...@@ -218,7 +201,7 @@ static PyObject *changed_args=(PyObject*)Per___changed____doc__;
static PyObject * static PyObject *
Per___changed__(self, args) Per___changed__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *o; PyObject *o;
...@@ -241,10 +224,10 @@ static char Per___save____doc__[] = ...@@ -241,10 +224,10 @@ static char Per___save____doc__[] =
static PyObject * static PyObject *
Per___save__(self, args) Per___save__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
if(self->oid && self->jar && self->state != GHOST_STATE) if(self->oid && self->jar && self->state == CHANGED_STATE)
return callmethod1(self->jar,py_store,(PyObject*)self); return callmethod1(self->jar,py_store,(PyObject*)self);
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
...@@ -261,7 +244,7 @@ static char Per___inform_abort____doc__[] = ...@@ -261,7 +244,7 @@ static char Per___inform_abort____doc__[] =
static PyObject * static PyObject *
Per___inform_abort__(self, args) Per___inform_abort__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *transaction, *start_time; PyObject *transaction, *start_time;
...@@ -285,7 +268,7 @@ static char Per__p___init____doc__[] = ...@@ -285,7 +268,7 @@ static char Per__p___init____doc__[] =
static PyObject * static PyObject *
Per__p___init__(self, args) Per__p___init__(self, args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *oid, *jar; PyObject *oid, *jar;
...@@ -301,7 +284,7 @@ Per__p___init__(self, args) ...@@ -301,7 +284,7 @@ Per__p___init__(self, args)
} }
static PyObject * static PyObject *
Per__p___reinit__(Perobject *self, PyObject *args) Per__p___reinit__(cPersistentObject *self, PyObject *args)
{ {
PyObject *oid, *jar, *copy; PyObject *oid, *jar, *copy;
...@@ -321,9 +304,28 @@ Per__p___reinit__(Perobject *self, PyObject *args) ...@@ -321,9 +304,28 @@ Per__p___reinit__(Perobject *self, PyObject *args)
return Py_None; return Py_None;
} }
static int
Per_setstate(self)
cPersistentObject *self;
{
if(self->state==GHOST_STATE && self->jar)
{
PyObject *r;
self->state=UPTODATE_STATE;
UNLESS(r=callmethod1(self->jar,py_setstate,(PyObject*)self))
{
self->state=GHOST_STATE;
return -1;
}
Py_DECREF(r);
}
return 0;
}
static PyObject * static PyObject *
Per__getstate__(self,args) Per__getstate__(self,args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *__dict__, *d=0; PyObject *__dict__, *d=0;
...@@ -376,7 +378,7 @@ err: ...@@ -376,7 +378,7 @@ err:
static PyObject * static PyObject *
Per__setstate__(self,args) Per__setstate__(self,args)
Perobject *self; cPersistentObject *self;
PyObject *args; PyObject *args;
{ {
PyObject *__dict__, *v, *keys=0, *key=0, *e=0; PyObject *__dict__, *v, *keys=0, *key=0, *e=0;
...@@ -435,7 +437,7 @@ static struct PyMethodDef Per_methods[] = { ...@@ -435,7 +437,7 @@ static struct PyMethodDef Per_methods[] = {
static void static void
Per_dealloc(self) Per_dealloc(self)
Perobject *self; cPersistentObject *self;
{ {
Py_XDECREF(self->oid); Py_XDECREF(self->oid);
Py_XDECREF(self->jar); Py_XDECREF(self->jar);
...@@ -446,7 +448,7 @@ Per_dealloc(self) ...@@ -446,7 +448,7 @@ Per_dealloc(self)
} }
static void static void
Per_set_atime(Perobject *self) Per_set_atime(cPersistentObject *self)
{ {
/* Record access times */ /* Record access times */
UNLESS(self->atime) UNLESS(self->atime)
...@@ -457,7 +459,7 @@ Per_set_atime(Perobject *self) ...@@ -457,7 +459,7 @@ Per_set_atime(Perobject *self)
} }
static PyObject * static PyObject *
Per_atime(Perobject *self) Per_atime(cPersistentObject *self)
{ {
UNLESS(self->atime) Per_set_atime(self); UNLESS(self->atime) Per_set_atime(self);
Py_XINCREF(self->atime); Py_XINCREF(self->atime);
...@@ -465,7 +467,7 @@ Per_atime(Perobject *self) ...@@ -465,7 +467,7 @@ Per_atime(Perobject *self)
} }
static PyObject * static PyObject *
Per_getattr(Perobject *self, PyObject *oname, char *name) Per_getattr(cPersistentObject *self, PyObject *oname, char *name)
{ {
char *n=name; char *n=name;
...@@ -515,6 +517,15 @@ Per_getattr(Perobject *self, PyObject *oname, char *name) ...@@ -515,6 +517,15 @@ Per_getattr(Perobject *self, PyObject *oname, char *name)
return Per_atime(self); return Per_atime(self);
} }
break; break;
case 'm':
if(strcmp(n,"time")==0)
{
if(self->jar)
return callmethod1(self->jar,py_mtime,(PyObject*)self);
Py_INCREF(Py_None);
return Py_None;
}
break;
case 'r': case 'r':
if(strcmp(n,"ead_time")==0) if(strcmp(n,"ead_time")==0)
{ {
...@@ -551,7 +562,7 @@ Per_getattr(Perobject *self, PyObject *oname, char *name) ...@@ -551,7 +562,7 @@ Per_getattr(Perobject *self, PyObject *oname, char *name)
} }
static PyObject* static PyObject*
Per_getattro(Perobject *self, PyObject *name) Per_getattro(cPersistentObject *self, PyObject *name)
{ {
char *s; char *s;
...@@ -560,7 +571,18 @@ Per_getattro(Perobject *self, PyObject *name) ...@@ -560,7 +571,18 @@ Per_getattro(Perobject *self, PyObject *name)
} }
static int static int
Per_setattro(Perobject *self, PyObject *oname, PyObject *v) changed(PyObject *self)
{
PyObject *c;
UNLESS(c=PyObject_GetAttr(self,py___changed__)) return -1;
UNLESS_ASSIGN(c,PyObject_CallObject(c,py_onearg)) return -1;
Py_DECREF(c);
return 0;
}
static int
Per_setattro(cPersistentObject *self, PyObject *oname, PyObject *v)
{ {
char *name=""; char *name="";
...@@ -615,11 +637,7 @@ Per_setattro(Perobject *self, PyObject *oname, PyObject *v) ...@@ -615,11 +637,7 @@ Per_setattro(Perobject *self, PyObject *oname, PyObject *v)
if(! (*name=='_' && name[1]=='v' && name[2]=='_') if(! (*name=='_' && name[1]=='v' && name[2]=='_')
&& self->state != CHANGED_STATE && self->jar) && self->state != CHANGED_STATE && self->jar)
{ if(changed((PyObject*)self) < 0) return -1;
UNLESS(r=callmethod1((PyObject*)self,py___changed__,py_one))
return -1;
Py_DECREF(r);
}
} }
return PyEC_SetAttr((PyObject*)self,oname,v); return PyEC_SetAttr((PyObject*)self,oname,v);
...@@ -651,7 +669,7 @@ static PyExtensionClass Pertype = { ...@@ -651,7 +669,7 @@ static PyExtensionClass Pertype = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"Persistent", /*tp_name*/ "Persistent", /*tp_name*/
sizeof(Perobject), /*tp_basicsize*/ sizeof(cPersistentObject), /*tp_basicsize*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
/* methods */ /* methods */
(destructor)Per_dealloc, /*tp_dealloc*/ (destructor)Per_dealloc, /*tp_dealloc*/
...@@ -687,20 +705,25 @@ static struct PyMethodDef cP_methods[] = { ...@@ -687,20 +705,25 @@ static struct PyMethodDef cP_methods[] = {
/* Initialization function for the module (*must* be called initcPersistence) */ /* Initialization function for the module (*must* be called initcPersistence) */
static char cPersistence_module_documentation[] = static cPersistenceCAPIstruct
"" truecPersistenceCAPI = {
; &(Pertype.methods),
(getattrofunc)Per_getattro, /*tp_getattr with object key*/
(setattrofunc)Per_setattro, /*tp_setattr with object key*/
changed,
Per_setstate,
};
void void
initcPersistence() initcPersistence()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.3 $"; char *rev="$Revision: 1.4 $";
PATimeType.ob_type=&PyType_Type; PATimeType.ob_type=&PyType_Type;
m = Py_InitModule4("cPersistence", cP_methods, m = Py_InitModule4("cPersistence", cP_methods,
cPersistence_module_documentation, "",
(PyObject*)NULL,PYTHON_API_VERSION); (PyObject*)NULL,PYTHON_API_VERSION);
init_strings(); init_strings();
...@@ -710,12 +733,25 @@ initcPersistence() ...@@ -710,12 +733,25 @@ initcPersistence()
PyString_FromStringAndSize(rev+11,strlen(rev+11)-2)); PyString_FromStringAndSize(rev+11,strlen(rev+11)-2));
PyExtensionClass_Export(d,"Persistent",Pertype); PyExtensionClass_Export(d,"Persistent",Pertype);
PyDict_SetItemString(d,"atimeType",(PyObject*)&PATimeType); PyDict_SetItemString(d,"atimeType",(PyObject*)&PATimeType);
cPersistenceCAPI=&truecPersistenceCAPI;
PyDict_SetItemString(d, "CAPI",
PyCObject_FromVoidPtr(cPersistenceCAPI,NULL));
CHECK_FOR_ERRORS("can't initialize module dt"); CHECK_FOR_ERRORS("can't initialize module dt");
} }
/**************************************************************************** /****************************************************************************
$Log: cPersistence.c,v $ $Log: cPersistence.c,v $
Revision 1.4 1997/03/14 22:51:40 jim
Added exported C interface, so that other C classes could subclass
from it.
Added _p_mtime attribute, which returns the persistent modification
time.
Revision 1.3 1997/03/11 20:53:07 jim Revision 1.3 1997/03/11 20:53:07 jim
Added access-time tracking and special type for efficient access time Added access-time tracking and special type for efficient access time
management. management.
......
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