summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-10-06 17:04:12 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-10-06 17:04:12 (GMT)
commitc61c8d7a5e2884238494a678ecd22c812b062280 (patch)
tree3fd366f94e25c5b3d5cc9430f8fc2b7de869e782 /Include
parentc6f0df7b2095eaf0a6d5914a043f9062f66d19f7 (diff)
parenteeb7eea1f95793437b3e251f47c98446e15fa680 (diff)
downloadcpython-c61c8d7a5e2884238494a678ecd22c812b062280.zip
cpython-c61c8d7a5e2884238494a678ecd22c812b062280.tar.gz
cpython-c61c8d7a5e2884238494a678ecd22c812b062280.tar.bz2
Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists.
This introduces a small private API for this common pattern. The issue has been discovered thanks to Martin's huge-mem buildbot.
Diffstat (limited to 'Include')
-rw-r--r--Include/Python.h2
-rw-r--r--Include/accu.h35
2 files changed, 36 insertions, 1 deletions
diff --git a/Include/Python.h b/Include/Python.h
index ae384ee..01b98f9 100644
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -101,7 +101,7 @@
#include "warnings.h"
#include "weakrefobject.h"
#include "structseq.h"
-
+#include "accu.h"
#include "codecs.h"
#include "pyerrors.h"
diff --git a/Include/accu.h b/Include/accu.h
new file mode 100644
index 0000000..9655d37
--- /dev/null
+++ b/Include/accu.h
@@ -0,0 +1,35 @@
+#ifndef Py_LIMITED_API
+#ifndef Py_ACCU_H
+#define Py_ACCU_H
+
+/*** This is a private API for use by the interpreter and the stdlib.
+ *** Its definition may be changed or removed at any moment.
+ ***/
+
+/*
+ * A two-level accumulator of unicode objects that avoids both the overhead
+ * of keeping a huge number of small separate objects, and the quadratic
+ * behaviour of using a naive repeated concatenation scheme.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+ PyObject *large; /* A list of previously accumulated large strings */
+ PyObject *small; /* Pending small strings */
+} _PyAccu;
+
+PyAPI_FUNC(int) _PyAccu_Init(_PyAccu *acc);
+PyAPI_FUNC(int) _PyAccu_Accumulate(_PyAccu *acc, PyObject *unicode);
+PyAPI_FUNC(PyObject *) _PyAccu_FinishAsList(_PyAccu *acc);
+PyAPI_FUNC(PyObject *) _PyAccu_Finish(_PyAccu *acc);
+PyAPI_FUNC(void) _PyAccu_Destroy(_PyAccu *acc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* Py_ACCU_H */
+#endif /* Py_LIMITED_API */