Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
persistent
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
persistent
Commits
4d506a87
Commit
4d506a87
authored
Dec 12, 2012
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get cPersistent extension compilable under Py3k.
parent
8906ef37
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
79 additions
and
29 deletions
+79
-29
persistent/cPersistence.c
persistent/cPersistence.c
+57
-29
persistent/cPersistence.h
persistent/cPersistence.h
+22
-0
No files found.
persistent/cPersistence.c
View file @
4d506a87
...
@@ -39,7 +39,7 @@ static int
...
@@ -39,7 +39,7 @@ static int
init_strings
(
void
)
init_strings
(
void
)
{
{
#define INIT_STRING(S) \
#define INIT_STRING(S) \
if (!(py_ ## S =
PyString_InternFromString
(#S))) \
if (!(py_ ## S =
INTERN
(#S))) \
return -1;
return -1;
INIT_STRING
(
keys
);
INIT_STRING
(
keys
);
INIT_STRING
(
setstate
);
INIT_STRING
(
setstate
);
...
@@ -75,7 +75,7 @@ fatal_1350(cPersistentObject *self, const char *caller, const char *detail)
...
@@ -75,7 +75,7 @@ fatal_1350(cPersistentObject *self, const char *caller, const char *detail)
"unghost the object simultaneously.
\n
"
"unghost the object simultaneously.
\n
"
"That's not legal, but ZODB can't stop it.
\n
"
"That's not legal, but ZODB can't stop it.
\n
"
"See Collector #1350.
\n
"
,
"See Collector #1350.
\n
"
,
caller
,
self
,
self
->
ob_type
->
tp_name
,
detail
);
caller
,
self
,
Py_TYPE
(
self
)
->
tp_name
,
detail
);
Py_FatalError
(
buf
);
Py_FatalError
(
buf
);
}
}
#endif
#endif
...
@@ -124,7 +124,7 @@ unghostify(cPersistentObject *self)
...
@@ -124,7 +124,7 @@ unghostify(cPersistentObject *self)
#else
#else
PyErr_Format
(
PyExc_SystemError
,
"object at %p with type "
PyErr_Format
(
PyExc_SystemError
,
"object at %p with type "
"%.200s not in the cache despite that we just "
"%.200s not in the cache despite that we just "
"unghostified it"
,
self
,
self
->
ob_type
->
tp_name
);
"unghostified it"
,
self
,
Py_TYPE
(
self
)
->
tp_name
);
return
-
1
;
return
-
1
;
#endif
#endif
}
}
...
@@ -204,7 +204,7 @@ changed(cPersistentObject *self)
...
@@ -204,7 +204,7 @@ changed(cPersistentObject *self)
static
PyObject
*
s_register
;
static
PyObject
*
s_register
;
if
(
s_register
==
NULL
)
if
(
s_register
==
NULL
)
s_register
=
PyString_InternFromString
(
"register"
);
s_register
=
INTERN
(
"register"
);
meth
=
PyObject_GetAttr
((
PyObject
*
)
self
->
jar
,
s_register
);
meth
=
PyObject_GetAttr
((
PyObject
*
)
self
->
jar
,
s_register
);
if
(
meth
==
NULL
)
if
(
meth
==
NULL
)
return
-
1
;
return
-
1
;
...
@@ -240,7 +240,7 @@ readCurrent(cPersistentObject *self)
...
@@ -240,7 +240,7 @@ readCurrent(cPersistentObject *self)
PyObject
*
r
;
PyObject
*
r
;
if
(
s_readCurrent
==
NULL
)
if
(
s_readCurrent
==
NULL
)
s_readCurrent
=
PyString_InternFromString
(
"readCurrent"
);
s_readCurrent
=
INTERN
(
"readCurrent"
);
r
=
PyObject_CallMethodObjArgs
(
self
->
jar
,
s_readCurrent
,
self
,
NULL
);
r
=
PyObject_CallMethodObjArgs
(
self
->
jar
,
s_readCurrent
,
self
,
NULL
);
if
(
r
==
NULL
)
if
(
r
==
NULL
)
...
@@ -348,9 +348,9 @@ pickle_copy_dict(PyObject *state)
...
@@ -348,9 +348,9 @@ pickle_copy_dict(PyObject *state)
while
(
PyDict_Next
(
state
,
&
pos
,
&
key
,
&
value
))
while
(
PyDict_Next
(
state
,
&
pos
,
&
key
,
&
value
))
{
{
if
(
key
&&
Py
String
_Check
(
key
))
if
(
key
&&
Py
Bytes
_Check
(
key
))
{
{
ckey
=
Py
String
_AS_STRING
(
key
);
ckey
=
Py
Bytes
_AS_STRING
(
key
);
if
(
*
ckey
==
'_'
&&
if
(
*
ckey
==
'_'
&&
(
ckey
[
1
]
==
'v'
||
ckey
[
1
]
==
'p'
)
&&
(
ckey
[
1
]
==
'v'
||
ckey
[
1
]
==
'p'
)
&&
ckey
[
2
]
==
'_'
)
ckey
[
2
]
==
'_'
)
...
@@ -392,7 +392,7 @@ pickle___getstate__(PyObject *self)
...
@@ -392,7 +392,7 @@ pickle___getstate__(PyObject *self)
PyObject
**
dictp
;
PyObject
**
dictp
;
int
n
=
0
;
int
n
=
0
;
slotnames
=
pickle_slotnames
(
self
->
ob_type
);
slotnames
=
pickle_slotnames
(
Py_TYPE
(
self
)
);
if
(
!
slotnames
)
if
(
!
slotnames
)
return
NULL
;
return
NULL
;
...
@@ -419,9 +419,9 @@ pickle___getstate__(PyObject *self)
...
@@ -419,9 +419,9 @@ pickle___getstate__(PyObject *self)
char
*
cname
;
char
*
cname
;
name
=
PyList_GET_ITEM
(
slotnames
,
i
);
name
=
PyList_GET_ITEM
(
slotnames
,
i
);
if
(
Py
String
_Check
(
name
))
if
(
Py
Bytes
_Check
(
name
))
{
{
cname
=
Py
String
_AS_STRING
(
name
);
cname
=
Py
Bytes
_AS_STRING
(
name
);
if
(
*
cname
==
'_'
&&
if
(
*
cname
==
'_'
&&
(
cname
[
1
]
==
'v'
||
cname
[
1
]
==
'p'
)
&&
(
cname
[
1
]
==
'v'
||
cname
[
1
]
==
'p'
)
&&
cname
[
2
]
==
'_'
)
cname
[
2
]
==
'_'
)
...
@@ -567,8 +567,8 @@ pickle___reduce__(PyObject *self)
...
@@ -567,8 +567,8 @@ pickle___reduce__(PyObject *self)
if
(
args
==
NULL
)
if
(
args
==
NULL
)
goto
end
;
goto
end
;
Py_INCREF
(
self
->
ob_type
);
Py_INCREF
(
Py_TYPE
(
self
)
);
PyTuple_SET_ITEM
(
args
,
0
,
(
PyObject
*
)(
self
->
ob_type
));
PyTuple_SET_ITEM
(
args
,
0
,
(
PyObject
*
)(
Py_TYPE
(
self
)
));
for
(
i
=
0
;
i
<
l
;
i
++
)
for
(
i
=
0
;
i
<
l
;
i
++
)
{
{
Py_INCREF
(
PyTuple_GET_ITEM
(
bargs
,
i
));
Py_INCREF
(
PyTuple_GET_ITEM
(
bargs
,
i
));
...
@@ -647,7 +647,7 @@ Per_dealloc(cPersistentObject *self)
...
@@ -647,7 +647,7 @@ Per_dealloc(cPersistentObject *self)
Py_XDECREF
(
self
->
cache
);
Py_XDECREF
(
self
->
cache
);
Py_XDECREF
(
self
->
jar
);
Py_XDECREF
(
self
->
jar
);
Py_XDECREF
(
self
->
oid
);
Py_XDECREF
(
self
->
oid
);
self
->
ob_type
->
tp_free
(
self
);
Py_TYPE
(
self
)
->
tp_free
(
self
);
}
}
static
int
static
int
...
@@ -687,7 +687,7 @@ convert_name(PyObject *name)
...
@@ -687,7 +687,7 @@ convert_name(PyObject *name)
}
}
else
else
#endif
#endif
if
(
!
Py
String
_Check
(
name
))
if
(
!
Py
Bytes
_Check
(
name
))
{
{
PyErr_SetString
(
PyExc_TypeError
,
"attribute name must be a string"
);
PyErr_SetString
(
PyExc_TypeError
,
"attribute name must be a string"
);
return
NULL
;
return
NULL
;
...
@@ -755,7 +755,7 @@ Per_getattro(cPersistentObject *self, PyObject *name)
...
@@ -755,7 +755,7 @@ Per_getattro(cPersistentObject *self, PyObject *name)
name
=
convert_name
(
name
);
name
=
convert_name
(
name
);
if
(
!
name
)
if
(
!
name
)
goto
Done
;
goto
Done
;
s
=
Py
String
_AS_STRING
(
name
);
s
=
Py
Bytes
_AS_STRING
(
name
);
if
(
unghost_getattr
(
s
))
if
(
unghost_getattr
(
s
))
{
{
...
@@ -780,7 +780,7 @@ Per__p_getattr(cPersistentObject *self, PyObject *name)
...
@@ -780,7 +780,7 @@ Per__p_getattr(cPersistentObject *self, PyObject *name)
name
=
convert_name
(
name
);
name
=
convert_name
(
name
);
if
(
!
name
)
if
(
!
name
)
goto
Done
;
goto
Done
;
s
=
Py
String
_AS_STRING
(
name
);
s
=
Py
Bytes
_AS_STRING
(
name
);
if
(
*
s
!=
'_'
||
unghost_getattr
(
s
))
if
(
*
s
!=
'_'
||
unghost_getattr
(
s
))
{
{
...
@@ -812,7 +812,7 @@ Per_setattro(cPersistentObject *self, PyObject *name, PyObject *v)
...
@@ -812,7 +812,7 @@ Per_setattro(cPersistentObject *self, PyObject *name, PyObject *v)
name
=
convert_name
(
name
);
name
=
convert_name
(
name
);
if
(
!
name
)
if
(
!
name
)
goto
Done
;
goto
Done
;
s
=
Py
String
_AS_STRING
(
name
);
s
=
Py
Bytes
_AS_STRING
(
name
);
if
(
strncmp
(
s
,
"_p_"
,
3
)
!=
0
)
if
(
strncmp
(
s
,
"_p_"
,
3
)
!=
0
)
{
{
...
@@ -843,7 +843,7 @@ Per_p_set_or_delattro(cPersistentObject *self, PyObject *name, PyObject *v)
...
@@ -843,7 +843,7 @@ Per_p_set_or_delattro(cPersistentObject *self, PyObject *name, PyObject *v)
name
=
convert_name
(
name
);
name
=
convert_name
(
name
);
if
(
!
name
)
if
(
!
name
)
goto
Done
;
goto
Done
;
s
=
Py
String
_AS_STRING
(
name
);
s
=
Py
Bytes
_AS_STRING
(
name
);
if
(
strncmp
(
s
,
"_p_"
,
3
))
if
(
strncmp
(
s
,
"_p_"
,
3
))
{
{
...
@@ -1001,7 +1001,8 @@ Per_set_oid(cPersistentObject *self, PyObject *v)
...
@@ -1001,7 +1001,8 @@ Per_set_oid(cPersistentObject *self, PyObject *v)
"can't delete _p_oid of cached object"
);
"can't delete _p_oid of cached object"
);
return
-
1
;
return
-
1
;
}
}
if
(
PyObject_Cmp
(
self
->
oid
,
v
,
&
result
)
<
0
)
result
=
PyObject_RichCompareBool
(
self
->
oid
,
v
,
Py_NE
);
if
(
result
<
0
)
return
-
1
;
return
-
1
;
if
(
result
)
if
(
result
)
{
{
...
@@ -1037,7 +1038,8 @@ Per_set_jar(cPersistentObject *self, PyObject *v)
...
@@ -1037,7 +1038,8 @@ Per_set_jar(cPersistentObject *self, PyObject *v)
"can't delete _p_jar of cached object"
);
"can't delete _p_jar of cached object"
);
return
-
1
;
return
-
1
;
}
}
if
(
PyObject_Cmp
(
self
->
jar
,
v
,
&
result
)
<
0
)
result
=
PyObject_RichCompareBool
(
self
->
jar
,
v
,
Py_NE
);
if
(
result
<
0
)
return
-
1
;
return
-
1
;
if
(
result
)
if
(
result
)
{
{
...
@@ -1055,7 +1057,7 @@ Per_set_jar(cPersistentObject *self, PyObject *v)
...
@@ -1055,7 +1057,7 @@ Per_set_jar(cPersistentObject *self, PyObject *v)
static
PyObject
*
static
PyObject
*
Per_get_serial
(
cPersistentObject
*
self
)
Per_get_serial
(
cPersistentObject
*
self
)
{
{
return
Py
String
_FromStringAndSize
(
self
->
serial
,
8
);
return
Py
Bytes
_FromStringAndSize
(
self
->
serial
,
8
);
}
}
static
int
static
int
...
@@ -1063,8 +1065,8 @@ Per_set_serial(cPersistentObject *self, PyObject *v)
...
@@ -1063,8 +1065,8 @@ Per_set_serial(cPersistentObject *self, PyObject *v)
{
{
if
(
v
)
if
(
v
)
{
{
if
(
Py
String_Check
(
v
)
&&
PyString
_GET_SIZE
(
v
)
==
8
)
if
(
Py
Bytes_Check
(
v
)
&&
PyBytes
_GET_SIZE
(
v
)
==
8
)
memcpy
(
self
->
serial
,
Py
String
_AS_STRING
(
v
),
8
);
memcpy
(
self
->
serial
,
Py
Bytes
_AS_STRING
(
v
),
8
);
else
else
{
{
PyErr_SetString
(
PyExc_ValueError
,
PyErr_SetString
(
PyExc_ValueError
,
...
@@ -1104,13 +1106,13 @@ Per_get_mtime(cPersistentObject *self)
...
@@ -1104,13 +1106,13 @@ Per_get_mtime(cPersistentObject *self)
static
PyObject
*
static
PyObject
*
Per_get_state
(
cPersistentObject
*
self
)
Per_get_state
(
cPersistentObject
*
self
)
{
{
return
PyInt_FromLong
(
self
->
state
);
return
INT_FROM_LONG
(
self
->
state
);
}
}
static
PyObject
*
static
PyObject
*
Per_get_estimated_size
(
cPersistentObject
*
self
)
Per_get_estimated_size
(
cPersistentObject
*
self
)
{
{
return
PyInt_FromLong
(
_estimated_size_in_bytes
(
self
->
estimated_size
));
return
INT_FROM_LONG
(
_estimated_size_in_bytes
(
self
->
estimated_size
));
}
}
static
int
static
int
...
@@ -1118,9 +1120,9 @@ Per_set_estimated_size(cPersistentObject *self, PyObject *v)
...
@@ -1118,9 +1120,9 @@ Per_set_estimated_size(cPersistentObject *self, PyObject *v)
{
{
if
(
v
)
if
(
v
)
{
{
if
(
PyInt_Check
(
v
))
if
(
INT_CHECK
(
v
))
{
{
long
lv
=
PyInt
_AS_LONG
(
v
);
long
lv
=
INT
_AS_LONG
(
v
);
if
(
lv
<
0
)
if
(
lv
<
0
)
{
{
PyErr_SetString
(
PyExc_ValueError
,
PyErr_SetString
(
PyExc_ValueError
,
...
@@ -1270,8 +1272,7 @@ static struct PyMethodDef Per_methods[] = {
...
@@ -1270,8 +1272,7 @@ static struct PyMethodDef Per_methods[] = {
#define DEFERRED_ADDRESS(ADDR) 0
#define DEFERRED_ADDRESS(ADDR) 0
static
PyTypeObject
Pertype
=
{
static
PyTypeObject
Pertype
=
{
PyObject_HEAD_INIT
(
DEFERRED_ADDRESS
(
&
PyPersist_MetaType
))
PyVarObject_HEAD_INIT
(
DEFERRED_ADDRESS
(
&
PyPersist_MetaType
),
0
)
0
,
/* ob_size */
"persistent.Persistent"
,
/* tp_name */
"persistent.Persistent"
,
/* tp_name */
sizeof
(
cPersistentObject
),
/* tp_basicsize */
sizeof
(
cPersistentObject
),
/* tp_basicsize */
0
,
/* tp_itemsize */
0
,
/* tp_itemsize */
...
@@ -1355,6 +1356,21 @@ truecPersistenceCAPI = {
...
@@ -1355,6 +1356,21 @@ truecPersistenceCAPI = {
readCurrent
readCurrent
};
};
#ifdef PY3K
static
struct
PyModuleDef
moduledef
=
{
PyModuleDef_HEAD_INIT
,
"cPersistence"
,
/* m_name */
cPersistence_doc_string
,
/* m_doc */
-
1
,
/* m_size */
cPersistence_methods
,
/* m_methods */
NULL
,
/* m_reload */
NULL
,
/* m_traverse */
NULL
,
/* m_clear */
NULL
,
/* m_free */
};
#endif
void
void
initcPersistence
(
void
)
initcPersistence
(
void
)
{
{
...
@@ -1364,10 +1380,18 @@ initcPersistence(void)
...
@@ -1364,10 +1380,18 @@ initcPersistence(void)
if
(
init_strings
()
<
0
)
if
(
init_strings
()
<
0
)
return
;
return
;
#ifdef PY3K
m
=
PyModule_Create
(
&
moduledef
);
#else
m
=
Py_InitModule3
(
"cPersistence"
,
cPersistence_methods
,
m
=
Py_InitModule3
(
"cPersistence"
,
cPersistence_methods
,
cPersistence_doc_string
);
cPersistence_doc_string
);
#endif
#ifdef PY3K
((
PyObject
*
)
&
Pertype
)
->
ob_type
=
&
PyType_Type
;
#else
Pertype
.
ob_type
=
&
PyType_Type
;
Pertype
.
ob_type
=
&
PyType_Type
;
#endif
Pertype
.
tp_new
=
PyType_GenericNew
;
Pertype
.
tp_new
=
PyType_GenericNew
;
if
(
PyType_Ready
(
&
Pertype
)
<
0
)
if
(
PyType_Ready
(
&
Pertype
)
<
0
)
return
;
return
;
...
@@ -1375,7 +1399,11 @@ initcPersistence(void)
...
@@ -1375,7 +1399,11 @@ initcPersistence(void)
return
;
return
;
cPersistenceCAPI
=
&
truecPersistenceCAPI
;
cPersistenceCAPI
=
&
truecPersistenceCAPI
;
#ifdef PY3K
s
=
PyCapsule_New
(
cPersistenceCAPI
,
"CAPI"
,
NULL
);
#else
s
=
PyCObject_FromVoidPtr
(
cPersistenceCAPI
,
NULL
);
s
=
PyCObject_FromVoidPtr
(
cPersistenceCAPI
,
NULL
);
#endif
if
(
!
s
)
if
(
!
s
)
return
;
return
;
if
(
PyModule_AddObject
(
m
,
"CAPI"
,
s
)
<
0
)
if
(
PyModule_AddObject
(
m
,
"CAPI"
,
s
)
<
0
)
...
...
persistent/cPersistence.h
View file @
4d506a87
...
@@ -17,6 +17,28 @@
...
@@ -17,6 +17,28 @@
#include "Python.h"
#include "Python.h"
#if PY_MAJOR_VERSION >= 3
#define PY3K
#endif
#ifdef PY3K
#define INTERN PyUnicode_InternFromString
#else
#define INTERN PyString_InternFromString
#endif
#ifdef PY3K
#define INT_FROM_LONG(x) PyLong_FromLong(x)
#define INT_CHECK(x) PyLong_Check(x)
#define INT_AS_LONG(x) PyLong_AS_LONG(x)
#else
#define INT_FROM_LONG(x) PyInt_FromLong(x)
#define INT_CHECK(x) PyInt_Check(x)
#define INT_AS_LONG(x) PyInt_AS_LONG(x)
#endif
#include "bytesobject.h"
#include "ring.h"
#include "ring.h"
#define CACHE_HEAD \
#define CACHE_HEAD \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment