Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-34141: Optimized pickling simple non-recursive values. (GH-8318)

This commit is contained in:
Serhiy Storchaka 2018-07-18 10:10:49 +03:00 committed by GitHub
parent feabae9617
commit 5d4cb54800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2018-07-18-08-36-58.bpo-34141.Fo7Q5r.rst Normal file
View File

@ -0,0 +1 @@
Optimized pickling atomic types (None, bool, int, float, bytes, str).

36
Modules/_pickle.c
View File

@ -3940,9 +3940,6 @@ save(PicklerObject *self, PyObject *obj, int pers_save)
if (_Pickler_OpcodeBoundary(self) < 0) if (_Pickler_OpcodeBoundary(self) < 0)
return -1; return -1;
if (Py_EnterRecursiveCall(" while pickling an object"))
return -1;
/* The extra pers_save argument is necessary to avoid calling save_pers() /* The extra pers_save argument is necessary to avoid calling save_pers()
on its returned object. */ on its returned object. */
if (!pers_save && self->pers_func) { if (!pers_save && self->pers_func) {
@ -3952,7 +3949,7 @@ save(PicklerObject *self, PyObject *obj, int pers_save)
1 if a persistent id was saved. 1 if a persistent id was saved.
*/ */
if ((status = save_pers(self, obj)) != 0) if ((status = save_pers(self, obj)) != 0)
goto done; return status;
} }
type = Py_TYPE(obj); type = Py_TYPE(obj);
@ -3965,40 +3962,39 @@ save(PicklerObject *self, PyObject *obj, int pers_save)
/* Atom types; these aren't memoized, so don't check the memo. */ /* Atom types; these aren't memoized, so don't check the memo. */
if (obj == Py_None) { if (obj == Py_None) {
status = save_none(self, obj); return save_none(self, obj);
goto done;
} }
else if (obj == Py_False || obj == Py_True) { else if (obj == Py_False || obj == Py_True) {
status = save_bool(self, obj); return save_bool(self, obj);
goto done;
} }
else if (type == &PyLong_Type) { else if (type == &PyLong_Type) {
status = save_long(self, obj); return save_long(self, obj);
goto done;
} }
else if (type == &PyFloat_Type) { else if (type == &PyFloat_Type) {
status = save_float(self, obj); return save_float(self, obj);
goto done;
} }
/* Check the memo to see if it has the object. If so, generate /* Check the memo to see if it has the object. If so, generate
a GET (or BINGET) opcode, instead of pickling the object a GET (or BINGET) opcode, instead of pickling the object
once again. */ once again. */
if (PyMemoTable_Get(self->memo, obj)) { if (PyMemoTable_Get(self->memo, obj)) {
if (memo_get(self, obj) < 0) return memo_get(self, obj);
goto error;
goto done;
} }
if (type == &PyBytes_Type) { if (type == &PyBytes_Type) {
status = save_bytes(self, obj); return save_bytes(self, obj);
goto done;
} }
else if (type == &PyUnicode_Type) { else if (type == &PyUnicode_Type) {
status = save_unicode(self, obj); return save_unicode(self, obj);
goto done;
} }
else if (type == &PyDict_Type) {
/* We're only calling Py_EnterRecursiveCall here so that atomic
types above are pickled faster. */
if (Py_EnterRecursiveCall(" while pickling an object")) {
return -1;
}
if (type == &PyDict_Type) {
status = save_dict(self, obj); status = save_dict(self, obj);
goto done; goto done;
} }