cpython-lru_cache-weakref: Modules/

annotate Modules/_pickle.c @ 78069:a8aa77458e12 3.2

Add c_size_t and c_ssize_t to the ctypes summary table.

author	Antoine Pitrou <solipsis@pitrou.net>
date	Thu, 12 Jul 2012 20:31:50 +0200
parents	14695b4825dc
children	55fe4b57dd9c 98df29d51e12

rev	line source
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1 #include "Python.h"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2 #include "structmember.h"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4 PyDoc_STRVAR(pickle_module_doc,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5 "Optimized C implementation for the Python pickle module.");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	7 /* Bump this when new opcodes are added to the pickle protocol. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	8 enum {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	9 HIGHEST_PROTOCOL = 3,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	10 DEFAULT_PROTOCOL = 3
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	11 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	12
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	13 /* Pickle opcodes. These must be kept updated with pickle.py.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	14 Extensive docs are in pickletools.py. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	15 enum opcode {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	16 MARK = '(',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	17 STOP = '.',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	18 POP = '0',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	19 POP_MARK = '1',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	20 DUP = '2',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	21 FLOAT = 'F',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	22 INT = 'I',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	23 BININT = 'J',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	24 BININT1 = 'K',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	25 LONG = 'L',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	26 BININT2 = 'M',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	27 NONE = 'N',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	28 PERSID = 'P',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	29 BINPERSID = 'Q',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	30 REDUCE = 'R',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	31 STRING = 'S',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	32 BINSTRING = 'T',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	33 SHORT_BINSTRING = 'U',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	34 UNICODE = 'V',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	35 BINUNICODE = 'X',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	36 APPEND = 'a',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	37 BUILD = 'b',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	38 GLOBAL = 'c',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	39 DICT = 'd',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	40 EMPTY_DICT = '}',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	41 APPENDS = 'e',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	42 GET = 'g',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	43 BINGET = 'h',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	44 INST = 'i',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	45 LONG_BINGET = 'j',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	46 LIST = 'l',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	47 EMPTY_LIST = ']',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	48 OBJ = 'o',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	49 PUT = 'p',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	50 BINPUT = 'q',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	51 LONG_BINPUT = 'r',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	52 SETITEM = 's',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	53 TUPLE = 't',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	54 EMPTY_TUPLE = ')',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	55 SETITEMS = 'u',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	56 BINFLOAT = 'G',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	57
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	58 /* Protocol 2. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	59 PROTO = '\x80',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	60 NEWOBJ = '\x81',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	61 EXT1 = '\x82',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	62 EXT2 = '\x83',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	63 EXT4 = '\x84',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	64 TUPLE1 = '\x85',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	65 TUPLE2 = '\x86',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	66 TUPLE3 = '\x87',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	67 NEWTRUE = '\x88',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	68 NEWFALSE = '\x89',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	69 LONG1 = '\x8a',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	70 LONG4 = '\x8b',
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	71
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	72 /* Protocol 3 (Python 3.x) */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	73 BINBYTES = 'B',
66106 194f30dc4703 Issue #10359: Remove useless comma, invalid in ISO C Victor Stinner <victor.stinner@haypocalc.com> parents: 65599 diff changeset	74 SHORT_BINBYTES = 'C'
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	75 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	76
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	77 /* These aren't opcodes -- they're ways to pickle bools before protocol 2
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	78 * so that unpicklers written before bools were introduced unpickle them
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	79 * as ints, but unpicklers after can recognize that bools were intended.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	80 * Note that protocol 2 added direct ways to pickle bools.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	81 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	82 #undef TRUE
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	83 #define TRUE "I01\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	84 #undef FALSE
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	85 #define FALSE "I00\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	86
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	87 enum {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	88 /* Keep in synch with pickle.Pickler._BATCHSIZE. This is how many elements
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	89 batch_list/dict() pumps out before doing APPENDS/SETITEMS. Nothing will
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	90 break if this gets out of synch with pickle.py, but it's unclear that would
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	91 help anything either. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	92 BATCHSIZE = 1000,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	93
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	94 /* Nesting limit until Pickler, when running in "fast mode", starts
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	95 checking for self-referential data-structures. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	96 FAST_NESTING_LIMIT = 50,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	97
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	98 /* Initial size of the write buffer of Pickler. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	99 WRITE_BUF_SIZE = 4096,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	100
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	101 /* Maximum size of the write buffer of Pickler when pickling to a
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	102 stream. This is ignored for in-memory pickling. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	103 MAX_WRITE_BUF_SIZE = 64 * 1024,
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	104
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	105 /* Prefetch size when unpickling (disabled on unpeekable streams) */
66106 194f30dc4703 Issue #10359: Remove useless comma, invalid in ISO C Victor Stinner <victor.stinner@haypocalc.com> parents: 65599 diff changeset	106 PREFETCH = 8192 * 16
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	107 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	108
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	109 /* Exception classes for pickle. These should override the ones defined in
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	110 pickle.py, when the C-optimized Pickler and Unpickler are used. */
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	111 static PyObject *PickleError = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	112 static PyObject *PicklingError = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	113 static PyObject *UnpicklingError = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	114
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	115 /* copyreg.dispatch_table, {type_object: pickling_function} */
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	116 static PyObject *dispatch_table = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	117 /* For EXT[124] opcodes. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	118 /* copyreg._extension_registry, {(module_name, function_name): code} */
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	119 static PyObject *extension_registry = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	120 /* copyreg._inverted_registry, {code: (module_name, function_name)} */
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	121 static PyObject *inverted_registry = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	122 /* copyreg._extension_cache, {code: object} */
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	123 static PyObject *extension_cache = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	124
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	125 /* _compat_pickle.NAME_MAPPING, {(oldmodule, oldname): (newmodule, newname)} */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	126 static PyObject *name_mapping_2to3 = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	127 /* _compat_pickle.IMPORT_MAPPING, {oldmodule: newmodule} */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	128 static PyObject *import_mapping_2to3 = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	129 /* Same, but with REVERSE_NAME_MAPPING / REVERSE_IMPORT_MAPPING */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	130 static PyObject *name_mapping_3to2 = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	131 static PyObject *import_mapping_3to2 = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	132
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	133 /* XXX: Are these really nescessary? */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	134 /* As the name says, an empty tuple. */
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	135 static PyObject *empty_tuple = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	136 /* For looking up name pairs in copyreg._extension_registry. */
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	137 static PyObject *two_tuple = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	138
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	139 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	140 stack_underflow(void)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	141 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	142 PyErr_SetString(UnpicklingError, "unpickling stack underflow");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	143 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	144 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	145
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	146 /* Internal data type used as the unpickling stack. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	147 typedef struct {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	148 PyObject_VAR_HEAD
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	149 PyObject **data;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	150 Py_ssize_t allocated; /* number of slots in data allocated */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	151 } Pdata;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	152
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	153 static void
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	154 Pdata_dealloc(Pdata *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	155 {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	156 Py_ssize_t i = Py_SIZE(self);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	157 while (--i >= 0) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	158 Py_DECREF(self->data[i]);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	159 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	160 PyMem_FREE(self->data);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	161 PyObject_Del(self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	162 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	163
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	164 static PyTypeObject Pdata_Type = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	165 PyVarObject_HEAD_INIT(NULL, 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	166 "_pickle.Pdata", /tp_name/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	167 sizeof(Pdata), /tp_basicsize/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	168 0, /tp_itemsize/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	169 (destructor)Pdata_dealloc, /tp_dealloc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	170 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	171
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	172 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	173 Pdata_New(void)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	174 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	175 Pdata *self;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	176
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	177 if (!(self = PyObject_New(Pdata, &Pdata_Type)))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	178 return NULL;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	179 Py_SIZE(self) = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	180 self->allocated = 8;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	181 self->data = PyMem_MALLOC(self->allocated * sizeof(PyObject *));
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	182 if (self->data)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	183 return (PyObject *)self;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	184 Py_DECREF(self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	185 return PyErr_NoMemory();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	186 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	187
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	188
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	189 /* Retain only the initial clearto items. If clearto >= the current
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	190 * number of items, this is a (non-erroneous) NOP.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	191 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	192 static int
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	193 Pdata_clear(Pdata *self, Py_ssize_t clearto)
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	194 {
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	195 Py_ssize_t i = Py_SIZE(self);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	196
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	197 if (clearto < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	198 return stack_underflow();
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	199 if (clearto >= i)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	200 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	201
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	202 while (--i >= clearto) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	203 Py_CLEAR(self->data[i]);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	204 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	205 Py_SIZE(self) = clearto;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	206 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	207 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	208
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	209 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	210 Pdata_grow(Pdata *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	211 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	212 PyObject **data = self->data;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	213 Py_ssize_t allocated = self->allocated;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	214 Py_ssize_t new_allocated;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	215
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	216 new_allocated = (allocated >> 3) + 6;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	217 /* check for integer overflow */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	218 if (new_allocated > PY_SSIZE_T_MAX - allocated)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	219 goto nomemory;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	220 new_allocated += allocated;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	221 if (new_allocated > (PY_SSIZE_T_MAX / sizeof(PyObject *)))
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	222 goto nomemory;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	223 data = PyMem_REALLOC(data, new_allocated * sizeof(PyObject *));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	224 if (data == NULL)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	225 goto nomemory;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	226
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	227 self->data = data;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	228 self->allocated = new_allocated;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	229 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	230
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	231 nomemory:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	232 PyErr_NoMemory();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	233 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	234 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	235
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	236 /* D is a Pdata*. Pop the topmost element and store it into V, which
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	237 * must be an lvalue holding PyObject*. On stack underflow, UnpicklingError
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	238 * is raised and V is set to NULL.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	239 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	240 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	241 Pdata_pop(Pdata *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	242 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	243 if (Py_SIZE(self) == 0) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	244 PyErr_SetString(UnpicklingError, "bad pickle data");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	245 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	246 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	247 return self->data[--Py_SIZE(self)];
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	248 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	249 #define PDATA_POP(D, V) do { (V) = Pdata_pop((D)); } while (0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	250
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	251 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	252 Pdata_push(Pdata self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	253 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	254 if (Py_SIZE(self) == self->allocated && Pdata_grow(self) < 0) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	255 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	256 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	257 self->data[Py_SIZE(self)++] = obj;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	258 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	259 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	260
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	261 /* Push an object on stack, transferring its ownership to the stack. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	262 #define PDATA_PUSH(D, O, ER) do { \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	263 if (Pdata_push((D), (O)) < 0) return (ER); } while(0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	264
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	265 /* Push an object on stack, adding a new reference to the object. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	266 #define PDATA_APPEND(D, O, ER) do { \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	267 Py_INCREF((O)); \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	268 if (Pdata_push((D), (O)) < 0) return (ER); } while(0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	269
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	270 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	271 Pdata_poptuple(Pdata *self, Py_ssize_t start)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	272 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	273 PyObject *tuple;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	274 Py_ssize_t len, i, j;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	275
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	276 len = Py_SIZE(self) - start;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	277 tuple = PyTuple_New(len);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	278 if (tuple == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	279 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	280 for (i = start, j = 0; j < len; i++, j++)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	281 PyTuple_SET_ITEM(tuple, j, self->data[i]);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	282
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	283 Py_SIZE(self) = start;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	284 return tuple;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	285 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	286
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	287 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	288 Pdata_poplist(Pdata *self, Py_ssize_t start)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	289 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	290 PyObject *list;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	291 Py_ssize_t len, i, j;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	292
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	293 len = Py_SIZE(self) - start;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	294 list = PyList_New(len);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	295 if (list == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	296 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	297 for (i = start, j = 0; j < len; i++, j++)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	298 PyList_SET_ITEM(list, j, self->data[i]);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	299
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	300 Py_SIZE(self) = start;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	301 return list;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	302 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	303
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	304 typedef struct {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	305 PyObject *me_key;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	306 Py_ssize_t me_value;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	307 } PyMemoEntry;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	308
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	309 typedef struct {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	310 Py_ssize_t mt_mask;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	311 Py_ssize_t mt_used;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	312 Py_ssize_t mt_allocated;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	313 PyMemoEntry *mt_table;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	314 } PyMemoTable;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	315
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	316 typedef struct PicklerObject {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	317 PyObject_HEAD
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	318 PyMemoTable memo; / Memo table, keep track of the seen
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	319 objects to support self-referential objects
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	320 pickling. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	321 PyObject pers_func; / persistent_id() method, can be NULL */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	322 PyObject *arg;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	323
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	324 PyObject write; / write() method of the output stream. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	325 PyObject output_buffer; / Write into a local bytearray buffer before
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	326 flushing to the stream. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	327 Py_ssize_t output_len; /* Length of output_buffer. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	328 Py_ssize_t max_output_len; /* Allocation size of output_buffer. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	329 int proto; /* Pickle protocol number, >= 0 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	330 int bin; /* Boolean, true if proto > 0 */
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	331 Py_ssize_t buf_size; /* Size of the current buffered pickle data */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	332 int fast; /* Enable fast mode if set to a true value.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	333 The fast mode disable the usage of memo,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	334 therefore speeding the pickling process by
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	335 not generating superfluous PUT opcodes. It
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	336 should not be used if with self-referential
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	337 objects. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	338 int fast_nesting;
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	339 int fix_imports; /* Indicate whether Pickler should fix
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	340 the name of globals for Python 2.x. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	341 PyObject *fast_memo;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	342 } PicklerObject;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	343
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	344 typedef struct UnpicklerObject {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	345 PyObject_HEAD
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	346 Pdata stack; / Pickle data stack, store unpickled objects. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	347
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	348 /* The unpickler memo is just an array of PyObject *s. Using a dict
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	349 is unnecessary, since the keys are contiguous ints. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	350 PyObject **memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	351 Py_ssize_t memo_size;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	352
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	353 PyObject *arg;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	354 PyObject pers_func; / persistent_load() method, can be NULL. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	355
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	356 Py_buffer buffer;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	357 char *input_buffer;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	358 char *input_line;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	359 Py_ssize_t input_len;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	360 Py_ssize_t next_read_idx;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	361 Py_ssize_t prefetched_idx; /* index of first prefetched byte */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	362 PyObject read; / read() method of the input stream. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	363 PyObject readline; / readline() method of the input stream. */
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	364 PyObject peek; / peek() method of the input stream, or NULL */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	365
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	366 char encoding; / Name of the encoding to be used for
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	367 decoding strings pickled using Python
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	368 2.x. The default value is "ASCII" */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	369 char errors; / Name of errors handling scheme to used when
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	370 decoding strings. The default value is
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	371 "strict". */
73957 14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	372 Py_ssize_t marks; / Mark stack, used for unpickling container
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	373 objects. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	374 Py_ssize_t num_marks; /* Number of marks in the mark stack. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	375 Py_ssize_t marks_size; /* Current allocated size of the mark stack. */
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	376 int proto; /* Protocol of the pickle loaded. */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	377 int fix_imports; /* Indicate whether Unpickler should fix
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	378 the name of globals pickled by Python 2.x. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	379 } UnpicklerObject;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	380
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	381 /* Forward declarations */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	382 static int save(PicklerObject , PyObject , int);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	383 static int save_reduce(PicklerObject , PyObject , PyObject *);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	384 static PyTypeObject Pickler_Type;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	385 static PyTypeObject Unpickler_Type;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	386
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	387
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	388 /*************************************************************************
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	389 A custom hashtable mapping void* to longs. This is used by the pickler for
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	390 memoization. Using a custom hashtable rather than PyDict allows us to skip
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	391 a bunch of unnecessary object creation. This makes a huge performance
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	392 difference. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	393
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	394 #define MT_MINSIZE 8
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	395 #define PERTURB_SHIFT 5
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	396
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	397
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	398 static PyMemoTable *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	399 PyMemoTable_New(void)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	400 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	401 PyMemoTable *memo = PyMem_MALLOC(sizeof(PyMemoTable));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	402 if (memo == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	403 PyErr_NoMemory();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	404 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	405 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	406
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	407 memo->mt_used = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	408 memo->mt_allocated = MT_MINSIZE;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	409 memo->mt_mask = MT_MINSIZE - 1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	410 memo->mt_table = PyMem_MALLOC(MT_MINSIZE * sizeof(PyMemoEntry));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	411 if (memo->mt_table == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	412 PyMem_FREE(memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	413 PyErr_NoMemory();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	414 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	415 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	416 memset(memo->mt_table, 0, MT_MINSIZE * sizeof(PyMemoEntry));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	417
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	418 return memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	419 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	420
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	421 static PyMemoTable *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	422 PyMemoTable_Copy(PyMemoTable *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	423 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	424 Py_ssize_t i;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	425 PyMemoTable *new = PyMemoTable_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	426 if (new == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	427 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	428
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	429 new->mt_used = self->mt_used;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	430 new->mt_allocated = self->mt_allocated;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	431 new->mt_mask = self->mt_mask;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	432 /* The table we get from _New() is probably smaller than we wanted.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	433 Free it and allocate one that's the right size. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	434 PyMem_FREE(new->mt_table);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	435 new->mt_table = PyMem_MALLOC(self->mt_allocated * sizeof(PyMemoEntry));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	436 if (new->mt_table == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	437 PyMem_FREE(new);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	438 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	439 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	440 for (i = 0; i < self->mt_allocated; i++) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	441 Py_XINCREF(self->mt_table[i].me_key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	442 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	443 memcpy(new->mt_table, self->mt_table,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	444 sizeof(PyMemoEntry) * self->mt_allocated);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	445
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	446 return new;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	447 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	448
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	449 static Py_ssize_t
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	450 PyMemoTable_Size(PyMemoTable *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	451 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	452 return self->mt_used;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	453 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	454
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	455 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	456 PyMemoTable_Clear(PyMemoTable *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	457 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	458 Py_ssize_t i = self->mt_allocated;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	459
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	460 while (--i >= 0) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	461 Py_XDECREF(self->mt_table[i].me_key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	462 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	463 self->mt_used = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	464 memset(self->mt_table, 0, self->mt_allocated * sizeof(PyMemoEntry));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	465 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	466 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	467
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	468 static void
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	469 PyMemoTable_Del(PyMemoTable *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	470 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	471 if (self == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	472 return;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	473 PyMemoTable_Clear(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	474
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	475 PyMem_FREE(self->mt_table);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	476 PyMem_FREE(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	477 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	478
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	479 /* Since entries cannot be deleted from this hashtable, _PyMemoTable_Lookup()
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	480 can be considerably simpler than dictobject.c's lookdict(). */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	481 static PyMemoEntry *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	482 _PyMemoTable_Lookup(PyMemoTable self, PyObject key)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	483 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	484 size_t i;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	485 size_t perturb;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	486 size_t mask = (size_t)self->mt_mask;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	487 PyMemoEntry *table = self->mt_table;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	488 PyMemoEntry *entry;
65494 e8969fb822fc make hashes always the size of pointers; introduce Py_hash_t #9778 Benjamin Peterson <benjamin@python.org> parents: 65224 diff changeset	489 Py_hash_t hash = (Py_hash_t)key >> 3;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	490
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	491 i = hash & mask;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	492 entry = &table[i];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	493 if (entry->me_key == NULL \|\| entry->me_key == key)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	494 return entry;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	495
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	496 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	497 i = (i << 2) + i + perturb + 1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	498 entry = &table[i & mask];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	499 if (entry->me_key == NULL \|\| entry->me_key == key)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	500 return entry;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	501 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	502 assert(0); /* Never reached */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	503 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	504 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	505
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	506 /* Returns -1 on failure, 0 on success. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	507 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	508 _PyMemoTable_ResizeTable(PyMemoTable *self, Py_ssize_t min_size)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	509 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	510 PyMemoEntry *oldtable = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	511 PyMemoEntry oldentry, newentry;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	512 Py_ssize_t new_size = MT_MINSIZE;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	513 Py_ssize_t to_process;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	514
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	515 assert(min_size > 0);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	516
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	517 /* Find the smallest valid table size >= min_size. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	518 while (new_size < min_size && new_size > 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	519 new_size <<= 1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	520 if (new_size <= 0) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	521 PyErr_NoMemory();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	522 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	523 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	524 /* new_size needs to be a power of two. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	525 assert((new_size & (new_size - 1)) == 0);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	526
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	527 /* Allocate new table. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	528 oldtable = self->mt_table;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	529 self->mt_table = PyMem_MALLOC(new_size * sizeof(PyMemoEntry));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	530 if (self->mt_table == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	531 PyMem_FREE(oldtable);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	532 PyErr_NoMemory();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	533 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	534 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	535 self->mt_allocated = new_size;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	536 self->mt_mask = new_size - 1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	537 memset(self->mt_table, 0, sizeof(PyMemoEntry) * new_size);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	538
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	539 /* Copy entries from the old table. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	540 to_process = self->mt_used;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	541 for (oldentry = oldtable; to_process > 0; oldentry++) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	542 if (oldentry->me_key != NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	543 to_process--;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	544 /* newentry is a pointer to a chunk of the new
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	545 mt_table, so we're setting the key:value pair
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	546 in-place. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	547 newentry = _PyMemoTable_Lookup(self, oldentry->me_key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	548 newentry->me_key = oldentry->me_key;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	549 newentry->me_value = oldentry->me_value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	550 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	551 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	552
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	553 /* Deallocate the old table. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	554 PyMem_FREE(oldtable);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	555 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	556 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	557
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	558 /* Returns NULL on failure, a pointer to the value otherwise. */
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	559 static Py_ssize_t *
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	560 PyMemoTable_Get(PyMemoTable self, PyObject key)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	561 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	562 PyMemoEntry *entry = _PyMemoTable_Lookup(self, key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	563 if (entry->me_key == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	564 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	565 return &entry->me_value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	566 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	567
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	568 /* Returns -1 on failure, 0 on success. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	569 static int
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	570 PyMemoTable_Set(PyMemoTable self, PyObject key, Py_ssize_t value)
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	571 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	572 PyMemoEntry *entry;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	573
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	574 assert(key != NULL);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	575
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	576 entry = _PyMemoTable_Lookup(self, key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	577 if (entry->me_key != NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	578 entry->me_value = value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	579 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	580 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	581 Py_INCREF(key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	582 entry->me_key = key;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	583 entry->me_value = value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	584 self->mt_used++;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	585
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	586 /* If we added a key, we can safely resize. Otherwise just return!
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	587 * If used >= 2/3 size, adjust size. Normally, this quaduples the size.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	588 *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	589 * Quadrupling the size improves average table sparseness
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	590 * (reducing collisions) at the cost of some memory. It also halves
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	591 * the number of expensive resize operations in a growing memo table.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	592 *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	593 * Very large memo tables (over 50K items) use doubling instead.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	594 * This may help applications with severe memory constraints.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	595 */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	596 if (!(self->mt_used * 3 >= (self->mt_mask + 1) * 2))
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	597 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	598 return _PyMemoTable_ResizeTable(self,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	599 (self->mt_used > 50000 ? 2 : 4) * self->mt_used);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	600 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	601
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	602 #undef MT_MINSIZE
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	603 #undef PERTURB_SHIFT
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	604
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	605 /*************************************************************************/
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	606
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	607 /* Helpers for creating the argument tuple passed to functions. This has the
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	608 performance advantage of calling PyTuple_New() only once.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	609
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	610 XXX(avassalotti): Inline directly in _Pickler_FastCall() and
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	611 _Unpickler_FastCall(). */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	612 #define ARG_TUP(self, obj) do { \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	613 if ((self)->arg \|\| ((self)->arg=PyTuple_New(1))) { \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	614 Py_XDECREF(PyTuple_GET_ITEM((self)->arg, 0)); \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	615 PyTuple_SET_ITEM((self)->arg, 0, (obj)); \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	616 } \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	617 else { \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	618 Py_DECREF((obj)); \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	619 } \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	620 } while (0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	621
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	622 #define FREE_ARG_TUP(self) do { \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	623 if ((self)->arg->ob_refcnt > 1) \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	624 Py_CLEAR((self)->arg); \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	625 } while (0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	626
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	627 /* A temporary cleaner API for fast single argument function call.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	628
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	629 XXX: Does caching the argument tuple provides any real performance benefits?
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	630
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	631 A quick benchmark, on a 2.0GHz Athlon64 3200+ running Linux 2.6.24 with
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	632 glibc 2.7, tells me that it takes roughly 20,000,000 PyTuple_New(1) calls
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	633 when the tuple is retrieved from the freelist (i.e, call PyTuple_New() then
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	634 immediately DECREF it) and 1,200,000 calls when allocating brand new tuples
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	635 (i.e, call PyTuple_New() and store the returned value in an array), to save
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	636 one second (wall clock time). Either ways, the loading time a pickle stream
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	637 large enough to generate this number of calls would be massively
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	638 overwhelmed by other factors, like I/O throughput, the GC traversal and
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	639 object allocation overhead. So, I really doubt these functions provide any
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	640 real benefits.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	641
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	642 On the other hand, oprofile reports that pickle spends a lot of time in
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	643 these functions. But, that is probably more related to the function call
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	644 overhead, than the argument tuple allocation.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	645
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	646 XXX: And, what is the reference behavior of these? Steal, borrow? At first
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	647 glance, it seems to steal the reference of 'arg' and borrow the reference
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	648 of 'func'. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	649 static PyObject *
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	650 _Pickler_FastCall(PicklerObject self, PyObject func, PyObject *arg)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	651 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	652 PyObject *result = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	653
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	654 ARG_TUP(self, arg);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	655 if (self->arg) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	656 result = PyObject_Call(func, self->arg, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	657 FREE_ARG_TUP(self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	658 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	659 return result;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	660 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	661
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	662 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	663 _Pickler_ClearBuffer(PicklerObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	664 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	665 Py_CLEAR(self->output_buffer);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	666 self->output_buffer =
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	667 PyBytes_FromStringAndSize(NULL, self->max_output_len);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	668 if (self->output_buffer == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	669 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	670 self->output_len = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	671 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	672 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	673
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	674 static PyObject *
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	675 _Pickler_GetString(PicklerObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	676 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	677 PyObject *output_buffer = self->output_buffer;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	678
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	679 assert(self->output_buffer != NULL);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	680 self->output_buffer = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	681 /* Resize down to exact size */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	682 if (_PyBytes_Resize(&output_buffer, self->output_len) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	683 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	684 return output_buffer;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	685 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	686
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	687 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	688 _Pickler_FlushToFile(PicklerObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	689 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	690 PyObject output, result;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	691
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	692 assert(self->write != NULL);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	693
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	694 output = _Pickler_GetString(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	695 if (output == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	696 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	697
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	698 result = _Pickler_FastCall(self, self->write, output);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	699 Py_XDECREF(result);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	700 return (result == NULL) ? -1 : 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	701 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	702
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	703 static Py_ssize_t
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	704 _Pickler_Write(PicklerObject self, const char s, Py_ssize_t n)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	705 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	706 Py_ssize_t i, required;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	707 char *buffer;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	708
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	709 assert(s != NULL);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	710
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	711 required = self->output_len + n;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	712 if (required > self->max_output_len) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	713 if (self->write != NULL && required > MAX_WRITE_BUF_SIZE) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	714 /* XXX This reallocates a new buffer every time, which is a bit
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	715 wasteful. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	716 if (_Pickler_FlushToFile(self) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	717 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	718 if (_Pickler_ClearBuffer(self) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	719 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	720 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	721 if (self->write != NULL && n > MAX_WRITE_BUF_SIZE) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	722 /* we already flushed above, so the buffer is empty */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	723 PyObject *result;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	724 /* XXX we could spare an intermediate copy and pass
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	725 a memoryview instead */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	726 PyObject *output = PyBytes_FromStringAndSize(s, n);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	727 if (s == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	728 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	729 result = _Pickler_FastCall(self, self->write, output);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	730 Py_XDECREF(result);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	731 return (result == NULL) ? -1 : 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	732 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	733 else {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	734 if (self->output_len >= PY_SSIZE_T_MAX / 2 - n) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	735 PyErr_NoMemory();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	736 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	737 }
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	738 self->max_output_len = (self->output_len + n) / 2 * 3;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	739 if (_PyBytes_Resize(&self->output_buffer, self->max_output_len) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	740 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	741 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	742 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	743 buffer = PyBytes_AS_STRING(self->output_buffer);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	744 if (n < 8) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	745 /* This is faster than memcpy when the string is short. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	746 for (i = 0; i < n; i++) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	747 buffer[self->output_len + i] = s[i];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	748 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	749 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	750 else {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	751 memcpy(buffer + self->output_len, s, n);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	752 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	753 self->output_len += n;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	754 return n;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	755 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	756
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	757 static PicklerObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	758 _Pickler_New(void)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	759 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	760 PicklerObject *self;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	761
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	762 self = PyObject_GC_New(PicklerObject, &Pickler_Type);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	763 if (self == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	764 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	765
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	766 self->pers_func = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	767 self->arg = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	768 self->write = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	769 self->proto = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	770 self->bin = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	771 self->fast = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	772 self->fast_nesting = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	773 self->fix_imports = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	774 self->fast_memo = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	775
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	776 self->memo = PyMemoTable_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	777 if (self->memo == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	778 Py_DECREF(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	779 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	780 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	781 self->max_output_len = WRITE_BUF_SIZE;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	782 self->output_len = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	783 self->output_buffer = PyBytes_FromStringAndSize(NULL,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	784 self->max_output_len);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	785 if (self->output_buffer == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	786 Py_DECREF(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	787 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	788 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	789 return self;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	790 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	791
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	792 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	793 _Pickler_SetProtocol(PicklerObject self, PyObject proto_obj,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	794 PyObject *fix_imports_obj)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	795 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	796 long proto = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	797 int fix_imports;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	798
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	799 if (proto_obj == NULL \|\| proto_obj == Py_None)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	800 proto = DEFAULT_PROTOCOL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	801 else {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	802 proto = PyLong_AsLong(proto_obj);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	803 if (proto == -1 && PyErr_Occurred())
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	804 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	805 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	806 if (proto < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	807 proto = HIGHEST_PROTOCOL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	808 if (proto > HIGHEST_PROTOCOL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	809 PyErr_Format(PyExc_ValueError, "pickle protocol must be <= %d",
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	810 HIGHEST_PROTOCOL);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	811 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	812 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	813 fix_imports = PyObject_IsTrue(fix_imports_obj);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	814 if (fix_imports == -1)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	815 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	816
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	817 self->proto = proto;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	818 self->bin = proto > 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	819 self->fix_imports = fix_imports && proto < 3;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	820
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	821 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	822 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	823
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	824 /* Returns -1 (with an exception set) on failure, 0 on success. This may
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	825 be called once on a freshly created Pickler. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	826 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	827 _Pickler_SetOutputStream(PicklerObject self, PyObject file)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	828 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	829 assert(file != NULL);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	830 self->write = PyObject_GetAttrString(file, "write");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	831 if (self->write == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	832 if (PyErr_ExceptionMatches(PyExc_AttributeError))
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	833 PyErr_SetString(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	834 "file must have a 'write' attribute");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	835 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	836 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	837
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	838 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	839 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	840
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	841 /* See documentation for _Pickler_FastCall(). */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	842 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	843 _Unpickler_FastCall(UnpicklerObject self, PyObject func, PyObject *arg)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	844 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	845 PyObject *result = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	846
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	847 ARG_TUP(self, arg);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	848 if (self->arg) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	849 result = PyObject_Call(func, self->arg, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	850 FREE_ARG_TUP(self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	851 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	852 return result;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	853 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	854
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	855 /* Returns the size of the input on success, -1 on failure. This takes its
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	856 own reference to `input`. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	857 static Py_ssize_t
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	858 _Unpickler_SetStringInput(UnpicklerObject self, PyObject input)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	859 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	860 if (self->buffer.buf != NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	861 PyBuffer_Release(&self->buffer);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	862 if (PyObject_GetBuffer(input, &self->buffer, PyBUF_CONTIG_RO) < 0)
49546 bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	863 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	864 self->input_buffer = self->buffer.buf;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	865 self->input_len = self->buffer.len;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	866 self->next_read_idx = 0;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	867 self->prefetched_idx = self->input_len;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	868 return self->input_len;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	869 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	870
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	871 static int
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	872 _Unpickler_SkipConsumed(UnpicklerObject *self)
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	873 {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	874 Py_ssize_t consumed = self->next_read_idx - self->prefetched_idx;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	875
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	876 if (consumed > 0) {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	877 PyObject *r;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	878 assert(self->peek); /* otherwise we did something wrong */
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	879 /* This makes an useless copy... */
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	880 r = PyObject_CallFunction(self->read, "n", consumed);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	881 if (r == NULL)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	882 return -1;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	883 Py_DECREF(r);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	884 self->prefetched_idx = self->next_read_idx;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	885 }
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	886 return 0;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	887 }
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	888
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	889 static const Py_ssize_t READ_WHOLE_LINE = -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	890
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	891 /* If reading from a file, we need to only pull the bytes we need, since there
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	892 may be multiple pickle objects arranged contiguously in the same input
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	893 buffer.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	894
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	895 If `n` is READ_WHOLE_LINE, read a whole line. Otherwise, read up to `n`
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	896 bytes from the input stream/buffer.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	897
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	898 Update the unpickler's input buffer with the newly-read data. Returns -1 on
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	899 failure; on success, returns the number of bytes read from the file.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	900
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	901 On success, self->input_len will be 0; this is intentional so that when
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	902 unpickling from a file, the "we've run out of data" code paths will trigger,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	903 causing the Unpickler to go back to the file for more data. Use the returned
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	904 size to tell you how much data you can process. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	905 static Py_ssize_t
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	906 _Unpickler_ReadFromFile(UnpicklerObject *self, Py_ssize_t n)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	907 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	908 PyObject *data;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	909 Py_ssize_t read_size, prefetched_size = 0;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	910
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	911 assert(self->read != NULL);
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	912
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	913 if (_Unpickler_SkipConsumed(self) < 0)
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	914 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	915
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	916 if (n == READ_WHOLE_LINE)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	917 data = PyObject_Call(self->readline, empty_tuple, NULL);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	918 else {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	919 PyObject *len = PyLong_FromSsize_t(n);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	920 if (len == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	921 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	922 data = _Unpickler_FastCall(self, self->read, len);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	923 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	924 if (data == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	925 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	926
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	927 /* Prefetch some data without advancing the file pointer, if possible */
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	928 if (self->peek) {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	929 PyObject len, prefetched;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	930 len = PyLong_FromSsize_t(PREFETCH);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	931 if (len == NULL) {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	932 Py_DECREF(data);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	933 return -1;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	934 }
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	935 prefetched = _Unpickler_FastCall(self, self->peek, len);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	936 if (prefetched == NULL) {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	937 if (PyErr_ExceptionMatches(PyExc_NotImplementedError)) {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	938 /* peek() is probably not supported by the given file object */
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	939 PyErr_Clear();
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	940 Py_CLEAR(self->peek);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	941 }
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	942 else {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	943 Py_DECREF(data);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	944 return -1;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	945 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	946 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	947 else {
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	948 assert(PyBytes_Check(prefetched));
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	949 prefetched_size = PyBytes_GET_SIZE(prefetched);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	950 PyBytes_ConcatAndDel(&data, prefetched);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	951 if (data == NULL)
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	952 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	953 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	954 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	955
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	956 read_size = _Unpickler_SetStringInput(self, data) - prefetched_size;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	957 Py_DECREF(data);
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	958 self->prefetched_idx = read_size;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	959 return read_size;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	960 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	961
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	962 /* Read `n` bytes from the unpickler's data source, storing the result in `*s`.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	963
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	964 This should be used for all data reads, rather than accessing the unpickler's
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	965 input buffer directly. This method deals correctly with reading from input
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	966 streams, which the input buffer doesn't deal with.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	967
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	968 Note that when reading from a file-like object, self->next_read_idx won't
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	969 be updated (it should remain at 0 for the entire unpickling process). You
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	970 should use this function's return value to know how many bytes you can
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	971 consume.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	972
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	973 Returns -1 (with an exception set) on failure. On success, return the
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	974 number of chars read. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	975 static Py_ssize_t
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	976 _Unpickler_Read(UnpicklerObject self, char *s, Py_ssize_t n)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	977 {
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	978 Py_ssize_t num_read;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	979
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	980 if (self->next_read_idx + n <= self->input_len) {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	981 *s = self->input_buffer + self->next_read_idx;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	982 self->next_read_idx += n;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	983 return n;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	984 }
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	985 if (!self->read) {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	986 PyErr_Format(PyExc_EOFError, "Ran out of input");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	987 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	988 }
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	989 num_read = _Unpickler_ReadFromFile(self, n);
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	990 if (num_read < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	991 return -1;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	992 if (num_read < n) {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	993 PyErr_Format(PyExc_EOFError, "Ran out of input");
49705 218a98981183 #4298: pickle.load() can segfault on invalid or truncated input. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49638 diff changeset	994 return -1;
218a98981183 #4298: pickle.load() can segfault on invalid or truncated input. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49638 diff changeset	995 }
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	996 *s = self->input_buffer;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	997 self->next_read_idx = n;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	998 return n;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	999 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1000
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1001 static Py_ssize_t
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1002 _Unpickler_CopyLine(UnpicklerObject self, char line, Py_ssize_t len,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1003 char **result)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1004 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1005 char *input_line = PyMem_Realloc(self->input_line, len + 1);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1006 if (input_line == NULL)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1007 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1008
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1009 memcpy(input_line, line, len);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1010 input_line[len] = '\0';
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1011 self->input_line = input_line;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1012 *result = self->input_line;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1013 return len;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1014 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1015
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1016 /* Read a line from the input stream/buffer. If we run off the end of the input
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1017 before hitting \n, return the data we found.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1018
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1019 Returns the number of chars read, or -1 on failure. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1020 static Py_ssize_t
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1021 _Unpickler_Readline(UnpicklerObject self, char *result)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1022 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1023 Py_ssize_t i, num_read;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1024
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1025 for (i = self->next_read_idx; i < self->input_len; i++) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1026 if (self->input_buffer[i] == '\n') {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1027 char *line_start = self->input_buffer + self->next_read_idx;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1028 num_read = i - self->next_read_idx + 1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1029 self->next_read_idx = i + 1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1030 return _Unpickler_CopyLine(self, line_start, num_read, result);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1031 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1032 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1033 if (self->read) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1034 num_read = _Unpickler_ReadFromFile(self, READ_WHOLE_LINE);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1035 if (num_read < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1036 return -1;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1037 self->next_read_idx = num_read;
71817 c47bc1349e61 Issue #12687: Fix a possible buffering bug when unpickling text mode (protocol 0, mostly) pickles. Antoine Pitrou <solipsis@pitrou.net> parents: 71347 diff changeset	1038 return _Unpickler_CopyLine(self, self->input_buffer, num_read, result);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1039 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1040
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1041 /* If we get here, we've run off the end of the input string. Return the
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1042 remaining string and let the caller figure it out. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1043 *result = self->input_buffer + self->next_read_idx;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1044 num_read = i - self->next_read_idx;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1045 self->next_read_idx = i;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1046 return num_read;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1047 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1048
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1049 /* Returns -1 (with an exception set) on failure, 0 on success. The memo array
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1050 will be modified in place. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1051 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1052 _Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1053 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1054 Py_ssize_t i;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1055 PyObject **memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1056
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1057 assert(new_size > self->memo_size);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1058
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1059 memo = PyMem_REALLOC(self->memo, new_size * sizeof(PyObject *));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1060 if (memo == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1061 PyErr_NoMemory();
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1062 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1063 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1064 self->memo = memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1065 for (i = self->memo_size; i < new_size; i++)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1066 self->memo[i] = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1067 self->memo_size = new_size;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1068 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1069 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1070
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1071 /* Returns NULL if idx is out of bounds. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1072 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1073 _Unpickler_MemoGet(UnpicklerObject *self, Py_ssize_t idx)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1074 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1075 if (idx < 0 \|\| idx >= self->memo_size)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1076 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1077
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1078 return self->memo[idx];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1079 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1080
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1081 /* Returns -1 (with an exception set) on failure, 0 on success.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1082 This takes its own reference to `value`. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1083 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1084 _Unpickler_MemoPut(UnpicklerObject self, Py_ssize_t idx, PyObject value)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1085 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1086 PyObject *old_item;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1087
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1088 if (idx >= self->memo_size) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1089 if (_Unpickler_ResizeMemoList(self, idx * 2) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1090 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1091 assert(idx < self->memo_size);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1092 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1093 Py_INCREF(value);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1094 old_item = self->memo[idx];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1095 self->memo[idx] = value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1096 Py_XDECREF(old_item);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1097 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1098 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1099
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1100 static PyObject **
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1101 _Unpickler_NewMemo(Py_ssize_t new_size)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1102 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1103 PyObject *memo = PyMem_MALLOC(new_size sizeof(PyObject *));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1104 if (memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1105 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1106 memset(memo, 0, new_size * sizeof(PyObject *));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1107 return memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1108 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1109
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1110 /* Free the unpickler's memo, taking care to decref any items left in it. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1111 static void
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1112 _Unpickler_MemoCleanup(UnpicklerObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1113 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1114 Py_ssize_t i;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1115 PyObject **memo = self->memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1116
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1117 if (self->memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1118 return;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1119 self->memo = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1120 i = self->memo_size;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1121 while (--i >= 0) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1122 Py_XDECREF(memo[i]);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1123 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1124 PyMem_FREE(memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1125 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1126
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1127 static UnpicklerObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1128 _Unpickler_New(void)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1129 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1130 UnpicklerObject *self;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1131
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1132 self = PyObject_GC_New(UnpicklerObject, &Unpickler_Type);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1133 if (self == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1134 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1135
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1136 self->stack = (Pdata *)Pdata_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1137 if (self->stack == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1138 Py_DECREF(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1139 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1140 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1141 memset(&self->buffer, 0, sizeof(Py_buffer));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1142
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1143 self->memo_size = 32;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1144 self->memo = _Unpickler_NewMemo(self->memo_size);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1145 if (self->memo == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1146 Py_DECREF(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1147 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1148 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1149
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1150 self->arg = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1151 self->pers_func = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1152 self->input_buffer = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1153 self->input_line = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1154 self->input_len = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1155 self->next_read_idx = 0;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1156 self->prefetched_idx = 0;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1157 self->read = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1158 self->readline = NULL;
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1159 self->peek = NULL;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1160 self->encoding = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1161 self->errors = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1162 self->marks = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1163 self->num_marks = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1164 self->marks_size = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1165 self->proto = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1166 self->fix_imports = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1167
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1168 return self;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1169 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1170
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1171 /* Returns -1 (with an exception set) on failure, 0 on success. This may
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1172 be called once on a freshly created Pickler. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1173 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1174 _Unpickler_SetInputStream(UnpicklerObject self, PyObject file)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1175 {
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1176 self->peek = PyObject_GetAttrString(file, "peek");
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1177 if (self->peek == NULL) {
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1178 if (PyErr_ExceptionMatches(PyExc_AttributeError))
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1179 PyErr_Clear();
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1180 else
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1181 return -1;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1182 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1183 self->read = PyObject_GetAttrString(file, "read");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1184 self->readline = PyObject_GetAttrString(file, "readline");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1185 if (self->readline == NULL \|\| self->read == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1186 if (PyErr_ExceptionMatches(PyExc_AttributeError))
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1187 PyErr_SetString(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1188 "file must have 'read' and 'readline' attributes");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1189 Py_CLEAR(self->read);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1190 Py_CLEAR(self->readline);
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	1191 Py_CLEAR(self->peek);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1192 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1193 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1194 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1195 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1196
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1197 /* Returns -1 (with an exception set) on failure, 0 on success. This may
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1198 be called once on a freshly created Pickler. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1199 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1200 _Unpickler_SetInputEncoding(UnpicklerObject *self,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1201 const char *encoding,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1202 const char *errors)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1203 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1204 if (encoding == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1205 encoding = "ASCII";
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1206 if (errors == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1207 errors = "strict";
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1208
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1209 self->encoding = strdup(encoding);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1210 self->errors = strdup(errors);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1211 if (self->encoding == NULL \|\| self->errors == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1212 PyErr_NoMemory();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1213 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1214 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1215 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1216 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1217
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1218 /* Generate a GET opcode for an object stored in the memo. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1219 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1220 memo_get(PicklerObject self, PyObject key)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1221 {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1222 Py_ssize_t *value;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1223 char pdata[30];
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1224 Py_ssize_t len;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1225
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1226 value = PyMemoTable_Get(self->memo, key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1227 if (value == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1228 PyErr_SetObject(PyExc_KeyError, key);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1229 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1230 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1231
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1232 if (!self->bin) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1233 pdata[0] = GET;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1234 PyOS_snprintf(pdata + 1, sizeof(pdata) - 1,
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1235 "%" PY_FORMAT_SIZE_T "d\n", *value);
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1236 len = strlen(pdata);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1237 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1238 else {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1239 if (*value < 256) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1240 pdata[0] = BINGET;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1241 pdata[1] = (unsigned char)(*value & 0xff);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1242 len = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1243 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1244 else if (*value <= 0xffffffffL) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1245 pdata[0] = LONG_BINGET;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1246 pdata[1] = (unsigned char)(*value & 0xff);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1247 pdata[2] = (unsigned char)((*value >> 8) & 0xff);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1248 pdata[3] = (unsigned char)((*value >> 16) & 0xff);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1249 pdata[4] = (unsigned char)((*value >> 24) & 0xff);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1250 len = 5;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1251 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1252 else { /* unlikely */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1253 PyErr_SetString(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1254 "memo id too large for LONG_BINGET");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1255 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1256 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1257 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1258
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1259 if (_Pickler_Write(self, pdata, len) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1260 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1261
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1262 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1263 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1264
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1265 /* Store an object in the memo, assign it a new unique ID based on the number
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1266 of objects currently stored in the memo and generate a PUT opcode. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1267 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1268 memo_put(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1269 {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1270 Py_ssize_t x;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1271 char pdata[30];
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1272 Py_ssize_t len;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1273 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1274
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1275 if (self->fast)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1276 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1277
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1278 x = PyMemoTable_Size(self->memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1279 if (PyMemoTable_Set(self->memo, obj, x) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1280 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1281
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1282 if (!self->bin) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1283 pdata[0] = PUT;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1284 PyOS_snprintf(pdata + 1, sizeof(pdata) - 1,
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1285 "%" PY_FORMAT_SIZE_T "d\n", x);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1286 len = strlen(pdata);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1287 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1288 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1289 if (x < 256) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1290 pdata[0] = BINPUT;
47670 13071add8f48 Fixed compiler warnings on MSVC9.0 Alexandre Vassalotti <alexandre@peadrop.com> parents: 47645 diff changeset	1291 pdata[1] = (unsigned char)x;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1292 len = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1293 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1294 else if (x <= 0xffffffffL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1295 pdata[0] = LONG_BINPUT;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1296 pdata[1] = (unsigned char)(x & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1297 pdata[2] = (unsigned char)((x >> 8) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1298 pdata[3] = (unsigned char)((x >> 16) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1299 pdata[4] = (unsigned char)((x >> 24) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1300 len = 5;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1301 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1302 else { /* unlikely */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1303 PyErr_SetString(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1304 "memo id too large for LONG_BINPUT");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1305 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1306 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1307 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1308
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1309 if (_Pickler_Write(self, pdata, len) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1310 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1311
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1312 if (0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1313 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1314 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1315 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1316
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1317 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1318 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1319
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1320 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1321 whichmodule(PyObject global, PyObject global_name)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1322 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1323 Py_ssize_t i, j;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1324 static PyObject *module_str = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1325 static PyObject *main_str = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1326 PyObject *module_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1327 PyObject *modules_dict;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1328 PyObject *module;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1329 PyObject *obj;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1330
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1331 if (module_str == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1332 module_str = PyUnicode_InternFromString("__module__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1333 if (module_str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1334 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1335 main_str = PyUnicode_InternFromString("__main__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1336 if (main_str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1337 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1338 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1339
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1340 module_name = PyObject_GetAttr(global, module_str);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1341
52761 cbfbff233ef5 Update a comment about why the __module__ can sometime be NULL. Alexandre Vassalotti <alexandre@peadrop.com> parents: 51270 diff changeset	1342 /* In some rare cases (e.g., bound methods of extension types),
cbfbff233ef5 Update a comment about why the __module__ can sometime be NULL. Alexandre Vassalotti <alexandre@peadrop.com> parents: 51270 diff changeset	1343 __module__ can be None. If it is so, then search sys.modules
cbfbff233ef5 Update a comment about why the __module__ can sometime be NULL. Alexandre Vassalotti <alexandre@peadrop.com> parents: 51270 diff changeset	1344 for the module of global. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1345 if (module_name == Py_None) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1346 Py_DECREF(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1347 goto search;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1348 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1349
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1350 if (module_name) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1351 return module_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1352 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1353 if (PyErr_ExceptionMatches(PyExc_AttributeError))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1354 PyErr_Clear();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1355 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1356 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1357
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1358 search:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1359 modules_dict = PySys_GetObject("modules");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1360 if (modules_dict == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1361 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1362
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1363 i = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1364 module_name = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1365 while ((j = PyDict_Next(modules_dict, &i, &module_name, &module))) {
51243 7c91f479bd0d Issue #1717, stage 2: remove uses of tp_compare in Modules and most Mark Dickinson <dickinsm@gmail.com> parents: 51021 diff changeset	1366 if (PyObject_RichCompareBool(module_name, main_str, Py_EQ) == 1)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1367 continue;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1368
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1369 obj = PyObject_GetAttr(module, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1370 if (obj == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1371 if (PyErr_ExceptionMatches(PyExc_AttributeError))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1372 PyErr_Clear();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1373 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1374 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1375 continue;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1376 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1377
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1378 if (obj != global) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1379 Py_DECREF(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1380 continue;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1381 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1382
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1383 Py_DECREF(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1384 break;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1385 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1386
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1387 /* If no module is found, use __main__. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1388 if (!j) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1389 module_name = main_str;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1390 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1391
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1392 Py_INCREF(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1393 return module_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1394 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1395
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1396 /* fast_save_enter() and fast_save_leave() are guards against recursive
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1397 objects when Pickler is used with the "fast mode" (i.e., with object
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1398 memoization disabled). If the nesting of a list or dict object exceed
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1399 FAST_NESTING_LIMIT, these guards will start keeping an internal
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1400 reference to the seen list or dict objects and check whether these objects
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1401 are recursive. These are not strictly necessary, since save() has a
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1402 hard-coded recursion limit, but they give a nicer error message than the
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1403 typical RuntimeError. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1404 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1405 fast_save_enter(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1406 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1407 /* if fast_nesting < 0, we're doing an error exit. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1408 if (++self->fast_nesting >= FAST_NESTING_LIMIT) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1409 PyObject *key = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1410 if (self->fast_memo == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1411 self->fast_memo = PyDict_New();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1412 if (self->fast_memo == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1413 self->fast_nesting = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1414 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1415 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1416 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1417 key = PyLong_FromVoidPtr(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1418 if (key == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1419 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1420 if (PyDict_GetItem(self->fast_memo, key)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1421 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1422 PyErr_Format(PyExc_ValueError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1423 "fast mode: can't pickle cyclic objects "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1424 "including object type %.200s at %p",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1425 obj->ob_type->tp_name, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1426 self->fast_nesting = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1427 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1428 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1429 if (PyDict_SetItem(self->fast_memo, key, Py_None) < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1430 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1431 self->fast_nesting = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1432 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1433 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1434 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1435 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1436 return 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1437 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1438
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1439 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1440 fast_save_leave(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1441 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1442 if (self->fast_nesting-- >= FAST_NESTING_LIMIT) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1443 PyObject *key = PyLong_FromVoidPtr(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1444 if (key == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1445 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1446 if (PyDict_DelItem(self->fast_memo, key) < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1447 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1448 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1449 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1450 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1451 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1452 return 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1453 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1454
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1455 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1456 save_none(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1457 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1458 const char none_op = NONE;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1459 if (_Pickler_Write(self, &none_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1460 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1461
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1462 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1463 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1464
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1465 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1466 save_bool(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1467 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1468 static const char *buf[2] = { FALSE, TRUE };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1469 const char len[2] = {sizeof(FALSE) - 1, sizeof(TRUE) - 1};
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1470 int p = (obj == Py_True);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1471
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1472 if (self->proto >= 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1473 const char bool_op = p ? NEWTRUE : NEWFALSE;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1474 if (_Pickler_Write(self, &bool_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1475 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1476 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1477 else if (_Pickler_Write(self, buf[p], len[p]) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1478 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1479
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1480 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1481 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1482
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1483 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1484 save_int(PicklerObject *self, long x)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1485 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1486 char pdata[32];
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1487 Py_ssize_t len = 0;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1488
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1489 if (!self->bin
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1490 #if SIZEOF_LONG > 4
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1491 \|\| x > 0x7fffffffL \|\| x < -0x80000000L
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1492 #endif
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1493 ) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1494 /* Text-mode pickle, or long too big to fit in the 4-byte
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1495 * signed BININT format: store as a string.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1496 */
50946 a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	1497 pdata[0] = LONG; /* use LONG for consistency with pickle.py */
a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	1498 PyOS_snprintf(pdata + 1, sizeof(pdata) - 1, "%ldL\n", x);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1499 if (_Pickler_Write(self, pdata, strlen(pdata)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1500 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1501 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1502 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1503 /* Binary pickle and x fits in a signed 4-byte int. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1504 pdata[1] = (unsigned char)(x & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1505 pdata[2] = (unsigned char)((x >> 8) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1506 pdata[3] = (unsigned char)((x >> 16) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1507 pdata[4] = (unsigned char)((x >> 24) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1508
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1509 if ((pdata[4] == 0) && (pdata[3] == 0)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1510 if (pdata[2] == 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1511 pdata[0] = BININT1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1512 len = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1513 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1514 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1515 pdata[0] = BININT2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1516 len = 3;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1517 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1518 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1519 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1520 pdata[0] = BININT;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1521 len = 5;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1522 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1523
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1524 if (_Pickler_Write(self, pdata, len) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1525 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1526 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1527
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1528 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1529 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1530
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1531 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1532 save_long(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1533 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1534 PyObject *repr = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1535 Py_ssize_t size;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1536 long val = PyLong_AsLong(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1537 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1538
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1539 const char long_op = LONG;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1540
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1541 if (val == -1 && PyErr_Occurred()) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1542 /* out of range for int pickling */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1543 PyErr_Clear();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1544 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1545 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1546 return save_int(self, val);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1547
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1548 if (self->proto >= 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1549 /* Linear-time pickling. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1550 size_t nbits;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1551 size_t nbytes;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1552 unsigned char *pdata;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1553 char header[5];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1554 int i;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1555 int sign = _PyLong_Sign(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1556
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1557 if (sign == 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1558 header[0] = LONG1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1559 header[1] = 0; /* It's 0 -- an empty bytestring. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1560 if (_Pickler_Write(self, header, 2) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1561 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1562 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1563 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1564 nbits = _PyLong_NumBits(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1565 if (nbits == (size_t)-1 && PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1566 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1567 /* How many bytes do we need? There are nbits >> 3 full
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1568 * bytes of data, and nbits & 7 leftover bits. If there
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1569 * are any leftover bits, then we clearly need another
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1570 * byte. Wnat's not so obvious is that we probably
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1571 * need another byte even if there aren't any leftovers:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1572 * the most-significant bit of the most-significant byte
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1573 * acts like a sign bit, and it's usually got a sense
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1574 * opposite of the one we need. The exception is longs
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1575 * of the form -(2*(8j-1)) for j > 0. Such a long is
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1576 * its own 256's-complement, so has the right sign bit
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1577 * even without the extra byte. That's a pain to check
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1578 * for in advance, though, so we always grab an extra
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1579 * byte at the start, and cut it back later if possible.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1580 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1581 nbytes = (nbits >> 3) + 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1582 if (nbytes > INT_MAX) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1583 PyErr_SetString(PyExc_OverflowError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1584 "long too large to pickle");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1585 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1586 }
48862 678a0f0e61bc Issue #3657: Fix uninitialized memory read when pickling longs. Neal Norwitz <nnorwitz@gmail.com> parents: 48696 diff changeset	1587 repr = PyBytes_FromStringAndSize(NULL, (Py_ssize_t)nbytes);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1588 if (repr == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1589 goto error;
48862 678a0f0e61bc Issue #3657: Fix uninitialized memory read when pickling longs. Neal Norwitz <nnorwitz@gmail.com> parents: 48696 diff changeset	1590 pdata = (unsigned char *)PyBytes_AS_STRING(repr);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1591 i = _PyLong_AsByteArray((PyLongObject *)obj,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1592 pdata, nbytes,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1593 1 /* little endian / , 1 / signed */ );
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1594 if (i < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1595 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1596 /* If the long is negative, this may be a byte more than
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1597 * needed. This is so iff the MSB is all redundant sign
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1598 * bits.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1599 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1600 if (sign < 0 &&
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1601 nbytes > 1 &&
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1602 pdata[nbytes - 1] == 0xff &&
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1603 (pdata[nbytes - 2] & 0x80) != 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1604 nbytes--;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1605 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1606
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1607 if (nbytes < 256) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1608 header[0] = LONG1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1609 header[1] = (unsigned char)nbytes;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1610 size = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1611 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1612 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1613 header[0] = LONG4;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1614 size = (Py_ssize_t) nbytes;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1615 for (i = 1; i < 5; i++) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1616 header[i] = (unsigned char)(size & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1617 size >>= 8;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1618 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1619 size = 5;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1620 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1621 if (_Pickler_Write(self, header, size) < 0 \|\|
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1622 _Pickler_Write(self, (char *)pdata, (int)nbytes) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1623 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1624 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1625 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1626 char *string;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1627
50946 a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	1628 /* proto < 2: write the repr and newline. This is quadratic-time (in
a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	1629 the number of digits), in both directions. We add a trailing 'L'
a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	1630 to the repr, for compatibility with Python 2.x. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1631
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1632 repr = PyObject_Repr(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1633 if (repr == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1634 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1635
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48462 diff changeset	1636 string = _PyUnicode_AsStringAndSize(repr, &size);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1637 if (string == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1638 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1639
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1640 if (_Pickler_Write(self, &long_op, 1) < 0 \|\|
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1641 _Pickler_Write(self, string, size) < 0 \|\|
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1642 _Pickler_Write(self, "L\n", 2) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1643 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1644 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1645
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1646 if (0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1647 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1648 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1649 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1650 Py_XDECREF(repr);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1651
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1652 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1653 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1654
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1655 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1656 save_float(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1657 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1658 double x = PyFloat_AS_DOUBLE((PyFloatObject *)obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1659
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1660 if (self->bin) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1661 char pdata[9];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1662 pdata[0] = BINFLOAT;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1663 if (_PyFloat_Pack8(x, (unsigned char *)&pdata[1], 0) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1664 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1665 if (_Pickler_Write(self, pdata, 9) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1666 return -1;
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1667 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1668 else {
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1669 int result = -1;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1670 char *buf = NULL;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1671 char op = FLOAT;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1672
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1673 if (_Pickler_Write(self, &op, 1) < 0)
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1674 goto done;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1675
53192 973f4d7aa87c Make sure that marshal and pickle continue to output 17 Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1676 buf = PyOS_double_to_string(x, 'g', 17, 0, NULL);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1677 if (!buf) {
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1678 PyErr_NoMemory();
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1679 goto done;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1680 }
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1681
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1682 if (_Pickler_Write(self, buf, strlen(buf)) < 0)
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1683 goto done;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1684
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1685 if (_Pickler_Write(self, "\n", 1) < 0)
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1686 goto done;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1687
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1688 result = 0;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1689 done:
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1690 PyMem_Free(buf);
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52761 diff changeset	1691 return result;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1692 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1693
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1694 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1695 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1696
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1697 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1698 save_bytes(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1699 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1700 if (self->proto < 3) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1701 /* Older pickle protocols do not have an opcode for pickling bytes
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1702 objects. Therefore, we need to fake the copy protocol (i.e.,
73957 14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1703 the __reduce__ method) to permit bytes object unpickling.
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1704
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1705 Here we use a hack to be compatible with Python 2. Since in Python
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1706 2 'bytes' is just an alias for 'str' (which has different
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1707 parameters than the actual bytes object), we use codecs.encode
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1708 to create the appropriate 'str' object when unpickled using
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1709 Python 2 and the appropriate 'bytes' object when unpickled
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1710 using Python 3. Again this is a hack and we don't need to do this
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1711 with newer protocols. */
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1712 static PyObject *codecs_encode = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1713 PyObject *reduce_value = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1714 int status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1715
73957 14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1716 if (codecs_encode == NULL) {
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1717 PyObject *codecs_module = PyImport_ImportModule("codecs");
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1718 if (codecs_module == NULL) {
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1719 return -1;
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1720 }
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1721 codecs_encode = PyObject_GetAttrString(codecs_module, "encode");
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1722 Py_DECREF(codecs_module);
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1723 if (codecs_encode == NULL) {
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1724 return -1;
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1725 }
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1726 }
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1727
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1728 if (PyBytes_GET_SIZE(obj) == 0) {
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1729 reduce_value = Py_BuildValue("(O())", (PyObject*)&PyBytes_Type);
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1730 }
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1731 else {
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1732 static PyObject *latin1 = NULL;
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1733 PyObject *unicode_str =
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1734 PyUnicode_DecodeLatin1(PyBytes_AS_STRING(obj),
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1735 PyBytes_GET_SIZE(obj),
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1736 "strict");
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1737 if (unicode_str == NULL)
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1738 return -1;
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1739 if (latin1 == NULL) {
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1740 latin1 = PyUnicode_InternFromString("latin1");
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1741 if (latin1 == NULL)
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1742 return -1;
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1743 }
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1744 reduce_value = Py_BuildValue("(O(OO))",
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1745 codecs_encode, unicode_str, latin1);
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1746 Py_DECREF(unicode_str);
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1747 }
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1748
14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1749 if (reduce_value == NULL)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1750 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1751
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1752 /* save_reduce() will memoize the object automatically. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1753 status = save_reduce(self, reduce_value, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1754 Py_DECREF(reduce_value);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1755 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1756 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1757 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1758 Py_ssize_t size;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1759 char header[5];
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1760 Py_ssize_t len;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1761
73957 14695b4825dc Issue #13505: Make pickling of bytes object compatible with Python 2. Alexandre Vassalotti <alexandre@peadrop.com> parents: 72639 diff changeset	1762 size = PyBytes_GET_SIZE(obj);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1763 if (size < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1764 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1765
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1766 if (size < 256) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1767 header[0] = SHORT_BINBYTES;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1768 header[1] = (unsigned char)size;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1769 len = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1770 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1771 else if (size <= 0xffffffffL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1772 header[0] = BINBYTES;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1773 header[1] = (unsigned char)(size & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1774 header[2] = (unsigned char)((size >> 8) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1775 header[3] = (unsigned char)((size >> 16) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1776 header[4] = (unsigned char)((size >> 24) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1777 len = 5;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1778 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1779 else {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1780 PyErr_SetString(PyExc_OverflowError,
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1781 "cannot serialize a bytes object larger than 4GB");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1782 return -1; /* string too large */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1783 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1784
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1785 if (_Pickler_Write(self, header, len) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1786 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1787
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1788 if (_Pickler_Write(self, PyBytes_AS_STRING(obj), size) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1789 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1790
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1791 if (memo_put(self, obj) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1792 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1793
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1794 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1795 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1796 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1797
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1798 /* A copy of PyUnicode_EncodeRawUnicodeEscape() that also translates
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1799 backslash and newline characters to \uXXXX escapes. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1800 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1801 raw_unicode_escape(const Py_UNICODE *s, Py_ssize_t size)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1802 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1803 PyObject repr, result;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1804 char *p;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1805 char *q;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1806
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1807 static const char *hexdigits = "0123456789abcdef";
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1808
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1809 #ifdef Py_UNICODE_WIDE
50544 c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1810 const Py_ssize_t expandsize = 10;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1811 #else
50544 c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1812 const Py_ssize_t expandsize = 6;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1813 #endif
50544 c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1814
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1815 if (size > PY_SSIZE_T_MAX / expandsize)
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1816 return PyErr_NoMemory();
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1817
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1818 repr = PyByteArray_FromStringAndSize(NULL, expandsize * size);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1819 if (repr == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1820 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1821 if (size == 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1822 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1823
50544 c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1824 p = q = PyByteArray_AS_STRING(repr);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1825 while (size-- > 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1826 Py_UNICODE ch = *s++;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1827 #ifdef Py_UNICODE_WIDE
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1828 /* Map 32-bit characters to '\Uxxxxxxxx' */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1829 if (ch >= 0x10000) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1830 *p++ = '\\';
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1831 *p++ = 'U';
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1832 *p++ = hexdigits[(ch >> 28) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1833 *p++ = hexdigits[(ch >> 24) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1834 *p++ = hexdigits[(ch >> 20) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1835 *p++ = hexdigits[(ch >> 16) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1836 *p++ = hexdigits[(ch >> 12) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1837 *p++ = hexdigits[(ch >> 8) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1838 *p++ = hexdigits[(ch >> 4) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1839 *p++ = hexdigits[ch & 15];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1840 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1841 else
50544 c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1842 #else
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1843 /* Map UTF-16 surrogate pairs to '\U00xxxxxx' */
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1844 if (ch >= 0xD800 && ch < 0xDC00) {
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1845 Py_UNICODE ch2;
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1846 Py_UCS4 ucs;
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1847
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1848 ch2 = *s++;
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1849 size--;
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1850 if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) {
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1851 ucs = (((ch & 0x03FF) << 10) \| (ch2 & 0x03FF)) + 0x00010000;
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1852 *p++ = '\\';
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1853 *p++ = 'U';
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1854 *p++ = hexdigits[(ucs >> 28) & 0xf];
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1855 *p++ = hexdigits[(ucs >> 24) & 0xf];
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1856 *p++ = hexdigits[(ucs >> 20) & 0xf];
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1857 *p++ = hexdigits[(ucs >> 16) & 0xf];
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1858 *p++ = hexdigits[(ucs >> 12) & 0xf];
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1859 *p++ = hexdigits[(ucs >> 8) & 0xf];
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1860 *p++ = hexdigits[(ucs >> 4) & 0xf];
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1861 *p++ = hexdigits[ucs & 0xf];
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1862 continue;
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1863 }
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1864 /* Fall through: isolated surrogates are copied as-is */
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1865 s--;
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1866 size++;
c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1867 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1868 #endif
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1869 /* Map 16-bit characters to '\uxxxx' */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1870 if (ch >= 256 \|\| ch == '\\' \|\| ch == '\n') {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1871 *p++ = '\\';
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1872 *p++ = 'u';
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1873 *p++ = hexdigits[(ch >> 12) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1874 *p++ = hexdigits[(ch >> 8) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1875 *p++ = hexdigits[(ch >> 4) & 0xf];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1876 *p++ = hexdigits[ch & 15];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1877 }
50544 c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1878 /* Copy everything else as-is */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1879 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1880 *p++ = (char) ch;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1881 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1882 size = p - q;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1883
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1884 done:
50544 c9e5c1fa285e Merged revisions 67937-67938 via svnmerge from Georg Brandl <georg@python.org> parents: 49849 diff changeset	1885 result = PyBytes_FromStringAndSize(PyByteArray_AS_STRING(repr), size);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1886 Py_DECREF(repr);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1887 return result;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1888 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1889
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1890 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1891 save_unicode(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1892 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1893 Py_ssize_t size;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1894 PyObject *encoded = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1895
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1896 if (self->bin) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1897 char pdata[5];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1898
60577 7994269ad3a1 Issue #8383: pickle and pickletools use surrogatepass error handler when Victor Stinner <victor.stinner@haypocalc.com> parents: 58186 diff changeset	1899 encoded = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(obj),
7994269ad3a1 Issue #8383: pickle and pickletools use surrogatepass error handler when Victor Stinner <victor.stinner@haypocalc.com> parents: 58186 diff changeset	1900 PyUnicode_GET_SIZE(obj),
7994269ad3a1 Issue #8383: pickle and pickletools use surrogatepass error handler when Victor Stinner <victor.stinner@haypocalc.com> parents: 58186 diff changeset	1901 "surrogatepass");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1902 if (encoded == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1903 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1904
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1905 size = PyBytes_GET_SIZE(encoded);
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1906 if (size > 0xffffffffL) {
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1907 PyErr_SetString(PyExc_OverflowError,
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1908 "cannot serialize a string larger than 4GB");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1909 goto error; /* string too large */
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1910 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1911
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1912 pdata[0] = BINUNICODE;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1913 pdata[1] = (unsigned char)(size & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1914 pdata[2] = (unsigned char)((size >> 8) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1915 pdata[3] = (unsigned char)((size >> 16) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1916 pdata[4] = (unsigned char)((size >> 24) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1917
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1918 if (_Pickler_Write(self, pdata, 5) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1919 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1920
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1921 if (_Pickler_Write(self, PyBytes_AS_STRING(encoded), size) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1922 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1923 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1924 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1925 const char unicode_op = UNICODE;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1926
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1927 encoded = raw_unicode_escape(PyUnicode_AS_UNICODE(obj),
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1928 PyUnicode_GET_SIZE(obj));
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1929 if (encoded == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1930 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1931
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1932 if (_Pickler_Write(self, &unicode_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1933 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1934
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1935 size = PyBytes_GET_SIZE(encoded);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1936 if (_Pickler_Write(self, PyBytes_AS_STRING(encoded), size) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1937 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1938
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	1939 if (_Pickler_Write(self, "\n", 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1940 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1941 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1942 if (memo_put(self, obj) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1943 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1944
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1945 Py_DECREF(encoded);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1946 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1947
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1948 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1949 Py_XDECREF(encoded);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1950 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1951 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1952
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1953 /* A helper for save_tuple. Push the len elements in tuple t on the stack. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1954 static int
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1955 store_tuple_elements(PicklerObject self, PyObject t, Py_ssize_t len)
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1956 {
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1957 Py_ssize_t i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1958
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1959 assert(PyTuple_Size(t) == len);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1960
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1961 for (i = 0; i < len; i++) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1962 PyObject *element = PyTuple_GET_ITEM(t, i);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1963
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1964 if (element == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1965 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1966 if (save(self, element, 0) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1967 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1968 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1969
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1970 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1971 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1972
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1973 /* Tuples are ubiquitous in the pickle protocols, so many techniques are
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1974 * used across protocols to minimize the space needed to pickle them.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1975 * Tuples are also the only builtin immutable type that can be recursive
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1976 * (a tuple can be reached from itself), and that requires some subtle
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1977 * magic so that it works in all cases. IOW, this is a long routine.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1978 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1979 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1980 save_tuple(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1981 {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	1982 Py_ssize_t len, i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1983
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1984 const char mark_op = MARK;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1985 const char tuple_op = TUPLE;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1986 const char pop_op = POP;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1987 const char pop_mark_op = POP_MARK;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1988 const char len2opcode[] = {EMPTY_TUPLE, TUPLE1, TUPLE2, TUPLE3};
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1989
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1990 if ((len = PyTuple_Size(obj)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1991 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1992
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1993 if (len == 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1994 char pdata[2];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1995
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1996 if (self->proto) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1997 pdata[0] = EMPTY_TUPLE;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1998 len = 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	1999 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2000 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2001 pdata[0] = MARK;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2002 pdata[1] = TUPLE;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2003 len = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2004 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2005 if (_Pickler_Write(self, pdata, len) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2006 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2007 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2008 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2009
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2010 /* The tuple isn't in the memo now. If it shows up there after
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2011 * saving the tuple elements, the tuple must be recursive, in
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2012 * which case we'll pop everything we put on the stack, and fetch
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2013 * its value from the memo.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2014 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2015 if (len <= 3 && self->proto >= 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2016 /* Use TUPLE{1,2,3} opcodes. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2017 if (store_tuple_elements(self, obj, len) < 0)
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2018 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2019
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2020 if (PyMemoTable_Get(self->memo, obj)) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2021 /* pop the len elements */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2022 for (i = 0; i < len; i++)
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2023 if (_Pickler_Write(self, &pop_op, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2024 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2025 /* fetch from memo */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2026 if (memo_get(self, obj) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2027 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2028
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2029 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2030 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2031 else { /* Not recursive. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2032 if (_Pickler_Write(self, len2opcode + len, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2033 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2034 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2035 goto memoize;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2036 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2037
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2038 /* proto < 2 and len > 0, or proto >= 2 and len > 3.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2039 * Generate MARK e1 e2 ... TUPLE
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2040 */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2041 if (_Pickler_Write(self, &mark_op, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2042 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2043
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2044 if (store_tuple_elements(self, obj, len) < 0)
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2045 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2046
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2047 if (PyMemoTable_Get(self->memo, obj)) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2048 /* pop the stack stuff we pushed */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2049 if (self->bin) {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2050 if (_Pickler_Write(self, &pop_mark_op, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2051 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2052 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2053 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2054 /* Note that we pop one more than len, to remove
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2055 * the MARK too.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2056 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2057 for (i = 0; i <= len; i++)
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2058 if (_Pickler_Write(self, &pop_op, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2059 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2060 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2061 /* fetch from memo */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2062 if (memo_get(self, obj) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2063 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2064
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2065 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2066 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2067 else { /* Not recursive. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2068 if (_Pickler_Write(self, &tuple_op, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2069 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2070 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2071
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2072 memoize:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2073 if (memo_put(self, obj) < 0)
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2074 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2075
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2076 return 0;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2077 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2078
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2079 /* iter is an iterator giving items, and we batch up chunks of
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2080 * MARK item item ... item APPENDS
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2081 * opcode sequences. Calling code should have arranged to first create an
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2082 * empty list, or list-like object, for the APPENDS to operate on.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2083 * Returns 0 on success, <0 on error.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2084 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2085 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2086 batch_list(PicklerObject self, PyObject iter)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2087 {
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2088 PyObject *obj = NULL;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2089 PyObject *firstitem = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2090 int i, n;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2091
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2092 const char mark_op = MARK;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2093 const char append_op = APPEND;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2094 const char appends_op = APPENDS;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2095
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2096 assert(iter != NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2097
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2098 /* XXX: I think this function could be made faster by avoiding the
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2099 iterator interface and fetching objects directly from list using
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2100 PyList_GET_ITEM.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2101 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2102
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2103 if (self->proto == 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2104 /* APPENDS isn't available; do one at a time. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2105 for (;;) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2106 obj = PyIter_Next(iter);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2107 if (obj == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2108 if (PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2109 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2110 break;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2111 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2112 i = save(self, obj, 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2113 Py_DECREF(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2114 if (i < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2115 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2116 if (_Pickler_Write(self, &append_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2117 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2118 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2119 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2120 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2121
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2122 /* proto > 0: write in batches of BATCHSIZE. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2123 do {
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2124 /* Get first item */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2125 firstitem = PyIter_Next(iter);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2126 if (firstitem == NULL) {
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2127 if (PyErr_Occurred())
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2128 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2129
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2130 /* nothing more to add */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2131 break;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2132 }
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2133
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2134 /* Try to get a second item */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2135 obj = PyIter_Next(iter);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2136 if (obj == NULL) {
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2137 if (PyErr_Occurred())
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2138 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2139
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2140 /* Only one item to write */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2141 if (save(self, firstitem, 0) < 0)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2142 goto error;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2143 if (_Pickler_Write(self, &append_op, 1) < 0)
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2144 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2145 Py_CLEAR(firstitem);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2146 break;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2147 }
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2148
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2149 /* More than one item to write */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2150
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2151 /* Pump out MARK, items, APPENDS. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2152 if (_Pickler_Write(self, &mark_op, 1) < 0)
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2153 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2154
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2155 if (save(self, firstitem, 0) < 0)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2156 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2157 Py_CLEAR(firstitem);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2158 n = 1;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2159
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2160 /* Fetch and save up to BATCHSIZE items */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2161 while (obj) {
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2162 if (save(self, obj, 0) < 0)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2163 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2164 Py_CLEAR(obj);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2165 n += 1;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2166
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2167 if (n == BATCHSIZE)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2168 break;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2169
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2170 obj = PyIter_Next(iter);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2171 if (obj == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2172 if (PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2173 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2174 break;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2175 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2176 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2177
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2178 if (_Pickler_Write(self, &appends_op, 1) < 0)
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2179 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2180
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2181 } while (n == BATCHSIZE);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2182 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2183
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2184 error:
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2185 Py_XDECREF(firstitem);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2186 Py_XDECREF(obj);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2187 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2188 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2189
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2190 /* This is a variant of batch_list() above, specialized for lists (with no
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2191 * support for list subclasses). Like batch_list(), we batch up chunks of
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2192 * MARK item item ... item APPENDS
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2193 * opcode sequences. Calling code should have arranged to first create an
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2194 * empty list, or list-like object, for the APPENDS to operate on.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2195 * Returns 0 on success, -1 on error.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2196 *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2197 * This version is considerably faster than batch_list(), if less general.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2198 *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2199 * Note that this only works for protocols > 0.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2200 */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2201 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2202 batch_list_exact(PicklerObject self, PyObject obj)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2203 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2204 PyObject *item = NULL;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	2205 Py_ssize_t this_batch, total;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2206
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2207 const char append_op = APPEND;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2208 const char appends_op = APPENDS;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2209 const char mark_op = MARK;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2210
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2211 assert(obj != NULL);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2212 assert(self->proto > 0);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2213 assert(PyList_CheckExact(obj));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2214
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2215 if (PyList_GET_SIZE(obj) == 1) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2216 item = PyList_GET_ITEM(obj, 0);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2217 if (save(self, item, 0) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2218 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2219 if (_Pickler_Write(self, &append_op, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2220 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2221 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2222 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2223
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2224 /* Write in batches of BATCHSIZE. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2225 total = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2226 do {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2227 this_batch = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2228 if (_Pickler_Write(self, &mark_op, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2229 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2230 while (total < PyList_GET_SIZE(obj)) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2231 item = PyList_GET_ITEM(obj, total);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2232 if (save(self, item, 0) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2233 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2234 total++;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2235 if (++this_batch == BATCHSIZE)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2236 break;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2237 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2238 if (_Pickler_Write(self, &appends_op, 1) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2239 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2240
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2241 } while (total < PyList_GET_SIZE(obj));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2242
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2243 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2244 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2245
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2246 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2247 save_list(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2248 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2249 char header[3];
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	2250 Py_ssize_t len;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2251 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2252
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2253 if (self->fast && !fast_save_enter(self, obj))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2254 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2255
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2256 /* Create an empty list. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2257 if (self->bin) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2258 header[0] = EMPTY_LIST;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2259 len = 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2260 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2261 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2262 header[0] = MARK;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2263 header[1] = LIST;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2264 len = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2265 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2266
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2267 if (_Pickler_Write(self, header, len) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2268 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2269
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2270 /* Get list length, and bow out early if empty. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2271 if ((len = PyList_Size(obj)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2272 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2273
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2274 if (memo_put(self, obj) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2275 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2276
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2277 if (len != 0) {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2278 /* Materialize the list elements. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2279 if (PyList_CheckExact(obj) && self->proto > 0) {
67724 4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2280 if (Py_EnterRecursiveCall(" while pickling an object"))
4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2281 goto error;
4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2282 status = batch_list_exact(self, obj);
4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2283 Py_LeaveRecursiveCall();
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2284 } else {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2285 PyObject *iter = PyObject_GetIter(obj);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2286 if (iter == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2287 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2288
67724 4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2289 if (Py_EnterRecursiveCall(" while pickling an object")) {
4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2290 Py_DECREF(iter);
4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2291 goto error;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2292 }
67724 4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2293 status = batch_list(self, iter);
4c4abfb884fb Issue #10987: Fix the recursion limit handling in the _pickle module. Antoine Pitrou <solipsis@pitrou.net> parents: 66106 diff changeset	2294 Py_LeaveRecursiveCall();
67725 bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2295 Py_DECREF(iter);
bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2296 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2297 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2298 if (0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2299 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2300 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2301 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2302
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2303 if (self->fast && !fast_save_leave(self, obj))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2304 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2305
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2306 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2307 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2308
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2309 /* iter is an iterator giving (key, value) pairs, and we batch up chunks of
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2310 * MARK key value ... key value SETITEMS
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2311 * opcode sequences. Calling code should have arranged to first create an
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2312 * empty dict, or dict-like object, for the SETITEMS to operate on.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2313 * Returns 0 on success, <0 on error.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2314 *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2315 * This is very much like batch_list(). The difference between saving
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2316 * elements directly, and picking apart two-tuples, is so long-winded at
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2317 * the C level, though, that attempts to combine these routines were too
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2318 * ugly to bear.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2319 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2320 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2321 batch_dict(PicklerObject self, PyObject iter)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2322 {
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2323 PyObject *obj = NULL;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2324 PyObject *firstitem = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2325 int i, n;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2326
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2327 const char mark_op = MARK;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2328 const char setitem_op = SETITEM;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2329 const char setitems_op = SETITEMS;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2330
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2331 assert(iter != NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2332
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2333 if (self->proto == 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2334 /* SETITEMS isn't available; do one at a time. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2335 for (;;) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2336 obj = PyIter_Next(iter);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2337 if (obj == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2338 if (PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2339 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2340 break;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2341 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2342 if (!PyTuple_Check(obj) \|\| PyTuple_Size(obj) != 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2343 PyErr_SetString(PyExc_TypeError, "dict items "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2344 "iterator must return 2-tuples");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2345 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2346 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2347 i = save(self, PyTuple_GET_ITEM(obj, 0), 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2348 if (i >= 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2349 i = save(self, PyTuple_GET_ITEM(obj, 1), 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2350 Py_DECREF(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2351 if (i < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2352 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2353 if (_Pickler_Write(self, &setitem_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2354 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2355 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2356 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2357 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2358
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2359 /* proto > 0: write in batches of BATCHSIZE. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2360 do {
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2361 /* Get first item */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2362 firstitem = PyIter_Next(iter);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2363 if (firstitem == NULL) {
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2364 if (PyErr_Occurred())
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2365 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2366
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2367 /* nothing more to add */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2368 break;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2369 }
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2370 if (!PyTuple_Check(firstitem) \|\| PyTuple_Size(firstitem) != 2) {
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2371 PyErr_SetString(PyExc_TypeError, "dict items "
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2372 "iterator must return 2-tuples");
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2373 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2374 }
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2375
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2376 /* Try to get a second item */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2377 obj = PyIter_Next(iter);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2378 if (obj == NULL) {
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2379 if (PyErr_Occurred())
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2380 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2381
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2382 /* Only one item to write */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2383 if (save(self, PyTuple_GET_ITEM(firstitem, 0), 0) < 0)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2384 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2385 if (save(self, PyTuple_GET_ITEM(firstitem, 1), 0) < 0)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2386 goto error;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2387 if (_Pickler_Write(self, &setitem_op, 1) < 0)
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2388 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2389 Py_CLEAR(firstitem);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2390 break;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2391 }
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2392
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2393 /* More than one item to write */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2394
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2395 /* Pump out MARK, items, SETITEMS. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2396 if (_Pickler_Write(self, &mark_op, 1) < 0)
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2397 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2398
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2399 if (save(self, PyTuple_GET_ITEM(firstitem, 0), 0) < 0)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2400 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2401 if (save(self, PyTuple_GET_ITEM(firstitem, 1), 0) < 0)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2402 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2403 Py_CLEAR(firstitem);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2404 n = 1;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2405
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2406 /* Fetch and save up to BATCHSIZE items */
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2407 while (obj) {
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2408 if (!PyTuple_Check(obj) \|\| PyTuple_Size(obj) != 2) {
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2409 PyErr_SetString(PyExc_TypeError, "dict items "
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2410 "iterator must return 2-tuples");
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2411 goto error;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2412 }
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2413 if (save(self, PyTuple_GET_ITEM(obj, 0), 0) < 0 \|\|
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2414 save(self, PyTuple_GET_ITEM(obj, 1), 0) < 0)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2415 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2416 Py_CLEAR(obj);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2417 n += 1;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2418
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2419 if (n == BATCHSIZE)
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2420 break;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2421
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2422 obj = PyIter_Next(iter);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2423 if (obj == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2424 if (PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2425 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2426 break;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2427 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2428 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2429
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2430 if (_Pickler_Write(self, &setitems_op, 1) < 0)
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2431 goto error;
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2432
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2433 } while (n == BATCHSIZE);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2434 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2435
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2436 error:
49149 4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2437 Py_XDECREF(firstitem);
4cd97f8de69e #3640: Correct a crash in cPickle on 64bit platforms, in the case of deeply nested lists or dicts. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49023 diff changeset	2438 Py_XDECREF(obj);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2439 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2440 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2441
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2442 /* This is a variant of batch_dict() above that specializes for dicts, with no
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2443 * support for dict subclasses. Like batch_dict(), we batch up chunks of
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2444 * MARK key value ... key value SETITEMS
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2445 * opcode sequences. Calling code should have arranged to first create an
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2446 * empty dict, or dict-like object, for the SETITEMS to operate on.
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2447 * Returns 0 on success, -1 on error.
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2448 *
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2449 * Note that this currently doesn't work for protocol 0.
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2450 */
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2451 static int
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2452 batch_dict_exact(PicklerObject self, PyObject obj)
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2453 {
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2454 PyObject key = NULL, value = NULL;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2455 int i;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2456 Py_ssize_t dict_size, ppos = 0;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2457
54331 39d3a75fa821 Make variable declarations for opcodes in batch_dict_exact consistent Alexandre Vassalotti <alexandre@peadrop.com> parents: 54328 diff changeset	2458 const char mark_op = MARK;
39d3a75fa821 Make variable declarations for opcodes in batch_dict_exact consistent Alexandre Vassalotti <alexandre@peadrop.com> parents: 54328 diff changeset	2459 const char setitem_op = SETITEM;
39d3a75fa821 Make variable declarations for opcodes in batch_dict_exact consistent Alexandre Vassalotti <alexandre@peadrop.com> parents: 54328 diff changeset	2460 const char setitems_op = SETITEMS;
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2461
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2462 assert(obj != NULL);
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2463 assert(self->proto > 0);
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2464
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2465 dict_size = PyDict_Size(obj);
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2466
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2467 /* Special-case len(d) == 1 to save space. */
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2468 if (dict_size == 1) {
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2469 PyDict_Next(obj, &ppos, &key, &value);
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2470 if (save(self, key, 0) < 0)
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2471 return -1;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2472 if (save(self, value, 0) < 0)
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2473 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2474 if (_Pickler_Write(self, &setitem_op, 1) < 0)
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2475 return -1;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2476 return 0;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2477 }
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2478
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2479 /* Write in batches of BATCHSIZE. */
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2480 do {
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2481 i = 0;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2482 if (_Pickler_Write(self, &mark_op, 1) < 0)
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2483 return -1;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2484 while (PyDict_Next(obj, &ppos, &key, &value)) {
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2485 if (save(self, key, 0) < 0)
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2486 return -1;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2487 if (save(self, value, 0) < 0)
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2488 return -1;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2489 if (++i == BATCHSIZE)
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2490 break;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2491 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2492 if (_Pickler_Write(self, &setitems_op, 1) < 0)
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2493 return -1;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2494 if (PyDict_Size(obj) != dict_size) {
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2495 PyErr_Format(
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2496 PyExc_RuntimeError,
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2497 "dictionary changed size during iteration");
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2498 return -1;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2499 }
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2500
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2501 } while (i == BATCHSIZE);
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2502 return 0;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2503 }
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2504
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2505 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2506 save_dict(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2507 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2508 PyObject items, iter;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2509 char header[3];
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	2510 Py_ssize_t len;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2511 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2512
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2513 if (self->fast && !fast_save_enter(self, obj))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2514 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2515
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2516 /* Create an empty dict. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2517 if (self->bin) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2518 header[0] = EMPTY_DICT;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2519 len = 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2520 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2521 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2522 header[0] = MARK;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2523 header[1] = DICT;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2524 len = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2525 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2526
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2527 if (_Pickler_Write(self, header, len) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2528 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2529
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2530 /* Get dict size, and bow out early if empty. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2531 if ((len = PyDict_Size(obj)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2532 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2533
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2534 if (memo_put(self, obj) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2535 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2536
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2537 if (len != 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2538 /* Save the dict items. */
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2539 if (PyDict_CheckExact(obj) && self->proto > 0) {
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2540 /* We can take certain shortcuts if we know this is a dict and
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2541 not a dict subclass. */
67725 bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2542 if (Py_EnterRecursiveCall(" while pickling an object"))
bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2543 goto error;
bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2544 status = batch_dict_exact(self, obj);
bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2545 Py_LeaveRecursiveCall();
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2546 } else {
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2547 items = PyObject_CallMethod(obj, "items", "()");
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2548 if (items == NULL)
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2549 goto error;
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2550 iter = PyObject_GetIter(items);
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2551 Py_DECREF(items);
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2552 if (iter == NULL)
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2553 goto error;
67725 bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2554 if (Py_EnterRecursiveCall(" while pickling an object")) {
bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2555 Py_DECREF(iter);
bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2556 goto error;
bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2557 }
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2558 status = batch_dict(self, iter);
67725 bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2559 Py_LeaveRecursiveCall();
54328 5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2560 Py_DECREF(iter);
5ab2f6ca65aa Merged revisions 72909 via svnmerge from Collin Winter <collinw@gmail.com> parents: 53707 diff changeset	2561 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2562 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2563
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2564 if (0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2565 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2566 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2567 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2568
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2569 if (self->fast && !fast_save_leave(self, obj))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2570 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2571
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2572 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2573 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2574
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2575 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2576 save_global(PicklerObject self, PyObject obj, PyObject *name)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2577 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2578 static PyObject *name_str = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2579 PyObject *global_name = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2580 PyObject *module_name = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2581 PyObject *module = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2582 PyObject *cls;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2583 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2584
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2585 const char global_op = GLOBAL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2586
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2587 if (name_str == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2588 name_str = PyUnicode_InternFromString("__name__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2589 if (name_str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2590 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2591 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2592
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2593 if (name) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2594 global_name = name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2595 Py_INCREF(global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2596 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2597 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2598 global_name = PyObject_GetAttr(obj, name_str);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2599 if (global_name == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2600 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2601 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2602
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2603 module_name = whichmodule(obj, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2604 if (module_name == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2605 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2606
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2607 /* XXX: Change to use the import C API directly with level=0 to disallow
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2608 relative imports.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2609
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2610 XXX: PyImport_ImportModuleLevel could be used. However, this bypasses
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2611 builtins.__import__. Therefore, _pickle, unlike pickle.py, will ignore
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2612 custom import functions (IMHO, this would be a nice security
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2613 feature). The import C API would need to be extended to support the
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2614 extra parameters of __import__ to fix that. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2615 module = PyImport_Import(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2616 if (module == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2617 PyErr_Format(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2618 "Can't pickle %R: import of module %R failed",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2619 obj, module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2620 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2621 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2622 cls = PyObject_GetAttr(module, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2623 if (cls == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2624 PyErr_Format(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2625 "Can't pickle %R: attribute lookup %S.%S failed",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2626 obj, module_name, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2627 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2628 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2629 if (cls != obj) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2630 Py_DECREF(cls);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2631 PyErr_Format(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2632 "Can't pickle %R: it's not the same object as %S.%S",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2633 obj, module_name, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2634 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2635 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2636 Py_DECREF(cls);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2637
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2638 if (self->proto >= 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2639 /* See whether this is in the extension registry, and if
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2640 * so generate an EXT opcode.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2641 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2642 PyObject code_obj; / extension code as Python object */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2643 long code; /* extension code as C value */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2644 char pdata[5];
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	2645 Py_ssize_t n;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2646
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2647 PyTuple_SET_ITEM(two_tuple, 0, module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2648 PyTuple_SET_ITEM(two_tuple, 1, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2649 code_obj = PyDict_GetItem(extension_registry, two_tuple);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2650 /* The object is not registered in the extension registry.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2651 This is the most likely code path. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2652 if (code_obj == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2653 goto gen_global;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2654
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2655 /* XXX: pickle.py doesn't check neither the type, nor the range
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2656 of the value returned by the extension_registry. It should for
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2657 consistency. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2658
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2659 /* Verify code_obj has the right type and value. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2660 if (!PyLong_Check(code_obj)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2661 PyErr_Format(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2662 "Can't pickle %R: extension code %R isn't an integer",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2663 obj, code_obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2664 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2665 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2666 code = PyLong_AS_LONG(code_obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2667 if (code <= 0 \|\| code > 0x7fffffffL) {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	2668 if (!PyErr_Occurred())
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	2669 PyErr_Format(PicklingError,
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	2670 "Can't pickle %R: extension code %ld is out of range",
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	2671 obj, code);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2672 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2673 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2674
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2675 /* Generate an EXT opcode. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2676 if (code <= 0xff) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2677 pdata[0] = EXT1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2678 pdata[1] = (unsigned char)code;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2679 n = 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2680 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2681 else if (code <= 0xffff) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2682 pdata[0] = EXT2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2683 pdata[1] = (unsigned char)(code & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2684 pdata[2] = (unsigned char)((code >> 8) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2685 n = 3;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2686 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2687 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2688 pdata[0] = EXT4;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2689 pdata[1] = (unsigned char)(code & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2690 pdata[2] = (unsigned char)((code >> 8) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2691 pdata[3] = (unsigned char)((code >> 16) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2692 pdata[4] = (unsigned char)((code >> 24) & 0xff);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2693 n = 5;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2694 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2695
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2696 if (_Pickler_Write(self, pdata, n) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2697 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2698 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2699 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2700 /* Generate a normal global opcode if we are using a pickle
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2701 protocol <= 2, or if the object is not registered in the
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2702 extension registry. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2703 PyObject *encoded;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2704 PyObject (unicode_encoder)(PyObject *);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2705
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2706 gen_global:
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2707 if (_Pickler_Write(self, &global_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2708 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2709
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2710 /* Since Python 3.0 now supports non-ASCII identifiers, we encode both
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2711 the module name and the global name using UTF-8. We do so only when
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2712 we are using the pickle protocol newer than version 3. This is to
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2713 ensure compatibility with older Unpickler running on Python 2.x. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2714 if (self->proto >= 3) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2715 unicode_encoder = PyUnicode_AsUTF8String;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2716 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2717 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2718 unicode_encoder = PyUnicode_AsASCIIString;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2719 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2720
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2721 /* For protocol < 3 and if the user didn't request against doing so,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2722 we convert module names to the old 2.x module names. */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2723 if (self->fix_imports) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2724 PyObject *key;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2725 PyObject *item;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2726
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2727 key = PyTuple_Pack(2, module_name, global_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2728 if (key == NULL)
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2729 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2730 item = PyDict_GetItemWithError(name_mapping_3to2, key);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2731 Py_DECREF(key);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2732 if (item) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2733 if (!PyTuple_Check(item) \|\| PyTuple_GET_SIZE(item) != 2) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2734 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2735 "_compat_pickle.REVERSE_NAME_MAPPING values "
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2736 "should be 2-tuples, not %.200s",
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2737 Py_TYPE(item)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2738 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2739 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2740 Py_CLEAR(module_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2741 Py_CLEAR(global_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2742 module_name = PyTuple_GET_ITEM(item, 0);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2743 global_name = PyTuple_GET_ITEM(item, 1);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2744 if (!PyUnicode_Check(module_name) \|\|
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2745 !PyUnicode_Check(global_name)) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2746 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2747 "_compat_pickle.REVERSE_NAME_MAPPING values "
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2748 "should be pairs of str, not (%.200s, %.200s)",
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2749 Py_TYPE(module_name)->tp_name,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2750 Py_TYPE(global_name)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2751 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2752 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2753 Py_INCREF(module_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2754 Py_INCREF(global_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2755 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2756 else if (PyErr_Occurred()) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2757 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2758 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2759
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2760 item = PyDict_GetItemWithError(import_mapping_3to2, module_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2761 if (item) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2762 if (!PyUnicode_Check(item)) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2763 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2764 "_compat_pickle.REVERSE_IMPORT_MAPPING values "
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2765 "should be strings, not %.200s",
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2766 Py_TYPE(item)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2767 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2768 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2769 Py_CLEAR(module_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2770 module_name = item;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2771 Py_INCREF(module_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2772 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2773 else if (PyErr_Occurred()) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2774 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2775 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2776 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	2777
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2778 /* Save the name of the module. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2779 encoded = unicode_encoder(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2780 if (encoded == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2781 if (PyErr_ExceptionMatches(PyExc_UnicodeEncodeError))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2782 PyErr_Format(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2783 "can't pickle module identifier '%S' using "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2784 "pickle protocol %i", module_name, self->proto);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2785 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2786 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2787 if (_Pickler_Write(self, PyBytes_AS_STRING(encoded),
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2788 PyBytes_GET_SIZE(encoded)) < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2789 Py_DECREF(encoded);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2790 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2791 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2792 Py_DECREF(encoded);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2793 if(_Pickler_Write(self, "\n", 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2794 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2795
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2796 /* Save the name of the module. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2797 encoded = unicode_encoder(global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2798 if (encoded == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2799 if (PyErr_ExceptionMatches(PyExc_UnicodeEncodeError))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2800 PyErr_Format(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2801 "can't pickle global identifier '%S' using "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2802 "pickle protocol %i", global_name, self->proto);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2803 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2804 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2805 if (_Pickler_Write(self, PyBytes_AS_STRING(encoded),
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2806 PyBytes_GET_SIZE(encoded)) < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2807 Py_DECREF(encoded);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2808 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2809 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2810 Py_DECREF(encoded);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2811 if(_Pickler_Write(self, "\n", 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2812 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2813
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2814 /* Memoize the object. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2815 if (memo_put(self, obj) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2816 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2817 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2818
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2819 if (0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2820 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2821 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2822 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2823 Py_XDECREF(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2824 Py_XDECREF(global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2825 Py_XDECREF(module);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2826
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2827 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2828 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2829
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2830 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2831 save_pers(PicklerObject self, PyObject obj, PyObject *func)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2832 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2833 PyObject *pid = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2834 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2835
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2836 const char persid_op = PERSID;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2837 const char binpersid_op = BINPERSID;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2838
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2839 Py_INCREF(obj);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2840 pid = _Pickler_FastCall(self, func, obj);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2841 if (pid == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2842 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2843
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2844 if (pid != Py_None) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2845 if (self->bin) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2846 if (save(self, pid, 1) < 0 \|\|
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2847 _Pickler_Write(self, &binpersid_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2848 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2849 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2850 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2851 PyObject *pid_str = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2852 char *pid_ascii_bytes;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2853 Py_ssize_t size;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2854
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2855 pid_str = PyObject_Str(pid);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2856 if (pid_str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2857 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2858
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2859 /* XXX: Should it check whether the persistent id only contains
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2860 ASCII characters? And what if the pid contains embedded
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2861 newlines? */
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48462 diff changeset	2862 pid_ascii_bytes = _PyUnicode_AsStringAndSize(pid_str, &size);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2863 Py_DECREF(pid_str);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2864 if (pid_ascii_bytes == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2865 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2866
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2867 if (_Pickler_Write(self, &persid_op, 1) < 0 \|\|
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2868 _Pickler_Write(self, pid_ascii_bytes, size) < 0 \|\|
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2869 _Pickler_Write(self, "\n", 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2870 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2871 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2872 status = 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2873 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2874
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2875 if (0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2876 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2877 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2878 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2879 Py_XDECREF(pid);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2880
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2881 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2882 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2883
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2884 /* We're saving obj, and args is the 2-thru-5 tuple returned by the
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2885 * appropriate __reduce__ method for obj.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2886 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2887 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2888 save_reduce(PicklerObject self, PyObject args, PyObject *obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2889 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2890 PyObject *callable;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2891 PyObject *argtup;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2892 PyObject *state = NULL;
49615 a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2893 PyObject *listitems = Py_None;
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2894 PyObject *dictitems = Py_None;
49638 f2bb133ef517 Sorry, r67092 is commit miss.... Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 49637 diff changeset	2895 Py_ssize_t size;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2896
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2897 int use_newobj = self->proto >= 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2898
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2899 const char reduce_op = REDUCE;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2900 const char build_op = BUILD;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2901 const char newobj_op = NEWOBJ;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2902
49638 f2bb133ef517 Sorry, r67092 is commit miss.... Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 49637 diff changeset	2903 size = PyTuple_Size(args);
f2bb133ef517 Sorry, r67092 is commit miss.... Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 49637 diff changeset	2904 if (size < 2 \|\| size > 5) {
f2bb133ef517 Sorry, r67092 is commit miss.... Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 49637 diff changeset	2905 PyErr_SetString(PicklingError, "tuple returned by "
f2bb133ef517 Sorry, r67092 is commit miss.... Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 49637 diff changeset	2906 "__reduce__ must contain 2 through 5 elements");
f2bb133ef517 Sorry, r67092 is commit miss.... Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 49637 diff changeset	2907 return -1;
f2bb133ef517 Sorry, r67092 is commit miss.... Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 49637 diff changeset	2908 }
f2bb133ef517 Sorry, r67092 is commit miss.... Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 49637 diff changeset	2909
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2910 if (!PyArg_UnpackTuple(args, "save_reduce", 2, 5,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2911 &callable, &argtup, &state, &listitems, &dictitems))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2912 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2913
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2914 if (!PyCallable_Check(callable)) {
49615 a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2915 PyErr_SetString(PicklingError, "first item of the tuple "
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2916 "returned by __reduce__ must be callable");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2917 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2918 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2919 if (!PyTuple_Check(argtup)) {
49615 a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2920 PyErr_SetString(PicklingError, "second item of the tuple "
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2921 "returned by __reduce__ must be a tuple");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2922 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2923 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2924
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2925 if (state == Py_None)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2926 state = NULL;
49615 a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2927
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2928 if (listitems == Py_None)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2929 listitems = NULL;
49615 a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2930 else if (!PyIter_Check(listitems)) {
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2931 PyErr_Format(PicklingError, "Fourth element of tuple"
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2932 "returned by __reduce__ must be an iterator, not %s",
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2933 Py_TYPE(listitems)->tp_name);
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2934 return -1;
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2935 }
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2936
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2937 if (dictitems == Py_None)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2938 dictitems = NULL;
49615 a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2939 else if (!PyIter_Check(dictitems)) {
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2940 PyErr_Format(PicklingError, "Fifth element of tuple"
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2941 "returned by __reduce__ must be an iterator, not %s",
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2942 Py_TYPE(dictitems)->tp_name);
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2943 return -1;
a5ca8951bef1 Merged revisions 67049 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49546 diff changeset	2944 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2945
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2946 /* Protocol 2 special case: if callable's name is __newobj__, use
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2947 NEWOBJ. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2948 if (use_newobj) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2949 static PyObject *newobj_str = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2950 PyObject *name_str;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2951
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2952 if (newobj_str == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2953 newobj_str = PyUnicode_InternFromString("__newobj__");
65599 cd80d05f2fd6 Revert r85797 (and r85798): it broke the Windows buildbots because of Antoine Pitrou <solipsis@pitrou.net> parents: 65597 diff changeset	2954 if (newobj_str == NULL)
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	2955 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2956 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2957
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2958 name_str = PyObject_GetAttrString(callable, "__name__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2959 if (name_str == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2960 if (PyErr_ExceptionMatches(PyExc_AttributeError))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2961 PyErr_Clear();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2962 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2963 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2964 use_newobj = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2965 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2966 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2967 use_newobj = PyUnicode_Check(name_str) &&
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2968 PyUnicode_Compare(name_str, newobj_str) == 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2969 Py_DECREF(name_str);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2970 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2971 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2972 if (use_newobj) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2973 PyObject *cls;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2974 PyObject *newargtup;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2975 PyObject *obj_class;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2976 int p;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2977
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2978 /* Sanity checks. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2979 if (Py_SIZE(argtup) < 1) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2980 PyErr_SetString(PicklingError, "__newobj__ arglist is empty");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2981 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2982 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2983
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2984 cls = PyTuple_GET_ITEM(argtup, 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2985 if (!PyObject_HasAttrString(cls, "__new__")) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2986 PyErr_SetString(PicklingError, "args[0] from "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2987 "__newobj__ args has no __new__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2988 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2989 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2990
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2991 if (obj != NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2992 obj_class = PyObject_GetAttrString(obj, "__class__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2993 if (obj_class == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2994 if (PyErr_ExceptionMatches(PyExc_AttributeError))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2995 PyErr_Clear();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2996 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2997 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2998 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	2999 p = obj_class != cls; /* true iff a problem */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3000 Py_DECREF(obj_class);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3001 if (p) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3002 PyErr_SetString(PicklingError, "args[0] from "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3003 "__newobj__ args has the wrong class");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3004 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3005 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3006 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3007 /* XXX: These calls save() are prone to infinite recursion. Imagine
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3008 what happen if the value returned by the __reduce__() method of
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3009 some extension type contains another object of the same type. Ouch!
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3010
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3011 Here is a quick example, that I ran into, to illustrate what I
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3012 mean:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3013
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3014 >>> import pickle, copyreg
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3015 >>> copyreg.dispatch_table.pop(complex)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3016 >>> pickle.dumps(1+2j)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3017 Traceback (most recent call last):
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3018 ...
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3019 RuntimeError: maximum recursion depth exceeded
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3020
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3021 Removing the complex class from copyreg.dispatch_table made the
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3022 __reduce_ex__() method emit another complex object:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3023
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3024 >>> (1+1j).__reduce_ex__(2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3025 (<function __newobj__ at 0xb7b71c3c>,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3026 (<class 'complex'>, (1+1j)), None, None, None)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3027
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3028 Thus when save() was called on newargstup (the 2nd item) recursion
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3029 ensued. Of course, the bug was in the complex class which had a
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3030 broken __getnewargs__() that emitted another complex object. But,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3031 the point, here, is it is quite easy to end up with a broken reduce
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3032 function. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3033
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3034 /* Save the class and its __new__ arguments. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3035 if (save(self, cls, 0) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3036 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3037
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3038 newargtup = PyTuple_GetSlice(argtup, 1, Py_SIZE(argtup));
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3039 if (newargtup == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3040 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3041
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3042 p = save(self, newargtup, 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3043 Py_DECREF(newargtup);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3044 if (p < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3045 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3046
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3047 /* Add NEWOBJ opcode. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3048 if (_Pickler_Write(self, &newobj_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3049 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3050 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3051 else { /* Not using NEWOBJ. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3052 if (save(self, callable, 0) < 0 \|\|
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3053 save(self, argtup, 0) < 0 \|\|
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3054 _Pickler_Write(self, &reduce_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3055 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3056 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3057
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3058 /* obj can be NULL when save_reduce() is used directly. A NULL obj means
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3059 the caller do not want to memoize the object. Not particularly useful,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3060 but that is to mimic the behavior save_reduce() in pickle.py when
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3061 obj is None. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3062 if (obj && memo_put(self, obj) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3063 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3064
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3065 if (listitems && batch_list(self, listitems) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3066 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3067
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3068 if (dictitems && batch_dict(self, dictitems) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3069 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3070
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3071 if (state) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3072 if (save(self, state, 0) < 0 \|\|
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3073 _Pickler_Write(self, &build_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3074 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3075 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3076
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3077 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3078 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3079
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3080 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3081 save(PicklerObject self, PyObject obj, int pers_save)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3082 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3083 PyTypeObject *type;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3084 PyObject *reduce_func = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3085 PyObject *reduce_value = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3086 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3087
67725 bcf030f73eee Merged revisions 88147 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3088 if (Py_EnterRecursiveCall(" while pickling an object"))
48462 c5710f0debae Fixed _pickle to use Py_EnterRecursiveCall(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 47670 diff changeset	3089 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3090
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3091 /* The extra pers_save argument is necessary to avoid calling save_pers()
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3092 on its returned object. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3093 if (!pers_save && self->pers_func) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3094 /* save_pers() returns:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3095 -1 to signal an error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3096 0 if it did nothing successfully;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3097 1 if a persistent id was saved.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3098 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3099 if ((status = save_pers(self, obj, self->pers_func)) != 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3100 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3101 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3102
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3103 type = Py_TYPE(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3104
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3105 /* The old cPickle had an optimization that used switch-case statement
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3106 dispatching on the first letter of the type name. This has was removed
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3107 since benchmarks shown that this optimization was actually slowing
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3108 things down. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3109
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3110 /* Atom types; these aren't memoized, so don't check the memo. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3111
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3112 if (obj == Py_None) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3113 status = save_none(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3114 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3115 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3116 else if (obj == Py_False \|\| obj == Py_True) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3117 status = save_bool(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3118 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3119 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3120 else if (type == &PyLong_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3121 status = save_long(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3122 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3123 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3124 else if (type == &PyFloat_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3125 status = save_float(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3126 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3127 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3128
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3129 /* Check the memo to see if it has the object. If so, generate
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3130 a GET (or BINGET) opcode, instead of pickling the object
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3131 once again. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3132 if (PyMemoTable_Get(self->memo, obj)) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3133 if (memo_get(self, obj) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3134 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3135 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3136 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3137
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3138 if (type == &PyBytes_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3139 status = save_bytes(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3140 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3141 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3142 else if (type == &PyUnicode_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3143 status = save_unicode(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3144 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3145 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3146 else if (type == &PyDict_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3147 status = save_dict(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3148 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3149 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3150 else if (type == &PyList_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3151 status = save_list(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3152 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3153 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3154 else if (type == &PyTuple_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3155 status = save_tuple(self, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3156 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3157 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3158 else if (type == &PyType_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3159 status = save_global(self, obj, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3160 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3161 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3162 else if (type == &PyFunction_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3163 status = save_global(self, obj, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3164 if (status < 0 && PyErr_ExceptionMatches(PickleError)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3165 /* fall back to reduce */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3166 PyErr_Clear();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3167 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3168 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3169 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3170 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3171 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3172 else if (type == &PyCFunction_Type) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3173 status = save_global(self, obj, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3174 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3175 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3176
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3177 /* XXX: This part needs some unit tests. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3178
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3179 /* Get a reduction callable, and call it. This may come from
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3180 * copyreg.dispatch_table, the object's __reduce_ex__ method,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3181 * or the object's __reduce__ method.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3182 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3183 reduce_func = PyDict_GetItem(dispatch_table, (PyObject *)type);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3184 if (reduce_func != NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3185 /* Here, the reference count of the reduce_func object returned by
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3186 PyDict_GetItem needs to be increased to be consistent with the one
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3187 returned by PyObject_GetAttr. This is allow us to blindly DECREF
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3188 reduce_func at the end of the save() routine.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3189 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3190 Py_INCREF(reduce_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3191 Py_INCREF(obj);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3192 reduce_value = _Pickler_FastCall(self, reduce_func, obj);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3193 }
72639 760ac320fa3d Issue #7689: Allow pickling of dynamically created classes when their Antoine Pitrou <solipsis@pitrou.net> parents: 72457 diff changeset	3194 else if (PyType_IsSubtype(type, &PyType_Type)) {
760ac320fa3d Issue #7689: Allow pickling of dynamically created classes when their Antoine Pitrou <solipsis@pitrou.net> parents: 72457 diff changeset	3195 status = save_global(self, obj, NULL);
760ac320fa3d Issue #7689: Allow pickling of dynamically created classes when their Antoine Pitrou <solipsis@pitrou.net> parents: 72457 diff changeset	3196 goto done;
760ac320fa3d Issue #7689: Allow pickling of dynamically created classes when their Antoine Pitrou <solipsis@pitrou.net> parents: 72457 diff changeset	3197 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3198 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3199 static PyObject *reduce_str = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3200 static PyObject *reduce_ex_str = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3201
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3202 /* Cache the name of the reduce methods. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3203 if (reduce_str == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3204 reduce_str = PyUnicode_InternFromString("__reduce__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3205 if (reduce_str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3206 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3207 reduce_ex_str = PyUnicode_InternFromString("__reduce_ex__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3208 if (reduce_ex_str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3209 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3210 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3211
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3212 /* XXX: If the __reduce__ method is defined, __reduce_ex__ is
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3213 automatically defined as __reduce__. While this is convenient, this
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3214 make it impossible to know which method was actually called. Of
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3215 course, this is not a big deal. But still, it would be nice to let
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3216 the user know which method was called when something go
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3217 wrong. Incidentally, this means if __reduce_ex__ is not defined, we
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3218 don't actually have to check for a __reduce__ method. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3219
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3220 /* Check for a __reduce_ex__ method. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3221 reduce_func = PyObject_GetAttr(obj, reduce_ex_str);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3222 if (reduce_func != NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3223 PyObject *proto;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3224 proto = PyLong_FromLong(self->proto);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3225 if (proto != NULL) {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3226 reduce_value = _Pickler_FastCall(self, reduce_func, proto);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3227 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3228 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3229 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3230 if (PyErr_ExceptionMatches(PyExc_AttributeError))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3231 PyErr_Clear();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3232 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3233 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3234 /* Check for a __reduce__ method. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3235 reduce_func = PyObject_GetAttr(obj, reduce_str);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3236 if (reduce_func != NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3237 reduce_value = PyObject_Call(reduce_func, empty_tuple, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3238 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3239 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3240 PyErr_Format(PicklingError, "can't pickle '%.200s' object: %R",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3241 type->tp_name, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3242 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3243 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3244 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3245 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3246
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3247 if (reduce_value == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3248 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3249
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3250 if (PyUnicode_Check(reduce_value)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3251 status = save_global(self, obj, reduce_value);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3252 goto done;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3253 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3254
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3255 if (!PyTuple_Check(reduce_value)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3256 PyErr_SetString(PicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3257 "__reduce__ must return a string or tuple");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3258 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3259 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3260
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3261 status = save_reduce(self, reduce_value, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3262
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3263 if (0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3264 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3265 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3266 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3267 done:
48462 c5710f0debae Fixed _pickle to use Py_EnterRecursiveCall(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 47670 diff changeset	3268 Py_LeaveRecursiveCall();
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3269 Py_XDECREF(reduce_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3270 Py_XDECREF(reduce_value);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3271
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3272 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3273 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3274
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3275 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3276 dump(PicklerObject self, PyObject obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3277 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3278 const char stop_op = STOP;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3279
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3280 if (self->proto >= 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3281 char header[2];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3282
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3283 header[0] = PROTO;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3284 assert(self->proto >= 0 && self->proto < 256);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3285 header[1] = (unsigned char)self->proto;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3286 if (_Pickler_Write(self, header, 2) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3287 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3288 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3289
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3290 if (save(self, obj, 0) < 0 \|\|
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3291 _Pickler_Write(self, &stop_op, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3292 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3293
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3294 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3295 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3296
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3297 PyDoc_STRVAR(Pickler_clear_memo_doc,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3298 "clear_memo() -> None. Clears the pickler's \"memo\"."
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3299 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3300 "The memo is the data structure that remembers which objects the\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3301 "pickler has already seen, so that shared or recursive objects are\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3302 "pickled by reference and not by value. This method is useful when\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3303 "re-using picklers.");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3304
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3305 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3306 Pickler_clear_memo(PicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3307 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3308 if (self->memo)
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3309 PyMemoTable_Clear(self->memo);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3310
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3311 Py_RETURN_NONE;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3312 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3313
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3314 PyDoc_STRVAR(Pickler_dump_doc,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3315 "dump(obj) -> None. Write a pickled representation of obj to the open file.");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3316
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3317 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3318 Pickler_dump(PicklerObject self, PyObject args)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3319 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3320 PyObject *obj;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3321
49546 bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3322 /* Check whether the Pickler was initialized correctly (issue3664).
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3323 Developers often forget to call __init__() in their subclasses, which
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3324 would trigger a segfault without this check. */
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3325 if (self->write == NULL) {
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3326 PyErr_Format(PicklingError,
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3327 "Pickler.__init__() was not called by %s.__init__()",
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3328 Py_TYPE(self)->tp_name);
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3329 return NULL;
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3330 }
bc1f43252c92 #3664: The pickle module could segfault if a Pickler instance is not correctly initialized: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49149 diff changeset	3331
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3332 if (!PyArg_ParseTuple(args, "O:dump", &obj))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3333 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3334
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3335 if (_Pickler_ClearBuffer(self) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3336 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3337
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3338 if (dump(self, obj) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3339 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3340
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3341 if (_Pickler_FlushToFile(self) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3342 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3343
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3344 Py_RETURN_NONE;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3345 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3346
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3347 static struct PyMethodDef Pickler_methods[] = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3348 {"dump", (PyCFunction)Pickler_dump, METH_VARARGS,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3349 Pickler_dump_doc},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3350 {"clear_memo", (PyCFunction)Pickler_clear_memo, METH_NOARGS,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3351 Pickler_clear_memo_doc},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3352 {NULL, NULL} /* sentinel */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3353 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3354
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3355 static void
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3356 Pickler_dealloc(PicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3357 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3358 PyObject_GC_UnTrack(self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3359
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3360 Py_XDECREF(self->output_buffer);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3361 Py_XDECREF(self->write);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3362 Py_XDECREF(self->pers_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3363 Py_XDECREF(self->arg);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3364 Py_XDECREF(self->fast_memo);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3365
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3366 PyMemoTable_Del(self->memo);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3367
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3368 Py_TYPE(self)->tp_free((PyObject *)self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3369 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3370
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3371 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3372 Pickler_traverse(PicklerObject self, visitproc visit, void arg)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3373 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3374 Py_VISIT(self->write);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3375 Py_VISIT(self->pers_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3376 Py_VISIT(self->arg);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3377 Py_VISIT(self->fast_memo);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3378 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3379 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3380
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3381 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3382 Pickler_clear(PicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3383 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3384 Py_CLEAR(self->output_buffer);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3385 Py_CLEAR(self->write);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3386 Py_CLEAR(self->pers_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3387 Py_CLEAR(self->arg);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3388 Py_CLEAR(self->fast_memo);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3389
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3390 if (self->memo != NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3391 PyMemoTable *memo = self->memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3392 self->memo = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3393 PyMemoTable_Del(memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3394 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3395 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3396 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3397
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3398
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3399 PyDoc_STRVAR(Pickler_doc,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3400 "Pickler(file, protocol=None)"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3401 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3402 "This takes a binary file for writing a pickle data stream.\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3403 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3404 "The optional protocol argument tells the pickler to use the\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3405 "given protocol; supported protocols are 0, 1, 2, 3. The default\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3406 "protocol is 3; a backward-incompatible protocol designed for\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3407 "Python 3.0.\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3408 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3409 "Specifying a negative protocol version selects the highest\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3410 "protocol version supported. The higher the protocol used, the\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3411 "more recent the version of Python needed to read the pickle\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3412 "produced.\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3413 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3414 "The file argument must have a write() method that accepts a single\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3415 "bytes argument. It can thus be a file object opened for binary\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3416 "writing, a io.BytesIO instance, or any other custom object that\n"
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3417 "meets this interface.\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3418 "\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3419 "If fix_imports is True and protocol is less than 3, pickle will try to\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3420 "map the new Python 3.x names to the old module names used in Python\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3421 "2.x, so that the pickle data stream is readable with Python 2.x.\n");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3422
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3423 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3424 Pickler_init(PicklerObject self, PyObject args, PyObject *kwds)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3425 {
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3426 static char *kwlist[] = {"file", "protocol", "fix_imports", 0};
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3427 PyObject *file;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3428 PyObject *proto_obj = NULL;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3429 PyObject *fix_imports = Py_True;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3430
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3431 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|OO:Pickler",
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3432 kwlist, &file, &proto_obj, &fix_imports))
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3433 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3434
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3435 /* In case of multiple __init__() calls, clear previous content. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3436 if (self->write != NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3437 (void)Pickler_clear(self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3438
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3439 if (_Pickler_SetProtocol(self, proto_obj, fix_imports) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3440 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3441
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3442 if (_Pickler_SetOutputStream(self, file) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3443 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3444
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3445 /* memo and output_buffer may have already been created in _Pickler_New */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3446 if (self->memo == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3447 self->memo = PyMemoTable_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3448 if (self->memo == NULL)
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3449 return -1;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3450 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3451 self->output_len = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3452 if (self->output_buffer == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3453 self->max_output_len = WRITE_BUF_SIZE;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3454 self->output_buffer = PyBytes_FromStringAndSize(NULL,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3455 self->max_output_len);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3456 if (self->output_buffer == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3457 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3458 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3459
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3460 self->arg = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3461 self->fast = 0;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3462 self->fast_nesting = 0;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	3463 self->fast_memo = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3464 self->pers_func = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3465 if (PyObject_HasAttrString((PyObject *)self, "persistent_id")) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3466 self->pers_func = PyObject_GetAttrString((PyObject *)self,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3467 "persistent_id");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3468 if (self->pers_func == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3469 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3470 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3471 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3472 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3473
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3474 /* Define a proxy object for the Pickler's internal memo object. This is to
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3475 * avoid breaking code like:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3476 * pickler.memo.clear()
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3477 * and
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3478 * pickler.memo = saved_memo
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3479 * Is this a good idea? Not really, but we don't want to break code that uses
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3480 * it. Note that we don't implement the entire mapping API here. This is
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3481 * intentional, as these should be treated as black-box implementation details.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3482 */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3483
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3484 typedef struct {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3485 PyObject_HEAD
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3486 PicklerObject pickler; / Pickler whose memo table we're proxying. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3487 } PicklerMemoProxyObject;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3488
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3489 PyDoc_STRVAR(pmp_clear_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3490 "memo.clear() -> None. Remove all items from memo.");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3491
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3492 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3493 pmp_clear(PicklerMemoProxyObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3494 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3495 if (self->pickler->memo)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3496 PyMemoTable_Clear(self->pickler->memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3497 Py_RETURN_NONE;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3498 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3499
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3500 PyDoc_STRVAR(pmp_copy_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3501 "memo.copy() -> new_memo. Copy the memo to a new object.");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3502
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3503 static PyObject *
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3504 pmp_copy(PicklerMemoProxyObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3505 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3506 Py_ssize_t i;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3507 PyMemoTable *memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3508 PyObject *new_memo = PyDict_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3509 if (new_memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3510 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3511
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3512 memo = self->pickler->memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3513 for (i = 0; i < memo->mt_allocated; ++i) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3514 PyMemoEntry entry = memo->mt_table[i];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3515 if (entry.me_key != NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3516 int status;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3517 PyObject key, value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3518
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3519 key = PyLong_FromVoidPtr(entry.me_key);
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3520 value = Py_BuildValue("nO", entry.me_value, entry.me_key);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3521
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3522 if (key == NULL \|\| value == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3523 Py_XDECREF(key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3524 Py_XDECREF(value);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3525 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3526 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3527 status = PyDict_SetItem(new_memo, key, value);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3528 Py_DECREF(key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3529 Py_DECREF(value);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3530 if (status < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3531 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3532 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3533 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3534 return new_memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3535
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3536 error:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3537 Py_XDECREF(new_memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3538 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3539 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3540
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3541 PyDoc_STRVAR(pmp_reduce_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3542 "memo.__reduce__(). Pickling support.");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3543
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3544 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3545 pmp_reduce(PicklerMemoProxyObject self, PyObject args)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3546 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3547 PyObject reduce_value, dict_args;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3548 PyObject *contents = pmp_copy(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3549 if (contents == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3550 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3551
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3552 reduce_value = PyTuple_New(2);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3553 if (reduce_value == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3554 Py_DECREF(contents);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3555 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3556 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3557 dict_args = PyTuple_New(1);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3558 if (dict_args == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3559 Py_DECREF(contents);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3560 Py_DECREF(reduce_value);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3561 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3562 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3563 PyTuple_SET_ITEM(dict_args, 0, contents);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3564 Py_INCREF((PyObject *)&PyDict_Type);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3565 PyTuple_SET_ITEM(reduce_value, 0, (PyObject *)&PyDict_Type);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3566 PyTuple_SET_ITEM(reduce_value, 1, dict_args);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3567 return reduce_value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3568 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3569
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3570 static PyMethodDef picklerproxy_methods[] = {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3571 {"clear", (PyCFunction)pmp_clear, METH_NOARGS, pmp_clear_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3572 {"copy", (PyCFunction)pmp_copy, METH_NOARGS, pmp_copy_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3573 {"__reduce__", (PyCFunction)pmp_reduce, METH_VARARGS, pmp_reduce_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3574 {NULL, NULL} /* sentinel */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3575 };
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3576
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3577 static void
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3578 PicklerMemoProxy_dealloc(PicklerMemoProxyObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3579 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3580 PyObject_GC_UnTrack(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3581 Py_XDECREF(self->pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3582 PyObject_GC_Del((PyObject *)self);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3583 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3584
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3585 static int
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3586 PicklerMemoProxy_traverse(PicklerMemoProxyObject *self,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3587 visitproc visit, void *arg)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3588 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3589 Py_VISIT(self->pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3590 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3591 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3592
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3593 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3594 PicklerMemoProxy_clear(PicklerMemoProxyObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3595 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3596 Py_CLEAR(self->pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3597 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3598 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3599
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3600 static PyTypeObject PicklerMemoProxyType = {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3601 PyVarObject_HEAD_INIT(NULL, 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3602 "_pickle.PicklerMemoProxy", /tp_name/
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3603 sizeof(PicklerMemoProxyObject), /tp_basicsize/
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3604 0,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3605 (destructor)PicklerMemoProxy_dealloc, /* tp_dealloc */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3606 0, /* tp_print */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3607 0, /* tp_getattr */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3608 0, /* tp_setattr */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3609 0, /* tp_compare */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3610 0, /* tp_repr */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3611 0, /* tp_as_number */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3612 0, /* tp_as_sequence */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3613 0, /* tp_as_mapping */
65513 5b069892e413 Remove more unneeded casts to hashfunc. Georg Brandl <georg@python.org> parents: 65494 diff changeset	3614 PyObject_HashNotImplemented, /* tp_hash */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3615 0, /* tp_call */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3616 0, /* tp_str */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3617 PyObject_GenericGetAttr, /* tp_getattro */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3618 PyObject_GenericSetAttr, /* tp_setattro */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3619 0, /* tp_as_buffer */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3620 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3621 0, /* tp_doc */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3622 (traverseproc)PicklerMemoProxy_traverse, /* tp_traverse */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3623 (inquiry)PicklerMemoProxy_clear, /* tp_clear */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3624 0, /* tp_richcompare */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3625 0, /* tp_weaklistoffset */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3626 0, /* tp_iter */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3627 0, /* tp_iternext */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3628 picklerproxy_methods, /* tp_methods */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3629 };
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3630
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3631 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3632 PicklerMemoProxy_New(PicklerObject *pickler)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3633 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3634 PicklerMemoProxyObject *self;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3635
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3636 self = PyObject_GC_New(PicklerMemoProxyObject, &PicklerMemoProxyType);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3637 if (self == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3638 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3639 Py_INCREF(pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3640 self->pickler = pickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3641 PyObject_GC_Track(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3642 return (PyObject *)self;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3643 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3644
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3645 /*****************************************************************************/
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3646
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3647 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3648 Pickler_get_memo(PicklerObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3649 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3650 return PicklerMemoProxy_New(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3651 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3652
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3653 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3654 Pickler_set_memo(PicklerObject self, PyObject obj)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3655 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3656 PyMemoTable *new_memo = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3657
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3658 if (obj == NULL) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3659 PyErr_SetString(PyExc_TypeError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3660 "attribute deletion is not supported");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3661 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3662 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3663
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3664 if (Py_TYPE(obj) == &PicklerMemoProxyType) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3665 PicklerObject *pickler =
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3666 ((PicklerMemoProxyObject *)obj)->pickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3667
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3668 new_memo = PyMemoTable_Copy(pickler->memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3669 if (new_memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3670 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3671 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3672 else if (PyDict_Check(obj)) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3673 Py_ssize_t i = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3674 PyObject key, value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3675
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3676 new_memo = PyMemoTable_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3677 if (new_memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3678 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3679
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3680 while (PyDict_Next(obj, &i, &key, &value)) {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3681 Py_ssize_t memo_id;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3682 PyObject *memo_obj;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3683
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3684 if (!PyTuple_Check(value) \|\| Py_SIZE(value) != 2) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3685 PyErr_SetString(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3686 "'memo' values must be 2-item tuples");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3687 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3688 }
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3689 memo_id = PyLong_AsSsize_t(PyTuple_GET_ITEM(value, 0));
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3690 if (memo_id == -1 && PyErr_Occurred())
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3691 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3692 memo_obj = PyTuple_GET_ITEM(value, 1);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3693 if (PyMemoTable_Set(new_memo, memo_obj, memo_id) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3694 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3695 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3696 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3697 else {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3698 PyErr_Format(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3699 "'memo' attribute must be an PicklerMemoProxy object"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3700 "or dict, not %.200s", Py_TYPE(obj)->tp_name);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3701 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3702 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3703
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3704 PyMemoTable_Del(self->memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3705 self->memo = new_memo;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3706
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3707 return 0;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3708
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3709 error:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3710 if (new_memo)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3711 PyMemoTable_Del(new_memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3712 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3713 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3714
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3715 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3716 Pickler_get_persid(PicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3717 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3718 if (self->pers_func == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3719 PyErr_SetString(PyExc_AttributeError, "persistent_id");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3720 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3721 Py_INCREF(self->pers_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3722 return self->pers_func;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3723 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3724
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3725 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3726 Pickler_set_persid(PicklerObject self, PyObject value)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3727 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3728 PyObject *tmp;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3729
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3730 if (value == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3731 PyErr_SetString(PyExc_TypeError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3732 "attribute deletion is not supported");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3733 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3734 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3735 if (!PyCallable_Check(value)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3736 PyErr_SetString(PyExc_TypeError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3737 "persistent_id must be a callable taking one argument");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3738 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3739 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3740
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3741 tmp = self->pers_func;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3742 Py_INCREF(value);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3743 self->pers_func = value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3744 Py_XDECREF(tmp); /* self->pers_func can be NULL, so be careful. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3745
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3746 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3747 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3748
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3749 static PyMemberDef Pickler_members[] = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3750 {"bin", T_INT, offsetof(PicklerObject, bin)},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3751 {"fast", T_INT, offsetof(PicklerObject, fast)},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3752 {NULL}
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3753 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3754
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3755 static PyGetSetDef Pickler_getsets[] = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3756 {"memo", (getter)Pickler_get_memo,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3757 (setter)Pickler_set_memo},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3758 {"persistent_id", (getter)Pickler_get_persid,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3759 (setter)Pickler_set_persid},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3760 {NULL}
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3761 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3762
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3763 static PyTypeObject Pickler_Type = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3764 PyVarObject_HEAD_INIT(NULL, 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3765 "_pickle.Pickler" , /tp_name/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3766 sizeof(PicklerObject), /tp_basicsize/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3767 0, /tp_itemsize/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3768 (destructor)Pickler_dealloc, /tp_dealloc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3769 0, /tp_print/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3770 0, /tp_getattr/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3771 0, /tp_setattr/
51270 debd14c489b9 Issue #1717: rename tp_compare to tp_reserved. I'll change the Mark Dickinson <dickinsm@gmail.com> parents: 51243 diff changeset	3772 0, /tp_reserved/
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3773 0, /tp_repr/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3774 0, /tp_as_number/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3775 0, /tp_as_sequence/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3776 0, /tp_as_mapping/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3777 0, /tp_hash/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3778 0, /tp_call/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3779 0, /tp_str/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3780 0, /tp_getattro/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3781 0, /tp_setattro/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3782 0, /tp_as_buffer/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3783 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3784 Pickler_doc, /tp_doc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3785 (traverseproc)Pickler_traverse, /tp_traverse/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3786 (inquiry)Pickler_clear, /tp_clear/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3787 0, /tp_richcompare/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3788 0, /tp_weaklistoffset/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3789 0, /tp_iter/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3790 0, /tp_iternext/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3791 Pickler_methods, /tp_methods/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3792 Pickler_members, /tp_members/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3793 Pickler_getsets, /tp_getset/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3794 0, /tp_base/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3795 0, /tp_dict/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3796 0, /tp_descr_get/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3797 0, /tp_descr_set/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3798 0, /tp_dictoffset/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3799 (initproc)Pickler_init, /tp_init/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3800 PyType_GenericAlloc, /tp_alloc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3801 PyType_GenericNew, /tp_new/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3802 PyObject_GC_Del, /tp_free/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3803 0, /tp_is_gc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3804 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3805
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3806 /* Temporary helper for calling self.find_class().
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3807
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3808 XXX: It would be nice to able to avoid Python function call overhead, by
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3809 using directly the C version of find_class(), when find_class() is not
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3810 overridden by a subclass. Although, this could become rather hackish. A
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3811 simpler optimization would be to call the C function when self is not a
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3812 subclass instance. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3813 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3814 find_class(UnpicklerObject self, PyObject module_name, PyObject *global_name)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3815 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3816 return PyObject_CallMethod((PyObject *)self, "find_class", "OO",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3817 module_name, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3818 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3819
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3820 static Py_ssize_t
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3821 marker(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3822 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3823 if (self->num_marks < 1) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3824 PyErr_SetString(UnpicklingError, "could not find MARK");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3825 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3826 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3827
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3828 return self->marks[--self->num_marks];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3829 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3830
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3831 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3832 load_none(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3833 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3834 PDATA_APPEND(self->stack, Py_None, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3835 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3836 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3837
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3838 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3839 bad_readline(void)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3840 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3841 PyErr_SetString(UnpicklingError, "pickle data was truncated");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3842 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3843 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3844
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3845 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3846 load_int(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3847 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3848 PyObject *value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3849 char endptr, s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3850 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3851 long x;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3852
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3853 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3854 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3855 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3856 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3857
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3858 errno = 0;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3859 /* XXX: Should the base argument of strtol() be explicitly set to 10?
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3860 XXX(avassalotti): Should this uses PyOS_strtol()? */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3861 x = strtol(s, &endptr, 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3862
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3863 if (errno \|\| (endptr != '\n' && endptr != '\0')) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3864 /* Hm, maybe we've got something long. Let's try reading
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3865 * it as a Python long object. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3866 errno = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3867 /* XXX: Same thing about the base here. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3868 value = PyLong_FromString(s, NULL, 0);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3869 if (value == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3870 PyErr_SetString(PyExc_ValueError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3871 "could not convert string to int");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3872 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3873 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3874 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3875 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3876 if (len == 3 && (x == 0 \|\| x == 1)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3877 if ((value = PyBool_FromLong(x)) == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3878 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3879 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3880 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3881 if ((value = PyLong_FromLong(x)) == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3882 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3883 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3884 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3885
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3886 PDATA_PUSH(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3887 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3888 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3889
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3890 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3891 load_bool(UnpicklerObject self, PyObject boolean)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3892 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3893 assert(boolean == Py_True \|\| boolean == Py_False);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3894 PDATA_APPEND(self->stack, boolean, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3895 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3896 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3897
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3898 /* s contains x bytes of an unsigned little-endian integer. Return its value
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3899 * as a C Py_ssize_t, or -1 if it's higher than PY_SSIZE_T_MAX.
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3900 */
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3901 static Py_ssize_t
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3902 calc_binsize(char *bytes, int size)
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3903 {
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3904 unsigned char s = (unsigned char )bytes;
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3905 size_t x = 0;
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3906
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3907 assert(size == 4);
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3908
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3909 x = (size_t) s[0];
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3910 x \|= (size_t) s[1] << 8;
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3911 x \|= (size_t) s[2] << 16;
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3912 x \|= (size_t) s[3] << 24;
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3913
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3914 if (x > PY_SSIZE_T_MAX)
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3915 return -1;
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3916 else
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3917 return (Py_ssize_t) x;
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3918 }
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	3919
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3920 /* s contains x bytes of a little-endian integer. Return its value as a
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3921 * C int. Obscure: when x is 1 or 2, this is an unsigned little-endian
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3922 * int, but when x is 4 it's a signed one. This is an historical source
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3923 * of x-platform bugs.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3924 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3925 static long
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3926 calc_binint(char *bytes, int size)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3927 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3928 unsigned char s = (unsigned char )bytes;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3929 int i = size;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3930 long x = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3931
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3932 for (i = 0; i < size; i++) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3933 x \|= (long)s[i] << (i * 8);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3934 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3935
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3936 /* Unlike BININT1 and BININT2, BININT (more accurately BININT4)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3937 * is signed, so on a box with longs bigger than 4 bytes we need
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3938 * to extend a BININT's sign bit to the full width.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3939 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3940 if (SIZEOF_LONG > 4 && size == 4) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3941 x \|= -(x & (1L << 31));
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3942 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3943
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3944 return x;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3945 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3946
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3947 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3948 load_binintx(UnpicklerObject self, char s, int size)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3949 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3950 PyObject *value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3951 long x;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3952
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3953 x = calc_binint(s, size);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3954
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3955 if ((value = PyLong_FromLong(x)) == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3956 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3957
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3958 PDATA_PUSH(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3959 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3960 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3961
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3962 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3963 load_binint(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3964 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3965 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3966
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3967 if (_Unpickler_Read(self, &s, 4) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3968 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3969
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3970 return load_binintx(self, s, 4);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3971 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3972
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3973 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3974 load_binint1(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3975 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3976 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3977
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3978 if (_Unpickler_Read(self, &s, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3979 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3980
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3981 return load_binintx(self, s, 1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3982 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3983
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3984 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3985 load_binint2(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3986 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3987 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3988
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	3989 if (_Unpickler_Read(self, &s, 2) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3990 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3991
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3992 return load_binintx(self, s, 2);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3993 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3994
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3995 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3996 load_long(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3997 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	3998 PyObject *value;
50987 04c95fc3765f Remove unnecessary copying in load_long(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 50946 diff changeset	3999 char *s;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4000 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4001
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4002 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4003 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4004 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4005 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4006
50946 a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	4007 /* s[len-2] will usually be 'L' (and s[len-1] is '\n'); we need to remove
a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	4008 the 'L' before calling PyLong_FromString. In order to maintain
a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	4009 compatibility with Python 3.0.0, we don't actually require
a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	4010 the 'L' to be present. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4011 if (s[len-2] == 'L')
50987 04c95fc3765f Remove unnecessary copying in load_long(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 50946 diff changeset	4012 s[len-2] = '\0';
50994 52ff0579a41f Factor common branch in load_long(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 50987 diff changeset	4013 /* XXX: Should the base argument explicitly set to 10? */
52ff0579a41f Factor common branch in load_long(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 50987 diff changeset	4014 value = PyLong_FromString(s, NULL, 0);
50946 a57d10d6bc89 Merged revisions 68814-68815 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50544 diff changeset	4015 if (value == NULL)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4016 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4017
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4018 PDATA_PUSH(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4019 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4020 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4021
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4022 /* 'size' bytes contain the # of bytes of little-endian 256's-complement
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4023 * data following.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4024 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4025 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4026 load_counted_long(UnpicklerObject *self, int size)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4027 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4028 PyObject *value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4029 char *nbytes;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4030 char *pdata;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4031
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4032 assert(size == 1 \|\| size == 4);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4033 if (_Unpickler_Read(self, &nbytes, size) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4034 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4035
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4036 size = calc_binint(nbytes, size);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4037 if (size < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4038 /* Corrupt or hostile pickle -- we never write one like this */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4039 PyErr_SetString(UnpicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4040 "LONG pickle has negative byte count");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4041 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4042 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4043
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4044 if (size == 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4045 value = PyLong_FromLong(0L);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4046 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4047 /* Read the raw little-endian bytes and convert. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4048 if (_Unpickler_Read(self, &pdata, size) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4049 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4050 value = _PyLong_FromByteArray((unsigned char *)pdata, (size_t)size,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4051 1 /* little endian / , 1 / signed */ );
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4052 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4053 if (value == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4054 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4055 PDATA_PUSH(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4056 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4057 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4058
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4059 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4060 load_float(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4061 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4062 PyObject *value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4063 char endptr, s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4064 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4065 double d;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4066
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4067 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4068 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4069 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4070 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4071
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4072 errno = 0;
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53694 diff changeset	4073 d = PyOS_string_to_double(s, &endptr, PyExc_OverflowError);
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53694 diff changeset	4074 if (d == -1.0 && PyErr_Occurred())
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53694 diff changeset	4075 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4076 if ((endptr[0] != '\n') && (endptr[0] != '\0')) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4077 PyErr_SetString(PyExc_ValueError, "could not convert string to float");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4078 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4079 }
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53694 diff changeset	4080 value = PyFloat_FromDouble(d);
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53694 diff changeset	4081 if (value == NULL)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4082 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4083
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4084 PDATA_PUSH(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4085 return 0;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4086 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4087
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4088 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4089 load_binfloat(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4090 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4091 PyObject *value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4092 double x;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4093 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4094
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4095 if (_Unpickler_Read(self, &s, 8) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4096 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4097
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4098 x = _PyFloat_Unpack8((unsigned char *)s, 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4099 if (x == -1.0 && PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4100 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4101
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4102 if ((value = PyFloat_FromDouble(x)) == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4103 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4104
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4105 PDATA_PUSH(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4106 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4107 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4108
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4109 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4110 load_string(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4111 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4112 PyObject *bytes;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4113 PyObject *str = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4114 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4115 char s, p;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4116
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4117 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4118 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4119 if (len < 3)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4120 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4121 if ((s = strdup(s)) == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4122 PyErr_NoMemory();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4123 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4124 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4125
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4126 /* Strip outermost quotes */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4127 while (s[len - 1] <= ' ')
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4128 len--;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4129 if (s[0] == '"' && s[len - 1] == '"') {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4130 s[len - 1] = '\0';
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4131 p = s + 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4132 len -= 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4133 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4134 else if (s[0] == '\'' && s[len - 1] == '\'') {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4135 s[len - 1] = '\0';
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4136 p = s + 1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4137 len -= 2;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4138 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4139 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4140 free(s);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4141 PyErr_SetString(PyExc_ValueError, "insecure string pickle");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4142 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4143 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4144
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4145 /* Use the PyBytes API to decode the string, since that is what is used
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4146 to encode, and then coerce the result to Unicode. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4147 bytes = PyBytes_DecodeEscape(p, len, NULL, 0, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4148 free(s);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4149 if (bytes == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4150 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4151 str = PyUnicode_FromEncodedObject(bytes, self->encoding, self->errors);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4152 Py_DECREF(bytes);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4153 if (str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4154 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4155
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4156 PDATA_PUSH(self->stack, str, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4157 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4158 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4159
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4160 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4161 load_binbytes(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4162 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4163 PyObject *bytes;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4164 Py_ssize_t x;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4165 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4166
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4167 if (_Unpickler_Read(self, &s, 4) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4168 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4169
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4170 x = calc_binsize(s, 4);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4171 if (x < 0) {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4172 PyErr_Format(PyExc_OverflowError,
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4173 "BINBYTES exceeds system's maximum size of %zd bytes",
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4174 PY_SSIZE_T_MAX
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4175 );
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4176 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4177 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4178
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4179 if (_Unpickler_Read(self, &s, x) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4180 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4181 bytes = PyBytes_FromStringAndSize(s, x);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4182 if (bytes == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4183 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4184
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4185 PDATA_PUSH(self->stack, bytes, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4186 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4187 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4188
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4189 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4190 load_short_binbytes(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4191 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4192 PyObject *bytes;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4193 Py_ssize_t x;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4194 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4195
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4196 if (_Unpickler_Read(self, &s, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4197 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4198
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4199 x = (unsigned char)s[0];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4200
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4201 if (_Unpickler_Read(self, &s, x) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4202 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4203
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4204 bytes = PyBytes_FromStringAndSize(s, x);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4205 if (bytes == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4206 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4207
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4208 PDATA_PUSH(self->stack, bytes, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4209 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4210 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4211
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4212 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4213 load_binstring(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4214 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4215 PyObject *str;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4216 Py_ssize_t x;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4217 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4218
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4219 if (_Unpickler_Read(self, &s, 4) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4220 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4221
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4222 x = calc_binint(s, 4);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4223 if (x < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4224 PyErr_SetString(UnpicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4225 "BINSTRING pickle has negative byte count");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4226 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4227 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4228
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4229 if (_Unpickler_Read(self, &s, x) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4230 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4231
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4232 /* Convert Python 2.x strings to unicode. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4233 str = PyUnicode_Decode(s, x, self->encoding, self->errors);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4234 if (str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4235 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4236
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4237 PDATA_PUSH(self->stack, str, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4238 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4239 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4240
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4241 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4242 load_short_binstring(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4243 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4244 PyObject *str;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4245 Py_ssize_t x;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4246 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4247
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4248 if (_Unpickler_Read(self, &s, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4249 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4250
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4251 x = (unsigned char)s[0];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4252
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4253 if (_Unpickler_Read(self, &s, x) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4254 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4255
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4256 /* Convert Python 2.x strings to unicode. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4257 str = PyUnicode_Decode(s, x, self->encoding, self->errors);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4258 if (str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4259 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4260
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4261 PDATA_PUSH(self->stack, str, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4262 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4263 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4264
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4265 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4266 load_unicode(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4267 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4268 PyObject *str;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4269 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4270 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4271
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4272 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4273 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4274 if (len < 1)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4275 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4276
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4277 str = PyUnicode_DecodeRawUnicodeEscape(s, len - 1, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4278 if (str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4279 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4280
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4281 PDATA_PUSH(self->stack, str, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4282 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4283 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4284
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4285 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4286 load_binunicode(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4287 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4288 PyObject *str;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4289 Py_ssize_t size;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4290 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4291
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4292 if (_Unpickler_Read(self, &s, 4) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4293 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4294
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4295 size = calc_binsize(s, 4);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4296 if (size < 0) {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4297 PyErr_Format(PyExc_OverflowError,
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4298 "BINUNICODE exceeds system's maximum size of %zd bytes",
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4299 PY_SSIZE_T_MAX
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4300 );
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4301 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4302 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4303
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4304
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4305 if (_Unpickler_Read(self, &s, size) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4306 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4307
60577 7994269ad3a1 Issue #8383: pickle and pickletools use surrogatepass error handler when Victor Stinner <victor.stinner@haypocalc.com> parents: 58186 diff changeset	4308 str = PyUnicode_DecodeUTF8(s, size, "surrogatepass");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4309 if (str == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4310 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4311
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4312 PDATA_PUSH(self->stack, str, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4313 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4314 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4315
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4316 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4317 load_tuple(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4318 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4319 PyObject *tuple;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4320 Py_ssize_t i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4321
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4322 if ((i = marker(self)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4323 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4324
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4325 tuple = Pdata_poptuple(self->stack, i);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4326 if (tuple == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4327 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4328 PDATA_PUSH(self->stack, tuple, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4329 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4330 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4331
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4332 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4333 load_counted_tuple(UnpicklerObject *self, int len)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4334 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4335 PyObject *tuple;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4336
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4337 tuple = PyTuple_New(len);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4338 if (tuple == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4339 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4340
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4341 while (--len >= 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4342 PyObject *item;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4343
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4344 PDATA_POP(self->stack, item);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4345 if (item == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4346 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4347 PyTuple_SET_ITEM(tuple, len, item);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4348 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4349 PDATA_PUSH(self->stack, tuple, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4350 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4351 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4352
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4353 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4354 load_empty_list(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4355 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4356 PyObject *list;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4357
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4358 if ((list = PyList_New(0)) == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4359 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4360 PDATA_PUSH(self->stack, list, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4361 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4362 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4363
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4364 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4365 load_empty_dict(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4366 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4367 PyObject *dict;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4368
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4369 if ((dict = PyDict_New()) == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4370 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4371 PDATA_PUSH(self->stack, dict, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4372 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4373 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4374
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4375 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4376 load_list(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4377 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4378 PyObject *list;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4379 Py_ssize_t i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4380
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4381 if ((i = marker(self)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4382 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4383
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4384 list = Pdata_poplist(self->stack, i);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4385 if (list == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4386 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4387 PDATA_PUSH(self->stack, list, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4388 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4389 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4390
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4391 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4392 load_dict(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4393 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4394 PyObject dict, key, *value;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4395 Py_ssize_t i, j, k;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4396
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4397 if ((i = marker(self)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4398 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4399 j = Py_SIZE(self->stack);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4400
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4401 if ((dict = PyDict_New()) == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4402 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4403
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4404 for (k = i + 1; k < j; k += 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4405 key = self->stack->data[k - 1];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4406 value = self->stack->data[k];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4407 if (PyDict_SetItem(dict, key, value) < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4408 Py_DECREF(dict);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4409 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4410 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4411 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4412 Pdata_clear(self->stack, i);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4413 PDATA_PUSH(self->stack, dict, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4414 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4415 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4416
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4417 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4418 instantiate(PyObject cls, PyObject args)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4419 {
63061 3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4420 PyObject *result = NULL;
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4421 /* Caller must assure args are a tuple. Normally, args come from
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4422 Pdata_poptuple which packs objects from the top of the stack
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4423 into a newly created tuple. */
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4424 assert(PyTuple_Check(args));
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4425 if (Py_SIZE(args) > 0 \|\| !PyType_Check(cls) \|\|
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4426 PyObject_HasAttrString(cls, "__getinitargs__")) {
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4427 result = PyObject_CallObject(cls, args);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4428 }
63061 3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4429 else {
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4430 result = PyObject_CallMethod(cls, "__new__", "O", cls);
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4431 }
3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4432 return result;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4433 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4434
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4435 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4436 load_obj(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4437 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4438 PyObject cls, args, *obj = NULL;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4439 Py_ssize_t i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4440
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4441 if ((i = marker(self)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4442 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4443
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4444 args = Pdata_poptuple(self->stack, i + 1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4445 if (args == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4446 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4447
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4448 PDATA_POP(self->stack, cls);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4449 if (cls) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4450 obj = instantiate(cls, args);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4451 Py_DECREF(cls);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4452 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4453 Py_DECREF(args);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4454 if (obj == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4455 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4456
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4457 PDATA_PUSH(self->stack, obj, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4458 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4459 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4460
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4461 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4462 load_inst(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4463 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4464 PyObject *cls = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4465 PyObject *args = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4466 PyObject *obj = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4467 PyObject *module_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4468 PyObject *class_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4469 Py_ssize_t len;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4470 Py_ssize_t i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4471 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4472
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4473 if ((i = marker(self)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4474 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4475 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4476 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4477 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4478 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4479
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4480 /* Here it is safe to use PyUnicode_DecodeASCII(), even though non-ASCII
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4481 identifiers are permitted in Python 3.0, since the INST opcode is only
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4482 supported by older protocols on Python 2.x. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4483 module_name = PyUnicode_DecodeASCII(s, len - 1, "strict");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4484 if (module_name == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4485 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4486
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4487 if ((len = _Unpickler_Readline(self, &s)) >= 0) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4488 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4489 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4490 class_name = PyUnicode_DecodeASCII(s, len - 1, "strict");
63061 3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	4491 if (class_name != NULL) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4492 cls = find_class(self, module_name, class_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4493 Py_DECREF(class_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4494 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4495 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4496 Py_DECREF(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4497
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4498 if (cls == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4499 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4500
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4501 if ((args = Pdata_poptuple(self->stack, i)) != NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4502 obj = instantiate(cls, args);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4503 Py_DECREF(args);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4504 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4505 Py_DECREF(cls);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4506
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4507 if (obj == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4508 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4509
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4510 PDATA_PUSH(self->stack, obj, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4511 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4512 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4513
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4514 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4515 load_newobj(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4516 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4517 PyObject *args = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4518 PyObject *clsraw = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4519 PyTypeObject cls; / clsraw cast to its true type */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4520 PyObject *obj;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4521
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4522 /* Stack is ... cls argtuple, and we want to call
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4523 * cls.__new__(cls, *argtuple).
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4524 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4525 PDATA_POP(self->stack, args);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4526 if (args == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4527 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4528 if (!PyTuple_Check(args)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4529 PyErr_SetString(UnpicklingError, "NEWOBJ expected an arg " "tuple.");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4530 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4531 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4532
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4533 PDATA_POP(self->stack, clsraw);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4534 cls = (PyTypeObject *)clsraw;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4535 if (cls == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4536 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4537 if (!PyType_Check(cls)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4538 PyErr_SetString(UnpicklingError, "NEWOBJ class argument "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4539 "isn't a type object");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4540 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4541 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4542 if (cls->tp_new == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4543 PyErr_SetString(UnpicklingError, "NEWOBJ class argument "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4544 "has NULL tp_new");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4545 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4546 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4547
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4548 /* Call __new__. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4549 obj = cls->tp_new(cls, args, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4550 if (obj == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4551 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4552
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4553 Py_DECREF(args);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4554 Py_DECREF(clsraw);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4555 PDATA_PUSH(self->stack, obj, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4556 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4557
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4558 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4559 Py_XDECREF(args);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4560 Py_XDECREF(clsraw);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4561 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4562 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4563
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4564 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4565 load_global(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4566 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4567 PyObject *global = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4568 PyObject *module_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4569 PyObject *global_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4570 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4571 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4572
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4573 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4574 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4575 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4576 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4577 module_name = PyUnicode_DecodeUTF8(s, len - 1, "strict");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4578 if (!module_name)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4579 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4580
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4581 if ((len = _Unpickler_Readline(self, &s)) >= 0) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4582 if (len < 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4583 Py_DECREF(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4584 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4585 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4586 global_name = PyUnicode_DecodeUTF8(s, len - 1, "strict");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4587 if (global_name) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4588 global = find_class(self, module_name, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4589 Py_DECREF(global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4590 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4591 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4592 Py_DECREF(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4593
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4594 if (global == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4595 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4596 PDATA_PUSH(self->stack, global, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4597 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4598 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4599
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4600 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4601 load_persid(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4602 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4603 PyObject *pid;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4604 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4605 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4606
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4607 if (self->pers_func) {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4608 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4609 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4610 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4611 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4612
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4613 pid = PyBytes_FromStringAndSize(s, len - 1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4614 if (pid == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4615 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4616
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4617 /* Ugh... this does not leak since _Unpickler_FastCall() steals the
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4618 reference to pid first. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4619 pid = _Unpickler_FastCall(self, self->pers_func, pid);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4620 if (pid == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4621 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4622
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4623 PDATA_PUSH(self->stack, pid, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4624 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4625 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4626 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4627 PyErr_SetString(UnpicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4628 "A load persistent id instruction was encountered,\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4629 "but no persistent_load function was specified.");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4630 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4631 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4632 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4633
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4634 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4635 load_binpersid(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4636 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4637 PyObject *pid;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4638
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4639 if (self->pers_func) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4640 PDATA_POP(self->stack, pid);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4641 if (pid == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4642 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4643
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4644 /* Ugh... this does not leak since _Unpickler_FastCall() steals the
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4645 reference to pid first. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4646 pid = _Unpickler_FastCall(self, self->pers_func, pid);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4647 if (pid == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4648 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4649
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4650 PDATA_PUSH(self->stack, pid, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4651 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4652 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4653 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4654 PyErr_SetString(UnpicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4655 "A load persistent id instruction was encountered,\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4656 "but no persistent_load function was specified.");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4657 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4658 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4659 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4660
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4661 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4662 load_pop(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4663 {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4664 Py_ssize_t len = Py_SIZE(self->stack);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4665
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4666 /* Note that we split the (pickle.py) stack into two stacks,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4667 * an object stack and a mark stack. We have to be clever and
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4668 * pop the right one. We do this by looking at the top of the
54355 9012ff7d75a2 Merged revisions 72930 via svnmerge from Collin Winter <collinw@gmail.com> parents: 54331 diff changeset	4669 * mark stack first, and only signalling a stack underflow if
9012ff7d75a2 Merged revisions 72930 via svnmerge from Collin Winter <collinw@gmail.com> parents: 54331 diff changeset	4670 * the object stack is empty and the mark stack doesn't match
9012ff7d75a2 Merged revisions 72930 via svnmerge from Collin Winter <collinw@gmail.com> parents: 54331 diff changeset	4671 * our expectations.
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4672 */
54355 9012ff7d75a2 Merged revisions 72930 via svnmerge from Collin Winter <collinw@gmail.com> parents: 54331 diff changeset	4673 if (self->num_marks > 0 && self->marks[self->num_marks - 1] == len) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4674 self->num_marks--;
58186 8903ea6a9e64 Merged revisions 77352-77354 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54584 diff changeset	4675 } else if (len > 0) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4676 len--;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4677 Py_DECREF(self->stack->data[len]);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4678 Py_SIZE(self->stack) = len;
54355 9012ff7d75a2 Merged revisions 72930 via svnmerge from Collin Winter <collinw@gmail.com> parents: 54331 diff changeset	4679 } else {
9012ff7d75a2 Merged revisions 72930 via svnmerge from Collin Winter <collinw@gmail.com> parents: 54331 diff changeset	4680 return stack_underflow();
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4681 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4682 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4683 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4684
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4685 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4686 load_pop_mark(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4687 {
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4688 Py_ssize_t i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4689
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4690 if ((i = marker(self)) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4691 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4692
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4693 Pdata_clear(self->stack, i);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4694
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4695 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4696 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4697
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4698 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4699 load_dup(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4700 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4701 PyObject *last;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4702 Py_ssize_t len;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4703
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4704 if ((len = Py_SIZE(self->stack)) <= 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4705 return stack_underflow();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4706 last = self->stack->data[len - 1];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4707 PDATA_APPEND(self->stack, last, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4708 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4709 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4710
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4711 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4712 load_get(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4713 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4714 PyObject key, value;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4715 Py_ssize_t idx;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4716 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4717 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4718
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4719 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4720 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4721 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4722 return bad_readline();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4723
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4724 key = PyLong_FromString(s, NULL, 10);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4725 if (key == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4726 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4727 idx = PyLong_AsSsize_t(key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4728 if (idx == -1 && PyErr_Occurred()) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4729 Py_DECREF(key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4730 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4731 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4732
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4733 value = _Unpickler_MemoGet(self, idx);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4734 if (value == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4735 if (!PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4736 PyErr_SetObject(PyExc_KeyError, key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4737 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4738 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4739 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4740 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4741
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4742 PDATA_APPEND(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4743 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4744 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4745
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4746 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4747 load_binget(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4748 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4749 PyObject *value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4750 Py_ssize_t idx;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4751 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4752
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4753 if (_Unpickler_Read(self, &s, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4754 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4755
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4756 idx = Py_CHARMASK(s[0]);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4757
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4758 value = _Unpickler_MemoGet(self, idx);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4759 if (value == NULL) {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4760 PyObject *key = PyLong_FromSsize_t(idx);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4761 if (!PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4762 PyErr_SetObject(PyExc_KeyError, key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4763 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4764 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4765 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4766
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4767 PDATA_APPEND(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4768 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4769 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4770
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4771 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4772 load_long_binget(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4773 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4774 PyObject *value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4775 Py_ssize_t idx;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4776 char *s;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4777
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4778 if (_Unpickler_Read(self, &s, 4) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4779 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4780
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4781 idx = calc_binsize(s, 4);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4782
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4783 value = _Unpickler_MemoGet(self, idx);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4784 if (value == NULL) {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4785 PyObject *key = PyLong_FromSsize_t(idx);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4786 if (!PyErr_Occurred())
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4787 PyErr_SetObject(PyExc_KeyError, key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4788 Py_DECREF(key);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4789 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4790 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4791
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4792 PDATA_APPEND(self->stack, value, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4793 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4794 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4795
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4796 /* Push an object from the extension registry (EXT[124]). nbytes is
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4797 * the number of bytes following the opcode, holding the index (code) value.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4798 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4799 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4800 load_extension(UnpicklerObject *self, int nbytes)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4801 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4802 char codebytes; / the nbytes bytes after the opcode */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4803 long code; /* calc_binint returns long */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4804 PyObject py_code; / code as a Python int */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4805 PyObject obj; / the object to push */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4806 PyObject pair; / (module_name, class_name) */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4807 PyObject module_name, class_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4808
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4809 assert(nbytes == 1 \|\| nbytes == 2 \|\| nbytes == 4);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4810 if (_Unpickler_Read(self, &codebytes, nbytes) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4811 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4812 code = calc_binint(codebytes, nbytes);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4813 if (code <= 0) { /* note that 0 is forbidden */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4814 /* Corrupt or hostile pickle. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4815 PyErr_SetString(UnpicklingError, "EXT specifies code <= 0");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4816 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4817 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4818
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4819 /* Look for the code in the cache. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4820 py_code = PyLong_FromLong(code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4821 if (py_code == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4822 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4823 obj = PyDict_GetItem(extension_cache, py_code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4824 if (obj != NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4825 /* Bingo. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4826 Py_DECREF(py_code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4827 PDATA_APPEND(self->stack, obj, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4828 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4829 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4830
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4831 /* Look up the (module_name, class_name) pair. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4832 pair = PyDict_GetItem(inverted_registry, py_code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4833 if (pair == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4834 Py_DECREF(py_code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4835 PyErr_Format(PyExc_ValueError, "unregistered extension "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4836 "code %ld", code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4837 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4838 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4839 /* Since the extension registry is manipulable via Python code,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4840 * confirm that pair is really a 2-tuple of strings.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4841 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4842 if (!PyTuple_Check(pair) \|\| PyTuple_Size(pair) != 2 \|\|
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4843 !PyUnicode_Check(module_name = PyTuple_GET_ITEM(pair, 0)) \|\|
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4844 !PyUnicode_Check(class_name = PyTuple_GET_ITEM(pair, 1))) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4845 Py_DECREF(py_code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4846 PyErr_Format(PyExc_ValueError, "_inverted_registry[%ld] "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4847 "isn't a 2-tuple of strings", code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4848 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4849 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4850 /* Load the object. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4851 obj = find_class(self, module_name, class_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4852 if (obj == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4853 Py_DECREF(py_code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4854 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4855 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4856 /* Cache code -> obj. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4857 code = PyDict_SetItem(extension_cache, py_code, obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4858 Py_DECREF(py_code);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4859 if (code < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4860 Py_DECREF(obj);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4861 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4862 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4863 PDATA_PUSH(self->stack, obj, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4864 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4865 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4866
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4867 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4868 load_put(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4869 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4870 PyObject key, value;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4871 Py_ssize_t idx;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4872 Py_ssize_t len;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4873 char *s;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4874
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4875 if ((len = _Unpickler_Readline(self, &s)) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4876 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4877 if (len < 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4878 return bad_readline();
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4879 if (Py_SIZE(self->stack) <= 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4880 return stack_underflow();
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4881 value = self->stack->data[Py_SIZE(self->stack) - 1];
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4882
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4883 key = PyLong_FromString(s, NULL, 10);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4884 if (key == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4885 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4886 idx = PyLong_AsSsize_t(key);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4887 Py_DECREF(key);
72121 0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4888 if (idx < 0) {
0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4889 if (!PyErr_Occurred())
0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4890 PyErr_SetString(PyExc_ValueError,
0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4891 "negative PUT argument");
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4892 return -1;
72121 0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4893 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4894
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4895 return _Unpickler_MemoPut(self, idx, value);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4896 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4897
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4898 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4899 load_binput(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4900 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4901 PyObject *value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4902 Py_ssize_t idx;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4903 char *s;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4904
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4905 if (_Unpickler_Read(self, &s, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4906 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4907
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4908 if (Py_SIZE(self->stack) <= 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4909 return stack_underflow();
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4910 value = self->stack->data[Py_SIZE(self->stack) - 1];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4911
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4912 idx = Py_CHARMASK(s[0]);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4913
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4914 return _Unpickler_MemoPut(self, idx, value);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4915 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4916
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4917 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4918 load_long_binput(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4919 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4920 PyObject *value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4921 Py_ssize_t idx;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4922 char *s;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4923
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4924 if (_Unpickler_Read(self, &s, 4) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4925 return -1;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4926
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4927 if (Py_SIZE(self->stack) <= 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4928 return stack_underflow();
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4929 value = self->stack->data[Py_SIZE(self->stack) - 1];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4930
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4931 idx = calc_binsize(s, 4);
72121 0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4932 if (idx < 0) {
0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4933 PyErr_SetString(PyExc_ValueError,
0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4934 "negative LONG_BINPUT argument");
0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4935 return -1;
0d9e4ce1c010 Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in Antoine Pitrou <solipsis@pitrou.net> parents: 72119 diff changeset	4936 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4937
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4938 return _Unpickler_MemoPut(self, idx, value);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4939 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4940
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4941 static int
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4942 do_append(UnpicklerObject *self, Py_ssize_t x)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4943 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4944 PyObject *value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4945 PyObject *list;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4946 Py_ssize_t len, i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4947
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4948 len = Py_SIZE(self->stack);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4949 if (x > len \|\| x <= 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4950 return stack_underflow();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4951 if (len == x) /* nothing to do */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4952 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4953
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4954 list = self->stack->data[x - 1];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4955
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4956 if (PyList_Check(list)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4957 PyObject *slice;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4958 Py_ssize_t list_len;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4959 int ret;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4960
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4961 slice = Pdata_poplist(self->stack, x);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4962 if (!slice)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4963 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4964 list_len = PyList_GET_SIZE(list);
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4965 ret = PyList_SetSlice(list, list_len, list_len, slice);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4966 Py_DECREF(slice);
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	4967 return ret;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4968 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4969 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4970 PyObject *append_func;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4971
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4972 append_func = PyObject_GetAttrString(list, "append");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4973 if (append_func == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4974 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4975 for (i = x; i < len; i++) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4976 PyObject *result;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4977
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4978 value = self->stack->data[i];
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4979 result = _Unpickler_FastCall(self, append_func, value);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4980 if (result == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4981 Pdata_clear(self->stack, i + 1);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4982 Py_SIZE(self->stack) = x;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4983 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4984 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4985 Py_DECREF(result);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4986 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4987 Py_SIZE(self->stack) = x;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4988 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4989
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4990 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4991 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4992
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4993 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4994 load_append(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4995 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	4996 return do_append(self, Py_SIZE(self->stack) - 1);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4997 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4998
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	4999 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5000 load_appends(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5001 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5002 return do_append(self, marker(self));
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5003 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5004
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5005 static int
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	5006 do_setitems(UnpicklerObject *self, Py_ssize_t x)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5007 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5008 PyObject value, key;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5009 PyObject *dict;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	5010 Py_ssize_t len, i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5011 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5012
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5013 len = Py_SIZE(self->stack);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5014 if (x > len \|\| x <= 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5015 return stack_underflow();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5016 if (len == x) /* nothing to do */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5017 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5018 if ((len - x) % 2 != 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5019 /* Currupt or hostile pickle -- we never write one like this. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5020 PyErr_SetString(UnpicklingError, "odd number of items for SETITEMS");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5021 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5022 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5023
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5024 /* Here, dict does not actually need to be a PyDict; it could be anything
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5025 that supports the __setitem__ attribute. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5026 dict = self->stack->data[x - 1];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5027
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5028 for (i = x + 1; i < len; i += 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5029 key = self->stack->data[i - 1];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5030 value = self->stack->data[i];
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5031 if (PyObject_SetItem(dict, key, value) < 0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5032 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5033 break;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5034 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5035 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5036
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5037 Pdata_clear(self->stack, x);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5038 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5039 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5040
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5041 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5042 load_setitem(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5043 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5044 return do_setitems(self, Py_SIZE(self->stack) - 2);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5045 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5046
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5047 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5048 load_setitems(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5049 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5050 return do_setitems(self, marker(self));
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5051 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5052
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5053 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5054 load_build(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5055 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5056 PyObject state, inst, *slotstate;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5057 PyObject *setstate;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5058 int status = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5059
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5060 /* Stack is ... instance, state. We want to leave instance at
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5061 * the stack top, possibly mutated via instance.__setstate__(state).
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5062 */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5063 if (Py_SIZE(self->stack) < 2)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5064 return stack_underflow();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5065
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5066 PDATA_POP(self->stack, state);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5067 if (state == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5068 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5069
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5070 inst = self->stack->data[Py_SIZE(self->stack) - 1];
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5071
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5072 setstate = PyObject_GetAttrString(inst, "__setstate__");
48696 e961cc014619 Issue 3514: Fixed segfault dues to infinite loop in __getattr__. Alexandre Vassalotti <alexandre@peadrop.com> parents: 48660 diff changeset	5073 if (setstate == NULL) {
e961cc014619 Issue 3514: Fixed segfault dues to infinite loop in __getattr__. Alexandre Vassalotti <alexandre@peadrop.com> parents: 48660 diff changeset	5074 if (PyErr_ExceptionMatches(PyExc_AttributeError))
e961cc014619 Issue 3514: Fixed segfault dues to infinite loop in __getattr__. Alexandre Vassalotti <alexandre@peadrop.com> parents: 48660 diff changeset	5075 PyErr_Clear();
49023 fdd93bfa6c1b Issue #3660 (part of): fix a memory leak in _pickle. Antoine Pitrou <solipsis@pitrou.net> parents: 48862 diff changeset	5076 else {
fdd93bfa6c1b Issue #3660 (part of): fix a memory leak in _pickle. Antoine Pitrou <solipsis@pitrou.net> parents: 48862 diff changeset	5077 Py_DECREF(state);
48696 e961cc014619 Issue 3514: Fixed segfault dues to infinite loop in __getattr__. Alexandre Vassalotti <alexandre@peadrop.com> parents: 48660 diff changeset	5078 return -1;
49023 fdd93bfa6c1b Issue #3660 (part of): fix a memory leak in _pickle. Antoine Pitrou <solipsis@pitrou.net> parents: 48862 diff changeset	5079 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5080 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5081 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5082 PyObject *result;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5083
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5084 /* The explicit __setstate__ is responsible for everything. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5085 /* Ugh... this does not leak since _Unpickler_FastCall() steals the
49023 fdd93bfa6c1b Issue #3660 (part of): fix a memory leak in _pickle. Antoine Pitrou <solipsis@pitrou.net> parents: 48862 diff changeset	5086 reference to state first. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5087 result = _Unpickler_FastCall(self, setstate, state);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5088 Py_DECREF(setstate);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5089 if (result == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5090 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5091 Py_DECREF(result);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5092 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5093 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5094
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5095 /* A default __setstate__. First see whether state embeds a
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5096 * slot state dict too (a proto 2 addition).
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5097 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5098 if (PyTuple_Check(state) && Py_SIZE(state) == 2) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5099 PyObject *tmp = state;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5100
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5101 state = PyTuple_GET_ITEM(tmp, 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5102 slotstate = PyTuple_GET_ITEM(tmp, 1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5103 Py_INCREF(state);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5104 Py_INCREF(slotstate);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5105 Py_DECREF(tmp);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5106 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5107 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5108 slotstate = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5109
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5110 /* Set inst.__dict__ from the state dict (if any). */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5111 if (state != Py_None) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5112 PyObject *dict;
53694 64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5113 PyObject d_key, d_value;
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5114 Py_ssize_t i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5115
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5116 if (!PyDict_Check(state)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5117 PyErr_SetString(UnpicklingError, "state is not a dictionary");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5118 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5119 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5120 dict = PyObject_GetAttrString(inst, "__dict__");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5121 if (dict == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5122 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5123
53694 64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5124 i = 0;
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5125 while (PyDict_Next(state, &i, &d_key, &d_value)) {
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5126 /* normally the keys for instance attributes are
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5127 interned. we should try to do that here. */
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5128 Py_INCREF(d_key);
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5129 if (PyUnicode_CheckExact(d_key))
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5130 PyUnicode_InternInPlace(&d_key);
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5131 if (PyObject_SetItem(dict, d_key, d_value) < 0) {
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5132 Py_DECREF(d_key);
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5133 goto error;
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5134 }
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5135 Py_DECREF(d_key);
64d9a9e7f68e Merged revisions 72223 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53192 diff changeset	5136 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5137 Py_DECREF(dict);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5138 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5139
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5140 /* Also set instance attributes from the slotstate dict (if any). */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5141 if (slotstate != NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5142 PyObject d_key, d_value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5143 Py_ssize_t i;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5144
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5145 if (!PyDict_Check(slotstate)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5146 PyErr_SetString(UnpicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5147 "slot state is not a dictionary");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5148 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5149 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5150 i = 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5151 while (PyDict_Next(slotstate, &i, &d_key, &d_value)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5152 if (PyObject_SetAttr(inst, d_key, d_value) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5153 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5154 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5155 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5156
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5157 if (0) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5158 error:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5159 status = -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5160 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5161
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5162 Py_DECREF(state);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5163 Py_XDECREF(slotstate);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5164 return status;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5165 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5166
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5167 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5168 load_mark(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5169 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5170
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5171 /* Note that we split the (pickle.py) stack into two stacks, an
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5172 * object stack and a mark stack. Here we push a mark onto the
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5173 * mark stack.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5174 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5175
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5176 if ((self->num_marks + 1) >= self->marks_size) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5177 size_t alloc;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	5178 Py_ssize_t *marks;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5179
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5180 /* Use the size_t type to check for overflow. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5181 alloc = ((size_t)self->num_marks << 1) + 20;
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	5182 if (alloc > (PY_SSIZE_T_MAX / sizeof(Py_ssize_t)) \|\|
47670 13071add8f48 Fixed compiler warnings on MSVC9.0 Alexandre Vassalotti <alexandre@peadrop.com> parents: 47645 diff changeset	5183 alloc <= ((size_t)self->num_marks + 1)) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5184 PyErr_NoMemory();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5185 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5186 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5187
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5188 if (self->marks == NULL)
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	5189 marks = (Py_ssize_t ) PyMem_Malloc(alloc sizeof(Py_ssize_t));
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5190 else
72119 babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	5191 marks = (Py_ssize_t *) PyMem_Realloc(self->marks,
babc90f3cbf4 Issue #11564: Avoid crashes when trying to pickle huge objects or containers Antoine Pitrou <solipsis@pitrou.net> parents: 71817 diff changeset	5192 alloc * sizeof(Py_ssize_t));
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5193 if (marks == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5194 PyErr_NoMemory();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5195 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5196 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5197 self->marks = marks;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5198 self->marks_size = (Py_ssize_t)alloc;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5199 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5200
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5201 self->marks[self->num_marks++] = Py_SIZE(self->stack);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5202
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5203 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5204 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5205
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5206 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5207 load_reduce(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5208 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5209 PyObject *callable = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5210 PyObject *argtup = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5211 PyObject *obj = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5212
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5213 PDATA_POP(self->stack, argtup);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5214 if (argtup == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5215 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5216 PDATA_POP(self->stack, callable);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5217 if (callable) {
63061 3c78b3cfd462 Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 60577 diff changeset	5218 obj = PyObject_CallObject(callable, argtup);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5219 Py_DECREF(callable);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5220 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5221 Py_DECREF(argtup);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5222
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5223 if (obj == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5224 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5225
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5226 PDATA_PUSH(self->stack, obj, -1);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5227 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5228 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5229
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5230 /* Just raises an error if we don't know the protocol specified. PROTO
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5231 * is the first opcode for protocols >= 2.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5232 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5233 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5234 load_proto(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5235 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5236 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5237 int i;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5238
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5239 if (_Unpickler_Read(self, &s, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5240 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5241
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5242 i = (unsigned char)s[0];
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5243 if (i <= HIGHEST_PROTOCOL) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5244 self->proto = i;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5245 return 0;
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5246 }
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5247
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5248 PyErr_Format(PyExc_ValueError, "unsupported pickle protocol: %d", i);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5249 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5250 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5251
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5252 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5253 load(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5254 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5255 PyObject *err;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5256 PyObject *value = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5257 char *s;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5258
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5259 self->num_marks = 0;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5260 if (Py_SIZE(self->stack))
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5261 Pdata_clear(self->stack, 0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5262
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5263 /* Convenient macros for the dispatch while-switch loop just below. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5264 #define OP(opcode, load_func) \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5265 case opcode: if (load_func(self) < 0) break; continue;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5266
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5267 #define OP_ARG(opcode, load_func, arg) \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5268 case opcode: if (load_func(self, (arg)) < 0) break; continue;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5269
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5270 while (1) {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5271 if (_Unpickler_Read(self, &s, 1) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5272 break;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5273
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5274 switch ((enum opcode)s[0]) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5275 OP(NONE, load_none)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5276 OP(BININT, load_binint)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5277 OP(BININT1, load_binint1)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5278 OP(BININT2, load_binint2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5279 OP(INT, load_int)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5280 OP(LONG, load_long)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5281 OP_ARG(LONG1, load_counted_long, 1)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5282 OP_ARG(LONG4, load_counted_long, 4)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5283 OP(FLOAT, load_float)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5284 OP(BINFLOAT, load_binfloat)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5285 OP(BINBYTES, load_binbytes)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5286 OP(SHORT_BINBYTES, load_short_binbytes)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5287 OP(BINSTRING, load_binstring)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5288 OP(SHORT_BINSTRING, load_short_binstring)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5289 OP(STRING, load_string)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5290 OP(UNICODE, load_unicode)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5291 OP(BINUNICODE, load_binunicode)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5292 OP_ARG(EMPTY_TUPLE, load_counted_tuple, 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5293 OP_ARG(TUPLE1, load_counted_tuple, 1)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5294 OP_ARG(TUPLE2, load_counted_tuple, 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5295 OP_ARG(TUPLE3, load_counted_tuple, 3)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5296 OP(TUPLE, load_tuple)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5297 OP(EMPTY_LIST, load_empty_list)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5298 OP(LIST, load_list)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5299 OP(EMPTY_DICT, load_empty_dict)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5300 OP(DICT, load_dict)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5301 OP(OBJ, load_obj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5302 OP(INST, load_inst)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5303 OP(NEWOBJ, load_newobj)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5304 OP(GLOBAL, load_global)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5305 OP(APPEND, load_append)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5306 OP(APPENDS, load_appends)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5307 OP(BUILD, load_build)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5308 OP(DUP, load_dup)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5309 OP(BINGET, load_binget)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5310 OP(LONG_BINGET, load_long_binget)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5311 OP(GET, load_get)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5312 OP(MARK, load_mark)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5313 OP(BINPUT, load_binput)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5314 OP(LONG_BINPUT, load_long_binput)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5315 OP(PUT, load_put)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5316 OP(POP, load_pop)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5317 OP(POP_MARK, load_pop_mark)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5318 OP(SETITEM, load_setitem)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5319 OP(SETITEMS, load_setitems)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5320 OP(PERSID, load_persid)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5321 OP(BINPERSID, load_binpersid)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5322 OP(REDUCE, load_reduce)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5323 OP(PROTO, load_proto)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5324 OP_ARG(EXT1, load_extension, 1)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5325 OP_ARG(EXT2, load_extension, 2)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5326 OP_ARG(EXT4, load_extension, 4)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5327 OP_ARG(NEWTRUE, load_bool, Py_True)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5328 OP_ARG(NEWFALSE, load_bool, Py_False)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5329
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5330 case STOP:
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5331 break;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5332
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5333 default:
72457 db8027df8458 fix compiler compliant about \0 not being an opcode Benjamin Peterson <benjamin@python.org> parents: 72121 diff changeset	5334 if (s[0] == '\0')
db8027df8458 fix compiler compliant about \0 not being an opcode Benjamin Peterson <benjamin@python.org> parents: 72121 diff changeset	5335 PyErr_SetNone(PyExc_EOFError);
db8027df8458 fix compiler compliant about \0 not being an opcode Benjamin Peterson <benjamin@python.org> parents: 72121 diff changeset	5336 else
db8027df8458 fix compiler compliant about \0 not being an opcode Benjamin Peterson <benjamin@python.org> parents: 72121 diff changeset	5337 PyErr_Format(UnpicklingError,
db8027df8458 fix compiler compliant about \0 not being an opcode Benjamin Peterson <benjamin@python.org> parents: 72121 diff changeset	5338 "invalid load key, '%c'.", s[0]);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5339 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5340 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5341
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5342 break; /* and we are done! */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5343 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5344
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	5345 if (_Unpickler_SkipConsumed(self) < 0)
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	5346 return NULL;
4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	5347
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5348 /* XXX: It is not clear what this is actually for. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5349 if ((err = PyErr_Occurred())) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5350 if (err == PyExc_EOFError) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5351 PyErr_SetNone(PyExc_EOFError);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5352 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5353 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5354 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5355
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5356 PDATA_POP(self->stack, value);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5357 return value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5358 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5359
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5360 PyDoc_STRVAR(Unpickler_load_doc,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5361 "load() -> object. Load a pickle."
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5362 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5363 "Read a pickled object representation from the open file object given in\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5364 "the constructor, and return the reconstituted object hierarchy specified\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5365 "therein.\n");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5366
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5367 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5368 Unpickler_load(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5369 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5370 /* Check whether the Unpickler was initialized correctly. This prevents
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5371 segfaulting if a subclass overridden __init__ with a function that does
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5372 not call Unpickler.__init__(). Here, we simply ensure that self->read
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5373 is not NULL. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5374 if (self->read == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5375 PyErr_Format(UnpicklingError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5376 "Unpickler.__init__() was not called by %s.__init__()",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5377 Py_TYPE(self)->tp_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5378 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5379 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5380
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5381 return load(self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5382 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5383
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5384 /* The name of find_class() is misleading. In newer pickle protocols, this
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5385 function is used for loading any global (i.e., functions), not just
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5386 classes. The name is kept only for backward compatibility. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5387
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5388 PyDoc_STRVAR(Unpickler_find_class_doc,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5389 "find_class(module_name, global_name) -> object.\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5390 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5391 "Return an object from a specified module, importing the module if\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5392 "necessary. Subclasses may override this method (e.g. to restrict\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5393 "unpickling of arbitrary classes and functions).\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5394 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5395 "This method is called whenever a class or a function object is\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5396 "needed. Both arguments passed are str objects.\n");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5397
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5398 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5399 Unpickler_find_class(UnpicklerObject self, PyObject args)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5400 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5401 PyObject *global;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5402 PyObject *modules_dict;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5403 PyObject *module;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5404 PyObject module_name, global_name;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5405
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5406 if (!PyArg_UnpackTuple(args, "find_class", 2, 2,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5407 &module_name, &global_name))
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5408 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5409
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5410 /* Try to map the old names used in Python 2.x to the new ones used in
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5411 Python 3.x. We do this only with old pickle protocols and when the
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5412 user has not disabled the feature. */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5413 if (self->proto < 3 && self->fix_imports) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5414 PyObject *key;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5415 PyObject *item;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5416
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5417 /* Check if the global (i.e., a function or a class) was renamed
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5418 or moved to another module. */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5419 key = PyTuple_Pack(2, module_name, global_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5420 if (key == NULL)
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5421 return NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5422 item = PyDict_GetItemWithError(name_mapping_2to3, key);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5423 Py_DECREF(key);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5424 if (item) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5425 if (!PyTuple_Check(item) \|\| PyTuple_GET_SIZE(item) != 2) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5426 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5427 "_compat_pickle.NAME_MAPPING values should be "
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5428 "2-tuples, not %.200s", Py_TYPE(item)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5429 return NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5430 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5431 module_name = PyTuple_GET_ITEM(item, 0);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5432 global_name = PyTuple_GET_ITEM(item, 1);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5433 if (!PyUnicode_Check(module_name) \|\|
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5434 !PyUnicode_Check(global_name)) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5435 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5436 "_compat_pickle.NAME_MAPPING values should be "
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5437 "pairs of str, not (%.200s, %.200s)",
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5438 Py_TYPE(module_name)->tp_name,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5439 Py_TYPE(global_name)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5440 return NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5441 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5442 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5443 else if (PyErr_Occurred()) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5444 return NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5445 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5446
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5447 /* Check if the module was renamed. */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5448 item = PyDict_GetItemWithError(import_mapping_2to3, module_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5449 if (item) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5450 if (!PyUnicode_Check(item)) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5451 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5452 "_compat_pickle.IMPORT_MAPPING values should be "
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5453 "strings, not %.200s", Py_TYPE(item)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5454 return NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5455 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5456 module_name = item;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5457 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5458 else if (PyErr_Occurred()) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5459 return NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5460 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5461 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5462
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5463 modules_dict = PySys_GetObject("modules");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5464 if (modules_dict == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5465 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5466
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5467 module = PyDict_GetItemWithError(modules_dict, module_name);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5468 if (module == NULL) {
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5469 if (PyErr_Occurred())
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5470 return NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5471 module = PyImport_Import(module_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5472 if (module == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5473 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5474 global = PyObject_GetAttr(module, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5475 Py_DECREF(module);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5476 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5477 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5478 global = PyObject_GetAttr(module, global_name);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5479 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5480 return global;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5481 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5482
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5483 static struct PyMethodDef Unpickler_methods[] = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5484 {"load", (PyCFunction)Unpickler_load, METH_NOARGS,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5485 Unpickler_load_doc},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5486 {"find_class", (PyCFunction)Unpickler_find_class, METH_VARARGS,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5487 Unpickler_find_class_doc},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5488 {NULL, NULL} /* sentinel */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5489 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5490
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5491 static void
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5492 Unpickler_dealloc(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5493 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5494 PyObject_GC_UnTrack((PyObject *)self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5495 Py_XDECREF(self->readline);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5496 Py_XDECREF(self->read);
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	5497 Py_XDECREF(self->peek);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5498 Py_XDECREF(self->stack);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5499 Py_XDECREF(self->pers_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5500 Py_XDECREF(self->arg);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5501 if (self->buffer.buf != NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5502 PyBuffer_Release(&self->buffer);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5503 self->buffer.buf = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5504 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5505
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5506 _Unpickler_MemoCleanup(self);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5507 PyMem_Free(self->marks);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5508 PyMem_Free(self->input_line);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5509 free(self->encoding);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5510 free(self->errors);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5511
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5512 Py_TYPE(self)->tp_free((PyObject *)self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5513 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5514
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5515 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5516 Unpickler_traverse(UnpicklerObject self, visitproc visit, void arg)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5517 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5518 Py_VISIT(self->readline);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5519 Py_VISIT(self->read);
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	5520 Py_VISIT(self->peek);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5521 Py_VISIT(self->stack);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5522 Py_VISIT(self->pers_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5523 Py_VISIT(self->arg);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5524 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5525 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5526
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5527 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5528 Unpickler_clear(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5529 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5530 Py_CLEAR(self->readline);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5531 Py_CLEAR(self->read);
65224 4613e1449000 Issue #3873: Speed up unpickling from file objects which have a peek() Antoine Pitrou <solipsis@pitrou.net> parents: 64588 diff changeset	5532 Py_CLEAR(self->peek);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5533 Py_CLEAR(self->stack);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5534 Py_CLEAR(self->pers_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5535 Py_CLEAR(self->arg);
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5536 if (self->buffer.buf != NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5537 PyBuffer_Release(&self->buffer);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5538 self->buffer.buf = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5539 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5540
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5541 _Unpickler_MemoCleanup(self);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5542 PyMem_Free(self->marks);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5543 self->marks = NULL;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5544 PyMem_Free(self->input_line);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5545 self->input_line = NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5546 free(self->encoding);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5547 self->encoding = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5548 free(self->errors);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5549 self->errors = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5550
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5551 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5552 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5553
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5554 PyDoc_STRVAR(Unpickler_doc,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5555 "Unpickler(file, *, encoding='ASCII', errors='strict')"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5556 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5557 "This takes a binary file for reading a pickle data stream.\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5558 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5559 "The protocol version of the pickle is detected automatically, so no\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5560 "proto argument is needed.\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5561 "\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5562 "The file-like object must have two methods, a read() method\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5563 "that takes an integer argument, and a readline() method that\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5564 "requires no arguments. Both methods should return bytes.\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5565 "Thus file-like object can be a binary file object opened for\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5566 "reading, a BytesIO object, or any other custom object that\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5567 "meets this interface.\n"
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5568 "\n"
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5569 "Optional keyword arguments are fix_imports, encoding and errors,\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5570 "which are used to control compatiblity support for pickle stream\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5571 "generated by Python 2.x. If fix_imports is True, pickle will try to\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5572 "map the old Python 2.x names to the new names used in Python 3.x. The\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5573 "encoding and errors tell pickle how to decode 8-bit string\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5574 "instances pickled by Python 2.x; these default to 'ASCII' and\n"
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5575 "'strict', respectively.\n");
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5576
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5577 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5578 Unpickler_init(UnpicklerObject self, PyObject args, PyObject *kwds)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5579 {
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5580 static char *kwlist[] = {"file", "fix_imports", "encoding", "errors", 0};
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5581 PyObject *file;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5582 PyObject *fix_imports = Py_True;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5583 char *encoding = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5584 char *errors = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5585
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5586 /* XXX: That is an horrible error message. But, I don't know how to do
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5587 better... */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5588 if (Py_SIZE(args) != 1) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5589 PyErr_Format(PyExc_TypeError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5590 "%s takes exactly one positional argument (%zd given)",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5591 Py_TYPE(self)->tp_name, Py_SIZE(args));
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5592 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5593 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5594
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5595 /* Arguments parsing needs to be done in the __init__() method to allow
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5596 subclasses to define their own __init__() method, which may (or may
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5597 not) support Unpickler arguments. However, this means we need to be
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5598 extra careful in the other Unpickler methods, since a subclass could
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5599 forget to call Unpickler.__init__() thus breaking our internal
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5600 invariants. */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5601 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|Oss:Unpickler", kwlist,
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5602 &file, &fix_imports, &encoding, &errors))
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5603 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5604
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5605 /* In case of multiple __init__() calls, clear previous content. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5606 if (self->read != NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5607 (void)Unpickler_clear(self);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5608
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5609 if (_Unpickler_SetInputStream(self, file) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5610 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5611
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5612 if (_Unpickler_SetInputEncoding(self, encoding, errors) < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5613 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5614
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5615 self->fix_imports = PyObject_IsTrue(fix_imports);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5616 if (self->fix_imports == -1)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5617 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5618
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5619 if (PyObject_HasAttrString((PyObject *)self, "persistent_load")) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5620 self->pers_func = PyObject_GetAttrString((PyObject *)self,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5621 "persistent_load");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5622 if (self->pers_func == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5623 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5624 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5625 else {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5626 self->pers_func = NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5627 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5628
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5629 self->stack = (Pdata *)Pdata_New();
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5630 if (self->stack == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5631 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5632
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5633 self->memo_size = 32;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5634 self->memo = _Unpickler_NewMemo(self->memo_size);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5635 if (self->memo == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5636 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5637
52761 cbfbff233ef5 Update a comment about why the __module__ can sometime be NULL. Alexandre Vassalotti <alexandre@peadrop.com> parents: 51270 diff changeset	5638 self->arg = NULL;
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	5639 self->proto = 0;
52761 cbfbff233ef5 Update a comment about why the __module__ can sometime be NULL. Alexandre Vassalotti <alexandre@peadrop.com> parents: 51270 diff changeset	5640
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5641 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5642 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5643
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5644 /* Define a proxy object for the Unpickler's internal memo object. This is to
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5645 * avoid breaking code like:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5646 * unpickler.memo.clear()
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5647 * and
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5648 * unpickler.memo = saved_memo
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5649 * Is this a good idea? Not really, but we don't want to break code that uses
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5650 * it. Note that we don't implement the entire mapping API here. This is
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5651 * intentional, as these should be treated as black-box implementation details.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5652 *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5653 * We do, however, have to implement pickling/unpickling support because of
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5654 * real-world code like cvs2svn.
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5655 */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5656
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5657 typedef struct {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5658 PyObject_HEAD
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5659 UnpicklerObject *unpickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5660 } UnpicklerMemoProxyObject;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5661
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5662 PyDoc_STRVAR(ump_clear_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5663 "memo.clear() -> None. Remove all items from memo.");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5664
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5665 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5666 ump_clear(UnpicklerMemoProxyObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5667 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5668 _Unpickler_MemoCleanup(self->unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5669 self->unpickler->memo = _Unpickler_NewMemo(self->unpickler->memo_size);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5670 if (self->unpickler->memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5671 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5672 Py_RETURN_NONE;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5673 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5674
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5675 PyDoc_STRVAR(ump_copy_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5676 "memo.copy() -> new_memo. Copy the memo to a new object.");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5677
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5678 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5679 ump_copy(UnpicklerMemoProxyObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5680 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5681 Py_ssize_t i;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5682 PyObject *new_memo = PyDict_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5683 if (new_memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5684 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5685
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5686 for (i = 0; i < self->unpickler->memo_size; i++) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5687 int status;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5688 PyObject key, value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5689
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5690 value = self->unpickler->memo[i];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5691 if (value == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5692 continue;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5693
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5694 key = PyLong_FromSsize_t(i);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5695 if (key == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5696 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5697 status = PyDict_SetItem(new_memo, key, value);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5698 Py_DECREF(key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5699 if (status < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5700 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5701 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5702 return new_memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5703
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5704 error:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5705 Py_DECREF(new_memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5706 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5707 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5708
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5709 PyDoc_STRVAR(ump_reduce_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5710 "memo.__reduce__(). Pickling support.");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5711
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5712 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5713 ump_reduce(UnpicklerMemoProxyObject self, PyObject args)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5714 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5715 PyObject *reduce_value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5716 PyObject *constructor_args;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5717 PyObject *contents = ump_copy(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5718 if (contents == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5719 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5720
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5721 reduce_value = PyTuple_New(2);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5722 if (reduce_value == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5723 Py_DECREF(contents);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5724 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5725 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5726 constructor_args = PyTuple_New(1);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5727 if (constructor_args == NULL) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5728 Py_DECREF(contents);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5729 Py_DECREF(reduce_value);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5730 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5731 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5732 PyTuple_SET_ITEM(constructor_args, 0, contents);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5733 Py_INCREF((PyObject *)&PyDict_Type);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5734 PyTuple_SET_ITEM(reduce_value, 0, (PyObject *)&PyDict_Type);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5735 PyTuple_SET_ITEM(reduce_value, 1, constructor_args);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5736 return reduce_value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5737 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5738
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5739 static PyMethodDef unpicklerproxy_methods[] = {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5740 {"clear", (PyCFunction)ump_clear, METH_NOARGS, ump_clear_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5741 {"copy", (PyCFunction)ump_copy, METH_NOARGS, ump_copy_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5742 {"__reduce__", (PyCFunction)ump_reduce, METH_VARARGS, ump_reduce_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5743 {NULL, NULL} /* sentinel */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5744 };
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5745
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5746 static void
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5747 UnpicklerMemoProxy_dealloc(UnpicklerMemoProxyObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5748 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5749 PyObject_GC_UnTrack(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5750 Py_XDECREF(self->unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5751 PyObject_GC_Del((PyObject *)self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5752 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5753
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5754 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5755 UnpicklerMemoProxy_traverse(UnpicklerMemoProxyObject *self,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5756 visitproc visit, void *arg)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5757 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5758 Py_VISIT(self->unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5759 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5760 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5761
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5762 static int
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5763 UnpicklerMemoProxy_clear(UnpicklerMemoProxyObject *self)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5764 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5765 Py_CLEAR(self->unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5766 return 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5767 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5768
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5769 static PyTypeObject UnpicklerMemoProxyType = {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5770 PyVarObject_HEAD_INIT(NULL, 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5771 "_pickle.UnpicklerMemoProxy", /tp_name/
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5772 sizeof(UnpicklerMemoProxyObject), /tp_basicsize/
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5773 0,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5774 (destructor)UnpicklerMemoProxy_dealloc, /* tp_dealloc */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5775 0, /* tp_print */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5776 0, /* tp_getattr */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5777 0, /* tp_setattr */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5778 0, /* tp_compare */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5779 0, /* tp_repr */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5780 0, /* tp_as_number */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5781 0, /* tp_as_sequence */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5782 0, /* tp_as_mapping */
65513 5b069892e413 Remove more unneeded casts to hashfunc. Georg Brandl <georg@python.org> parents: 65494 diff changeset	5783 PyObject_HashNotImplemented, /* tp_hash */
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5784 0, /* tp_call */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5785 0, /* tp_str */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5786 PyObject_GenericGetAttr, /* tp_getattro */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5787 PyObject_GenericSetAttr, /* tp_setattro */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5788 0, /* tp_as_buffer */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5789 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5790 0, /* tp_doc */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5791 (traverseproc)UnpicklerMemoProxy_traverse, /* tp_traverse */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5792 (inquiry)UnpicklerMemoProxy_clear, /* tp_clear */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5793 0, /* tp_richcompare */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5794 0, /* tp_weaklistoffset */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5795 0, /* tp_iter */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5796 0, /* tp_iternext */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5797 unpicklerproxy_methods, /* tp_methods */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5798 };
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5799
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5800 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5801 UnpicklerMemoProxy_New(UnpicklerObject *unpickler)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5802 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5803 UnpicklerMemoProxyObject *self;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5804
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5805 self = PyObject_GC_New(UnpicklerMemoProxyObject,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5806 &UnpicklerMemoProxyType);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5807 if (self == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5808 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5809 Py_INCREF(unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5810 self->unpickler = unpickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5811 PyObject_GC_Track(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5812 return (PyObject *)self;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5813 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5814
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5815 /*****************************************************************************/
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5816
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5817
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5818 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5819 Unpickler_get_memo(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5820 {
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5821 return UnpicklerMemoProxy_New(self);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5822 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5823
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5824 static int
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5825 Unpickler_set_memo(UnpicklerObject self, PyObject obj)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5826 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5827 PyObject **new_memo;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5828 Py_ssize_t new_memo_size = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5829 Py_ssize_t i;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5830
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5831 if (obj == NULL) {
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5832 PyErr_SetString(PyExc_TypeError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5833 "attribute deletion is not supported");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5834 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5835 }
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5836
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5837 if (Py_TYPE(obj) == &UnpicklerMemoProxyType) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5838 UnpicklerObject *unpickler =
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5839 ((UnpicklerMemoProxyObject *)obj)->unpickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5840
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5841 new_memo_size = unpickler->memo_size;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5842 new_memo = _Unpickler_NewMemo(new_memo_size);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5843 if (new_memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5844 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5845
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5846 for (i = 0; i < new_memo_size; i++) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5847 Py_XINCREF(unpickler->memo[i]);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5848 new_memo[i] = unpickler->memo[i];
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5849 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5850 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5851 else if (PyDict_Check(obj)) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5852 Py_ssize_t i = 0;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5853 PyObject key, value;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5854
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5855 new_memo_size = PyDict_Size(obj);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5856 new_memo = _Unpickler_NewMemo(new_memo_size);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5857 if (new_memo == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5858 return -1;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5859
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5860 while (PyDict_Next(obj, &i, &key, &value)) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5861 Py_ssize_t idx;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5862 if (!PyLong_Check(key)) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5863 PyErr_SetString(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5864 "memo key must be integers");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5865 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5866 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5867 idx = PyLong_AsSsize_t(key);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5868 if (idx == -1 && PyErr_Occurred())
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5869 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5870 if (_Unpickler_MemoPut(self, idx, value) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5871 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5872 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5873 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5874 else {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5875 PyErr_Format(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5876 "'memo' attribute must be an UnpicklerMemoProxy object"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5877 "or dict, not %.200s", Py_TYPE(obj)->tp_name);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5878 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5879 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5880
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5881 _Unpickler_MemoCleanup(self);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5882 self->memo_size = new_memo_size;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5883 self->memo = new_memo;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5884
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5885 return 0;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5886
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5887 error:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5888 if (new_memo_size) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5889 i = new_memo_size;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5890 while (--i >= 0) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5891 Py_XDECREF(new_memo[i]);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5892 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5893 PyMem_FREE(new_memo);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5894 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5895 return -1;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5896 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5897
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5898 static PyObject *
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5899 Unpickler_get_persload(UnpicklerObject *self)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5900 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5901 if (self->pers_func == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5902 PyErr_SetString(PyExc_AttributeError, "persistent_load");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5903 else
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5904 Py_INCREF(self->pers_func);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5905 return self->pers_func;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5906 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5907
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5908 static int
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5909 Unpickler_set_persload(UnpicklerObject self, PyObject value)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5910 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5911 PyObject *tmp;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5912
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5913 if (value == NULL) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5914 PyErr_SetString(PyExc_TypeError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5915 "attribute deletion is not supported");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5916 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5917 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5918 if (!PyCallable_Check(value)) {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5919 PyErr_SetString(PyExc_TypeError,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5920 "persistent_load must be a callable taking "
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5921 "one argument");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5922 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5923 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5924
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5925 tmp = self->pers_func;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5926 Py_INCREF(value);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5927 self->pers_func = value;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5928 Py_XDECREF(tmp); /* self->pers_func can be NULL, so be careful. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5929
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5930 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5931 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5932
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5933 static PyGetSetDef Unpickler_getsets[] = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5934 {"memo", (getter)Unpickler_get_memo, (setter)Unpickler_set_memo},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5935 {"persistent_load", (getter)Unpickler_get_persload,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5936 (setter)Unpickler_set_persload},
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5937 {NULL}
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5938 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5939
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5940 static PyTypeObject Unpickler_Type = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5941 PyVarObject_HEAD_INIT(NULL, 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5942 "_pickle.Unpickler", /tp_name/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5943 sizeof(UnpicklerObject), /tp_basicsize/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5944 0, /tp_itemsize/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5945 (destructor)Unpickler_dealloc, /tp_dealloc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5946 0, /tp_print/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5947 0, /tp_getattr/
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5948 0, /tp_setattr/
51270 debd14c489b9 Issue #1717: rename tp_compare to tp_reserved. I'll change the Mark Dickinson <dickinsm@gmail.com> parents: 51243 diff changeset	5949 0, /tp_reserved/
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5950 0, /tp_repr/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5951 0, /tp_as_number/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5952 0, /tp_as_sequence/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5953 0, /tp_as_mapping/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5954 0, /tp_hash/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5955 0, /tp_call/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5956 0, /tp_str/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5957 0, /tp_getattro/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5958 0, /tp_setattro/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5959 0, /tp_as_buffer/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5960 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5961 Unpickler_doc, /tp_doc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5962 (traverseproc)Unpickler_traverse, /tp_traverse/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5963 (inquiry)Unpickler_clear, /tp_clear/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5964 0, /tp_richcompare/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5965 0, /tp_weaklistoffset/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5966 0, /tp_iter/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5967 0, /tp_iternext/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5968 Unpickler_methods, /tp_methods/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5969 0, /tp_members/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5970 Unpickler_getsets, /tp_getset/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5971 0, /tp_base/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5972 0, /tp_dict/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5973 0, /tp_descr_get/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5974 0, /tp_descr_set/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5975 0, /tp_dictoffset/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5976 (initproc)Unpickler_init, /tp_init/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5977 PyType_GenericAlloc, /tp_alloc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5978 PyType_GenericNew, /tp_new/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5979 PyObject_GC_Del, /tp_free/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5980 0, /tp_is_gc/
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5981 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	5982
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5983 PyDoc_STRVAR(pickle_dump_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5984 "dump(obj, file, protocol=None, *, fix_imports=True) -> None\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5985 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5986 "Write a pickled representation of obj to the open file object file. This\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5987 "is equivalent to ``Pickler(file, protocol).dump(obj)``, but may be more\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5988 "efficient.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5989 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5990 "The optional protocol argument tells the pickler to use the given protocol;\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5991 "supported protocols are 0, 1, 2, 3. The default protocol is 3; a\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5992 "backward-incompatible protocol designed for Python 3.0.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5993 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5994 "Specifying a negative protocol version selects the highest protocol version\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5995 "supported. The higher the protocol used, the more recent the version of\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5996 "Python needed to read the pickle produced.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5997 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5998 "The file argument must have a write() method that accepts a single bytes\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	5999 "argument. It can thus be a file object opened for binary writing, a\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6000 "io.BytesIO instance, or any other custom object that meets this interface.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6001 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6002 "If fix_imports is True and protocol is less than 3, pickle will try to\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6003 "map the new Python 3.x names to the old module names used in Python 2.x,\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6004 "so that the pickle data stream is readable with Python 2.x.\n");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6005
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6006 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6007 pickle_dump(PyObject self, PyObject args, PyObject *kwds)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6008 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6009 static char *kwlist[] = {"obj", "file", "protocol", "fix_imports", 0};
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6010 PyObject *obj;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6011 PyObject *file;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6012 PyObject *proto = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6013 PyObject *fix_imports = Py_True;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6014 PicklerObject *pickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6015
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6016 /* fix_imports is a keyword-only argument. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6017 if (Py_SIZE(args) > 3) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6018 PyErr_Format(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6019 "pickle.dump() takes at most 3 positional "
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6020 "argument (%zd given)", Py_SIZE(args));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6021 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6022 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6023
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6024 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO\|OO:dump", kwlist,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6025 &obj, &file, &proto, &fix_imports))
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6026 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6027
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6028 pickler = _Pickler_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6029 if (pickler == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6030 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6031
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6032 if (_Pickler_SetProtocol(pickler, proto, fix_imports) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6033 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6034
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6035 if (_Pickler_SetOutputStream(pickler, file) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6036 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6037
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6038 if (dump(pickler, obj) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6039 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6040
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6041 if (_Pickler_FlushToFile(pickler) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6042 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6043
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6044 Py_DECREF(pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6045 Py_RETURN_NONE;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6046
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6047 error:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6048 Py_XDECREF(pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6049 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6050 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6051
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6052 PyDoc_STRVAR(pickle_dumps_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6053 "dumps(obj, protocol=None, *, fix_imports=True) -> bytes\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6054 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6055 "Return the pickled representation of the object as a bytes\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6056 "object, instead of writing it to a file.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6057 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6058 "The optional protocol argument tells the pickler to use the given protocol;\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6059 "supported protocols are 0, 1, 2, 3. The default protocol is 3; a\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6060 "backward-incompatible protocol designed for Python 3.0.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6061 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6062 "Specifying a negative protocol version selects the highest protocol version\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6063 "supported. The higher the protocol used, the more recent the version of\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6064 "Python needed to read the pickle produced.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6065 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6066 "If fix_imports is True and protocol is less than 3, pickle will try to\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6067 "map the new Python 3.x names to the old module names used in Python 2.x,\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6068 "so that the pickle data stream is readable with Python 2.x.\n");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6069
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6070 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6071 pickle_dumps(PyObject self, PyObject args, PyObject *kwds)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6072 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6073 static char *kwlist[] = {"obj", "protocol", "fix_imports", 0};
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6074 PyObject *obj;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6075 PyObject *proto = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6076 PyObject *result;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6077 PyObject *fix_imports = Py_True;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6078 PicklerObject *pickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6079
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6080 /* fix_imports is a keyword-only argument. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6081 if (Py_SIZE(args) > 2) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6082 PyErr_Format(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6083 "pickle.dumps() takes at most 2 positional "
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6084 "argument (%zd given)", Py_SIZE(args));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6085 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6086 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6087
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6088 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|OO:dumps", kwlist,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6089 &obj, &proto, &fix_imports))
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6090 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6091
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6092 pickler = _Pickler_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6093 if (pickler == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6094 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6095
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6096 if (_Pickler_SetProtocol(pickler, proto, fix_imports) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6097 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6098
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6099 if (dump(pickler, obj) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6100 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6101
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6102 result = _Pickler_GetString(pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6103 Py_DECREF(pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6104 return result;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6105
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6106 error:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6107 Py_XDECREF(pickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6108 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6109 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6110
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6111 PyDoc_STRVAR(pickle_load_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6112 "load(file, *, fix_imports=True, encoding='ASCII', errors='strict') -> object\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6113 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6114 "Read a pickled object representation from the open file object file and\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6115 "return the reconstituted object hierarchy specified therein. This is\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6116 "equivalent to ``Unpickler(file).load()``, but may be more efficient.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6117 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6118 "The protocol version of the pickle is detected automatically, so no protocol\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6119 "argument is needed. Bytes past the pickled object's representation are\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6120 "ignored.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6121 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6122 "The argument file must have two methods, a read() method that takes an\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6123 "integer argument, and a readline() method that requires no arguments. Both\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6124 "methods should return bytes. Thus file can be a binary file object opened\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6125 "for reading, a BytesIO object, or any other custom object that meets this\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6126 "interface.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6127 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6128 "Optional keyword arguments are fix_imports, encoding and errors,\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6129 "which are used to control compatiblity support for pickle stream generated\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6130 "by Python 2.x. If fix_imports is True, pickle will try to map the old\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6131 "Python 2.x names to the new names used in Python 3.x. The encoding and\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6132 "errors tell pickle how to decode 8-bit string instances pickled by Python\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6133 "2.x; these default to 'ASCII' and 'strict', respectively.\n");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6134
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6135 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6136 pickle_load(PyObject self, PyObject args, PyObject *kwds)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6137 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6138 static char *kwlist[] = {"file", "fix_imports", "encoding", "errors", 0};
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6139 PyObject *file;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6140 PyObject *fix_imports = Py_True;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6141 PyObject *result;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6142 char *encoding = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6143 char *errors = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6144 UnpicklerObject *unpickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6145
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6146 /* fix_imports, encoding and errors are a keyword-only argument. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6147 if (Py_SIZE(args) != 1) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6148 PyErr_Format(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6149 "pickle.load() takes exactly one positional "
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6150 "argument (%zd given)", Py_SIZE(args));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6151 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6152 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6153
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6154 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|Oss:load", kwlist,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6155 &file, &fix_imports, &encoding, &errors))
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6156 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6157
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6158 unpickler = _Unpickler_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6159 if (unpickler == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6160 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6161
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6162 if (_Unpickler_SetInputStream(unpickler, file) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6163 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6164
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6165 if (_Unpickler_SetInputEncoding(unpickler, encoding, errors) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6166 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6167
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6168 unpickler->fix_imports = PyObject_IsTrue(fix_imports);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6169 if (unpickler->fix_imports == -1)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6170 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6171
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6172 result = load(unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6173 Py_DECREF(unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6174 return result;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6175
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6176 error:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6177 Py_XDECREF(unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6178 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6179 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6180
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6181 PyDoc_STRVAR(pickle_loads_doc,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6182 "loads(input, *, fix_imports=True, encoding='ASCII', errors='strict') -> object\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6183 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6184 "Read a pickled object hierarchy from a bytes object and return the\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6185 "reconstituted object hierarchy specified therein\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6186 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6187 "The protocol version of the pickle is detected automatically, so no protocol\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6188 "argument is needed. Bytes past the pickled object's representation are\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6189 "ignored.\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6190 "\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6191 "Optional keyword arguments are fix_imports, encoding and errors, which\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6192 "are used to control compatiblity support for pickle stream generated\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6193 "by Python 2.x. If fix_imports is True, pickle will try to map the old\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6194 "Python 2.x names to the new names used in Python 3.x. The encoding and\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6195 "errors tell pickle how to decode 8-bit string instances pickled by Python\n"
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6196 "2.x; these default to 'ASCII' and 'strict', respectively.\n");
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6197
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6198 static PyObject *
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6199 pickle_loads(PyObject self, PyObject args, PyObject *kwds)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6200 {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6201 static char *kwlist[] = {"input", "fix_imports", "encoding", "errors", 0};
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6202 PyObject *input;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6203 PyObject *fix_imports = Py_True;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6204 PyObject *result;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6205 char *encoding = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6206 char *errors = NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6207 UnpicklerObject *unpickler;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6208
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6209 /* fix_imports, encoding and errors are a keyword-only argument. */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6210 if (Py_SIZE(args) != 1) {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6211 PyErr_Format(PyExc_TypeError,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6212 "pickle.loads() takes exactly one positional "
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6213 "argument (%zd given)", Py_SIZE(args));
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6214 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6215 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6216
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6217 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|Oss:loads", kwlist,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6218 &input, &fix_imports, &encoding, &errors))
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6219 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6220
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6221 unpickler = _Unpickler_New();
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6222 if (unpickler == NULL)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6223 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6224
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6225 if (_Unpickler_SetStringInput(unpickler, input) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6226 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6227
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6228 if (_Unpickler_SetInputEncoding(unpickler, encoding, errors) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6229 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6230
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6231 unpickler->fix_imports = PyObject_IsTrue(fix_imports);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6232 if (unpickler->fix_imports == -1)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6233 goto error;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6234
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6235 result = load(unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6236 Py_DECREF(unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6237 return result;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6238
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6239 error:
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6240 Py_XDECREF(unpickler);
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6241 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6242 }
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6243
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6244
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6245 static struct PyMethodDef pickle_methods[] = {
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6246 {"dump", (PyCFunction)pickle_dump, METH_VARARGS\|METH_KEYWORDS,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6247 pickle_dump_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6248 {"dumps", (PyCFunction)pickle_dumps, METH_VARARGS\|METH_KEYWORDS,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6249 pickle_dumps_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6250 {"load", (PyCFunction)pickle_load, METH_VARARGS\|METH_KEYWORDS,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6251 pickle_load_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6252 {"loads", (PyCFunction)pickle_loads, METH_VARARGS\|METH_KEYWORDS,
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6253 pickle_loads_doc},
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6254 {NULL, NULL} /* sentinel */
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6255 };
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6256
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6257 static int
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6258 initmodule(void)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6259 {
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6260 PyObject *copyreg = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6261 PyObject *compat_pickle = NULL;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6262
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6263 /* XXX: We should ensure that the types of the dictionaries imported are
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6264 exactly PyDict objects. Otherwise, it is possible to crash the pickle
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6265 since we use the PyDict API directly to access these dictionaries. */
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6266
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6267 copyreg = PyImport_ImportModule("copyreg");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6268 if (!copyreg)
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6269 goto error;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6270 dispatch_table = PyObject_GetAttrString(copyreg, "dispatch_table");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6271 if (!dispatch_table)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6272 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6273 extension_registry = \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6274 PyObject_GetAttrString(copyreg, "_extension_registry");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6275 if (!extension_registry)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6276 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6277 inverted_registry = PyObject_GetAttrString(copyreg, "_inverted_registry");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6278 if (!inverted_registry)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6279 goto error;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6280 extension_cache = PyObject_GetAttrString(copyreg, "_extension_cache");
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6281 if (!extension_cache)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6282 goto error;
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6283 Py_CLEAR(copyreg);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6284
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6285 /* Load the 2.x -> 3.x stdlib module mapping tables */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6286 compat_pickle = PyImport_ImportModule("_compat_pickle");
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6287 if (!compat_pickle)
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6288 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6289 name_mapping_2to3 = PyObject_GetAttrString(compat_pickle, "NAME_MAPPING");
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6290 if (!name_mapping_2to3)
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6291 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6292 if (!PyDict_CheckExact(name_mapping_2to3)) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6293 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6294 "_compat_pickle.NAME_MAPPING should be a dict, not %.200s",
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6295 Py_TYPE(name_mapping_2to3)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6296 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6297 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6298 import_mapping_2to3 = PyObject_GetAttrString(compat_pickle,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6299 "IMPORT_MAPPING");
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6300 if (!import_mapping_2to3)
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6301 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6302 if (!PyDict_CheckExact(import_mapping_2to3)) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6303 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6304 "_compat_pickle.IMPORT_MAPPING should be a dict, "
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6305 "not %.200s", Py_TYPE(import_mapping_2to3)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6306 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6307 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6308 /* ... and the 3.x -> 2.x mapping tables */
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6309 name_mapping_3to2 = PyObject_GetAttrString(compat_pickle,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6310 "REVERSE_NAME_MAPPING");
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6311 if (!name_mapping_3to2)
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6312 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6313 if (!PyDict_CheckExact(name_mapping_3to2)) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6314 PyErr_Format(PyExc_RuntimeError,
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 67725 diff changeset	6315 "_compat_pickle.REVERSE_NAME_MAPPING should be a dict, "
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6316 "not %.200s", Py_TYPE(name_mapping_3to2)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6317 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6318 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6319 import_mapping_3to2 = PyObject_GetAttrString(compat_pickle,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6320 "REVERSE_IMPORT_MAPPING");
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6321 if (!import_mapping_3to2)
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6322 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6323 if (!PyDict_CheckExact(import_mapping_3to2)) {
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6324 PyErr_Format(PyExc_RuntimeError,
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6325 "_compat_pickle.REVERSE_IMPORT_MAPPING should be a dict, "
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6326 "not %.200s", Py_TYPE(import_mapping_3to2)->tp_name);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6327 goto error;
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6328 }
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6329 Py_CLEAR(compat_pickle);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6330
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6331 empty_tuple = PyTuple_New(0);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6332 if (empty_tuple == NULL)
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6333 goto error;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6334 two_tuple = PyTuple_New(2);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6335 if (two_tuple == NULL)
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6336 goto error;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6337 /* We use this temp container with no regard to refcounts, or to
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6338 * keeping containees alive. Exempt from GC, because we don't
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6339 * want anything looking at two_tuple() by magic.
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6340 */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6341 PyObject_GC_UnTrack(two_tuple);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6342
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6343 return 0;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6344
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6345 error:
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6346 Py_CLEAR(copyreg);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6347 Py_CLEAR(dispatch_table);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6348 Py_CLEAR(extension_registry);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6349 Py_CLEAR(inverted_registry);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6350 Py_CLEAR(extension_cache);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6351 Py_CLEAR(compat_pickle);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6352 Py_CLEAR(name_mapping_2to3);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6353 Py_CLEAR(import_mapping_2to3);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6354 Py_CLEAR(name_mapping_3to2);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6355 Py_CLEAR(import_mapping_3to2);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6356 Py_CLEAR(empty_tuple);
0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6357 Py_CLEAR(two_tuple);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6358 return -1;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6359 }
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6360
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6361 static struct PyModuleDef _picklemodule = {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6362 PyModuleDef_HEAD_INIT,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6363 "_pickle",
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6364 pickle_module_doc,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6365 -1,
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6366 pickle_methods,
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6367 NULL,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6368 NULL,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6369 NULL,
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6370 NULL
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6371 };
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6372
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6373 PyMODINIT_FUNC
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6374 PyInit__pickle(void)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6375 {
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6376 PyObject *m;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6377
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6378 if (PyType_Ready(&Unpickler_Type) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6379 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6380 if (PyType_Ready(&Pickler_Type) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6381 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6382 if (PyType_Ready(&Pdata_Type) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6383 return NULL;
64588 027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6384 if (PyType_Ready(&PicklerMemoProxyType) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6385 return NULL;
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6386 if (PyType_Ready(&UnpicklerMemoProxyType) < 0)
027f81579b4a Issue #9410: Various optimizations to the pickle module, leading to Antoine Pitrou <solipsis@pitrou.net> parents: 64440 diff changeset	6387 return NULL;
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6388
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6389 /* Create the module and add the functions. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6390 m = PyModule_Create(&_picklemodule);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6391 if (m == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6392 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6393
71347 1ae0b7b8de0b Issue #11321: Fix a crash with multiple imports of the _pickle module when Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	6394 Py_INCREF(&Pickler_Type);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6395 if (PyModule_AddObject(m, "Pickler", (PyObject *)&Pickler_Type) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6396 return NULL;
71347 1ae0b7b8de0b Issue #11321: Fix a crash with multiple imports of the _pickle module when Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	6397 Py_INCREF(&Unpickler_Type);
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6398 if (PyModule_AddObject(m, "Unpickler", (PyObject *)&Unpickler_Type) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6399 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6400
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6401 /* Initialize the exceptions. */
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6402 PickleError = PyErr_NewException("_pickle.PickleError", NULL, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6403 if (PickleError == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6404 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6405 PicklingError = \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6406 PyErr_NewException("_pickle.PicklingError", PickleError, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6407 if (PicklingError == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6408 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6409 UnpicklingError = \
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6410 PyErr_NewException("_pickle.UnpicklingError", PickleError, NULL);
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6411 if (UnpicklingError == NULL)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6412 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6413
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6414 if (PyModule_AddObject(m, "PickleError", PickleError) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6415 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6416 if (PyModule_AddObject(m, "PicklingError", PicklingError) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6417 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6418 if (PyModule_AddObject(m, "UnpicklingError", UnpicklingError) < 0)
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6419 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6420
54584 0805ea211122 Issue #6137: The pickle module now translates module names when loading Antoine Pitrou <solipsis@pitrou.net> parents: 54355 diff changeset	6421 if (initmodule() < 0)
47645 0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6422 return NULL;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6423
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6424 return m;
0ae50aa7d97c Restore _pickle module accelerator module. Alexandre Vassalotti <alexandre@peadrop.com> parents: diff changeset	6425 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_pickle.c @ 78069:a8aa77458e12 3.2