mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #29300: Use Argument Clinic for getting struct object from the format.

Browse source
This commit is contained in:
Serhiy Storchaka 2017-02-04 11:14:52 +02:00
parent 8973de5bab
commit a5a55902c1
2 changed files with 103 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

117
Modules/_struct.c
View file

@ -85,6 +85,19 @@ typedef struct { char c; long long x; } s_long_long;
#pragma options align=reset #pragma options align=reset
#endif #endif
/*[python input]
class cache_struct_converter(CConverter):
type = 'PyStructObject *'
converter = 'cache_struct_converter'
c_default = "NULL"
def cleanup(self):
return "Py_XDECREF(%s);\n" % self.name
[python start generated code]*/
/*[python end generated code: output=da39a3ee5e6b4b0d input=49957cca130ffb63]*/
static int cache_struct_converter(PyObject *, PyObject **);
#include "clinic/_struct.c.h" #include "clinic/_struct.c.h"
/* Helper for integer format codes: converts an arbitrary Python object to a /* Helper for integer format codes: converts an arbitrary Python object to a
@ -2037,21 +2050,27 @@ PyTypeObject PyStructType = {
#define MAXCACHE 100 #define MAXCACHE 100
static PyObject *cache = NULL; static PyObject *cache = NULL;
static PyStructObject * static int
cache_struct(PyObject *fmt) cache_struct_converter(PyObject *fmt, PyObject **ptr)
{ {
PyObject * s_object; PyObject * s_object;
if (fmt == NULL) {
Py_DECREF(*ptr);
return 1;
}
if (cache == NULL) { if (cache == NULL) {
cache = PyDict_New(); cache = PyDict_New();
if (cache == NULL) if (cache == NULL)
return NULL; return 0;
} }
s_object = PyDict_GetItem(cache, fmt); s_object = PyDict_GetItem(cache, fmt);
if (s_object != NULL) { if (s_object != NULL) {
Py_INCREF(s_object); Py_INCREF(s_object);
return (PyStructObject *)s_object; *ptr = s_object;
return Py_CLEANUP_SUPPORTED;
} }
s_object = PyObject_CallFunctionObjArgs((PyObject *)(&PyStructType), fmt, NULL); s_object = PyObject_CallFunctionObjArgs((PyObject *)(&PyStructType), fmt, NULL);
@ -2061,8 +2080,10 @@ cache_struct(PyObject *fmt)
/* Attempt to cache the result */ /* Attempt to cache the result */
if (PyDict_SetItem(cache, fmt, s_object) == -1) if (PyDict_SetItem(cache, fmt, s_object) == -1)
PyErr_Clear(); PyErr_Clear();
*ptr = s_object;
return Py_CLEANUP_SUPPORTED;
} }
return (PyStructObject *)s_object; return 0;
} }
/*[clinic input] /*[clinic input]
@ -2081,25 +2102,19 @@ _clearcache_impl(PyObject *module)
/*[clinic input] /*[clinic input]
calcsize calcsize -> Py_ssize_t
format: object format as s_object: cache_struct
/ /
Return size in bytes of the struct described by the format string. Return size in bytes of the struct described by the format string.
[clinic start generated code]*/ [clinic start generated code]*/
static PyObject * static Py_ssize_t
calcsize(PyObject *module, PyObject *format) calcsize_impl(PyObject *module, PyStructObject *s_object)
/*[clinic end generated code: output=90fbcf191fe9470a input=55488303a06777fa]*/ /*[clinic end generated code: output=db7d23d09c6932c4 input=96a6a590c7717ecd]*/
{ {
Py_ssize_t n; return s_object->s_size;
PyStructObject *s_object = cache_struct(format);
if (s_object == NULL)
return NULL;
n = s_object->s_size;
Py_DECREF(s_object);
return PyLong_FromSsize_t(n);
} }
PyDoc_STRVAR(pack_doc, PyDoc_STRVAR(pack_doc,
@ -2111,7 +2126,7 @@ to the format string. See help(struct) for more on format strings.");
static PyObject * static PyObject *
pack(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) pack(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
{ {
PyStructObject *s_object; PyObject *s_object = NULL;
PyObject *format, *result; PyObject *format, *result;
if (nargs == 0) { if (nargs == 0) {
@ -2120,11 +2135,10 @@ pack(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
} }
format = args[0]; format = args[0];
s_object = cache_struct(format); if (!cache_struct_converter(format, &s_object)) {
if (s_object == NULL) {
return NULL; return NULL;
} }
result = s_pack((PyObject *)s_object, args + 1, nargs - 1, kwnames); result = s_pack(s_object, args + 1, nargs - 1, kwnames);
Py_DECREF(s_object); Py_DECREF(s_object);
return result; return result;
} }
@ -2140,7 +2154,7 @@ on format strings.");
static PyObject * static PyObject *
pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
{ {
PyStructObject *s_object; PyObject *s_object = NULL;
PyObject *format, *result; PyObject *format, *result;
if (nargs == 0) { if (nargs == 0) {
@ -2149,11 +2163,10 @@ pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
} }
format = args[0]; format = args[0];
s_object = cache_struct(format); if (!cache_struct_converter(format, &s_object)) {
if (s_object == NULL) {
return NULL; return NULL;
} }
result = s_pack_into((PyObject *)s_object, args + 1, nargs - 1, kwnames); result = s_pack_into(s_object, args + 1, nargs - 1, kwnames);
Py_DECREF(s_object); Py_DECREF(s_object);
return result; return result;
} }
@ -2161,7 +2174,7 @@ pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
/*[clinic input] /*[clinic input]
unpack unpack
format: object format as s_object: cache_struct
buffer: Py_buffer buffer: Py_buffer
/ /
@ -2173,24 +2186,16 @@ See help(struct) for more on format strings.
[clinic start generated code]*/ [clinic start generated code]*/
static PyObject * static PyObject *
unpack_impl(PyObject *module, PyObject *format, Py_buffer *buffer) unpack_impl(PyObject *module, PyStructObject *s_object, Py_buffer *buffer)
/*[clinic end generated code: output=f75ada02aaa33b3b input=654078e6660c2df0]*/ /*[clinic end generated code: output=48ddd4d88eca8551 input=05fa3b91678da727]*/
{ {
PyStructObject *s_object; return Struct_unpack_impl(s_object, buffer);
PyObject *result;
s_object = cache_struct(format);
if (s_object == NULL)
return NULL;
result = Struct_unpack_impl(s_object, buffer);
Py_DECREF(s_object);
return result;
} }
/*[clinic input] /*[clinic input]
unpack_from unpack_from
format: object format as s_object: cache_struct
/ /
buffer: Py_buffer buffer: Py_buffer
offset: Py_ssize_t = 0 offset: Py_ssize_t = 0
@ -2203,27 +2208,17 @@ See help(struct) for more on format strings.
[clinic start generated code]*/ [clinic start generated code]*/
static PyObject * static PyObject *
unpack_from_impl(PyObject *module, PyObject *format, Py_buffer *buffer, unpack_from_impl(PyObject *module, PyStructObject *s_object,
Py_ssize_t offset) Py_buffer *buffer, Py_ssize_t offset)
/*[clinic end generated code: output=2492f0c3a0b82577 input=9ead76c6ac7164f7]*/ /*[clinic end generated code: output=1042631674c6e0d3 input=6e80a5398e985025]*/
{ {
PyStructObject *s_object; return Struct_unpack_from_impl(s_object, buffer, offset);
PyObject *result;
s_object = cache_struct(format);
if (s_object == NULL) {
return NULL;
}
result = Struct_unpack_from_impl(s_object, buffer, offset);
Py_DECREF(s_object);
return result;
} }
/*[clinic input] /*[clinic input]
iter_unpack iter_unpack
format: object format as s_object: cache_struct
buffer: object buffer: object
/ /
@ -2236,19 +2231,11 @@ Requires that the bytes length be a multiple of the format struct size.
[clinic start generated code]*/ [clinic start generated code]*/
static PyObject * static PyObject *
iter_unpack_impl(PyObject *module, PyObject *format, PyObject *buffer) iter_unpack_impl(PyObject *module, PyStructObject *s_object,
/*[clinic end generated code: output=b1291e97a6d4cf3c input=8674dfd2f0dae416]*/ PyObject *buffer)
/*[clinic end generated code: output=0ae50e250d20e74d input=b214a58869a3c98d]*/
{ {
PyStructObject *s_object; return Struct_iter_unpack(s_object, buffer);
PyObject *result;
s_object = cache_struct(format);
if (s_object == NULL)
return NULL;
result = Struct_iter_unpack(s_object, buffer);
Py_DECREF(s_object);
return result;
} }
static struct PyMethodDef module_functions[] = { static struct PyMethodDef module_functions[] = {

69
Modules/clinic/_struct.c.h
View file

@ -155,6 +155,32 @@ PyDoc_STRVAR(calcsize__doc__,
#define CALCSIZE_METHODDEF \ #define CALCSIZE_METHODDEF \
{"calcsize", (PyCFunction)calcsize, METH_O, calcsize__doc__}, {"calcsize", (PyCFunction)calcsize, METH_O, calcsize__doc__},
static Py_ssize_t
calcsize_impl(PyObject *module, PyStructObject *s_object);
static PyObject *
calcsize(PyObject *module, PyObject *arg)
{
PyObject *return_value = NULL;
PyStructObject *s_object = NULL;
Py_ssize_t _return_value;
if (!PyArg_Parse(arg, "O&:calcsize", cache_struct_converter, &s_object)) {
goto exit;
}
_return_value = calcsize_impl(module, s_object);
if ((_return_value == -1) && PyErr_Occurred()) {
goto exit;
}
return_value = PyLong_FromSsize_t(_return_value);
exit:
/* Cleanup for s_object */
Py_XDECREF(s_object);
return return_value;
}
PyDoc_STRVAR(unpack__doc__, PyDoc_STRVAR(unpack__doc__,
"unpack($module, format, buffer, /)\n" "unpack($module, format, buffer, /)\n"
"--\n" "--\n"
@ -169,26 +195,28 @@ PyDoc_STRVAR(unpack__doc__,
{"unpack", (PyCFunction)unpack, METH_FASTCALL, unpack__doc__}, {"unpack", (PyCFunction)unpack, METH_FASTCALL, unpack__doc__},
static PyObject * static PyObject *
unpack_impl(PyObject *module, PyObject *format, Py_buffer *buffer); unpack_impl(PyObject *module, PyStructObject *s_object, Py_buffer *buffer);
static PyObject * static PyObject *
unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
{ {
PyObject *return_value = NULL; PyObject *return_value = NULL;
PyObject *format; PyStructObject *s_object = NULL;
Py_buffer buffer = {NULL, NULL}; Py_buffer buffer = {NULL, NULL};
if (!_PyArg_ParseStack(args, nargs, "Oy*:unpack", if (!_PyArg_ParseStack(args, nargs, "O&y*:unpack",
&format, &buffer)) { cache_struct_converter, &s_object, &buffer)) {
goto exit; goto exit;
} }
if (!_PyArg_NoStackKeywords("unpack", kwnames)) { if (!_PyArg_NoStackKeywords("unpack", kwnames)) {
goto exit; goto exit;
} }
return_value = unpack_impl(module, format, &buffer); return_value = unpack_impl(module, s_object, &buffer);
exit: exit:
/* Cleanup for s_object */
Py_XDECREF(s_object);
/* Cleanup for buffer */ /* Cleanup for buffer */
if (buffer.obj) { if (buffer.obj) {
PyBuffer_Release(&buffer); PyBuffer_Release(&buffer);
@ -211,26 +239,28 @@ PyDoc_STRVAR(unpack_from__doc__,
{"unpack_from", (PyCFunction)unpack_from, METH_FASTCALL, unpack_from__doc__}, {"unpack_from", (PyCFunction)unpack_from, METH_FASTCALL, unpack_from__doc__},
static PyObject * static PyObject *
unpack_from_impl(PyObject *module, PyObject *format, Py_buffer *buffer, unpack_from_impl(PyObject *module, PyStructObject *s_object,
Py_ssize_t offset); Py_buffer *buffer, Py_ssize_t offset);
static PyObject * static PyObject *
unpack_from(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) unpack_from(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
{ {
PyObject *return_value = NULL; PyObject *return_value = NULL;
static const char * const _keywords[] = {"", "buffer", "offset", NULL}; static const char * const _keywords[] = {"", "buffer", "offset", NULL};
static _PyArg_Parser _parser = {"Oy*|n:unpack_from", _keywords, 0}; static _PyArg_Parser _parser = {"O&y*|n:unpack_from", _keywords, 0};
PyObject *format; PyStructObject *s_object = NULL;
Py_buffer buffer = {NULL, NULL}; Py_buffer buffer = {NULL, NULL};
Py_ssize_t offset = 0; Py_ssize_t offset = 0;
if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser, if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser,
&format, &buffer, &offset)) { cache_struct_converter, &s_object, &buffer, &offset)) {
goto exit; goto exit;
} }
return_value = unpack_from_impl(module, format, &buffer, offset); return_value = unpack_from_impl(module, s_object, &buffer, offset);
exit: exit:
/* Cleanup for s_object */
Py_XDECREF(s_object);
/* Cleanup for buffer */ /* Cleanup for buffer */
if (buffer.obj) { if (buffer.obj) {
PyBuffer_Release(&buffer); PyBuffer_Release(&buffer);
@ -254,27 +284,30 @@ PyDoc_STRVAR(iter_unpack__doc__,
{"iter_unpack", (PyCFunction)iter_unpack, METH_FASTCALL, iter_unpack__doc__}, {"iter_unpack", (PyCFunction)iter_unpack, METH_FASTCALL, iter_unpack__doc__},
static PyObject * static PyObject *
iter_unpack_impl(PyObject *module, PyObject *format, PyObject *buffer); iter_unpack_impl(PyObject *module, PyStructObject *s_object,
PyObject *buffer);
static PyObject * static PyObject *
iter_unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) iter_unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
{ {
PyObject *return_value = NULL; PyObject *return_value = NULL;
PyObject *format; PyStructObject *s_object = NULL;
PyObject *buffer; PyObject *buffer;
if (!_PyArg_UnpackStack(args, nargs, "iter_unpack", if (!_PyArg_ParseStack(args, nargs, "O&O:iter_unpack",
2, 2, cache_struct_converter, &s_object, &buffer)) {
&format, &buffer)) {
goto exit; goto exit;
} }
if (!_PyArg_NoStackKeywords("iter_unpack", kwnames)) { if (!_PyArg_NoStackKeywords("iter_unpack", kwnames)) {
goto exit; goto exit;
} }
return_value = iter_unpack_impl(module, format, buffer); return_value = iter_unpack_impl(module, s_object, buffer);
exit: exit:
/* Cleanup for s_object */
Py_XDECREF(s_object);
return return_value; return return_value;
} }
/*[clinic end generated code: output=0714090a5d0ea8ce input=a9049054013a1b77]*/ /*[clinic end generated code: output=03e0d193ab1983f9 input=a9049054013a1b77]*/