Add the co_extra field and accompanying APIs to code objects.

This completes PEP 523.

diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index a1a1534cf193eeab943d6f9813c815a5b986f684..7ab4c97915f4aabce1b5eee7bcf6616ddf25214e 100644 (file)
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -127,7 +127,8 @@ evaluation, etc.
 
 This API is not part of the limited C API and is marked as private to
 signal that usage of this API is expected to be limited and only
-applicable to very select, low-level use-cases.
+applicable to very select, low-level use-cases. Semantics of the
+API will change with Python as necessary.
 
 .. seealso::
 

diff --git a/Include/ceval.h b/Include/ceval.h
index 7607f75dcabc82fb9d242ce4100fa21f32039a44..81f4bbf4580cd263836a68fcfff142a68a0988f1 100644 (file)
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -187,6 +187,10 @@ PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds);
 PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);
 #endif
 
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc);
+#endif
+
 #define Py_BEGIN_ALLOW_THREADS { \
                         PyThreadState *_save; \
                         _save = PyEval_SaveThread();

diff --git a/Include/code.h b/Include/code.h
index a300ead5ec21af412575d115541e088dbb523986..a054a9226179db2cec9366e6ce2465de32a1323d 100644 (file)
--- a/Include/code.h
+++ b/Include/code.h
@@ -7,6 +7,14 @@
 extern "C" {
 #endif
 
+
+/* Holder for co_extra information */
+typedef struct {
+    Py_ssize_t ce_size;
+    void **ce_extras;
+} _PyCodeObjectExtra;
+
+
 /* Bytecode object */
 typedef struct {
     PyObject_HEAD
@@ -15,6 +23,7 @@ typedef struct {
     int co_nlocals;            /* #local variables */
     int co_stacksize;          /* #entries needed for evaluation stack */
     int co_flags;              /* CO_..., see below */
+    int co_firstlineno;   /* first source line number */
     PyObject *co_code;         /* instruction opcodes */
     PyObject *co_consts;       /* list (constants used) */
     PyObject *co_names;                /* list of strings (names used) */
@@ -30,11 +39,12 @@ typedef struct {
     unsigned char *co_cell2arg; /* Maps cell vars which are arguments. */
     PyObject *co_filename;     /* unicode (where it was loaded from) */
     PyObject *co_name;         /* unicode (name, for reference) */
-    int co_firstlineno;                /* first source line number */
     PyObject *co_lnotab;       /* string (encoding addr<->lineno mapping) See
                                   Objects/lnotab_notes.txt for details. */
     void *co_zombieframe;     /* for optimization only (see frameobject.c) */
     PyObject *co_weakreflist;   /* to support weakrefs to code objects */
+    /* Scratch space for extra data relating to the code object */
+    _PyCodeObjectExtra *co_extra;
 } PyCodeObject;
 
 /* Masks for co_flags above */
@@ -128,6 +138,14 @@ PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj);
 PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts,
                                       PyObject *names, PyObject *lnotab);
 
+
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(int) _PyCode_GetExtra(PyObject *code, Py_ssize_t index,
+                                 void **extra);
+PyAPI_FUNC(int) _PyCode_SetExtra(PyObject *code, Py_ssize_t index,
+                                 void *extra);
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/Include/pystate.h b/Include/pystate.h
index 5a067736e37a5a2f59e640b91b7e3cf2c41a918e..5ab5c985bee97a3df0a58c951d849de1d016c352 100644 (file)
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -8,6 +8,10 @@
 extern "C" {
 #endif
 
+/* This limitation is for performance and simplicity. If needed it can be
+removed (with effort). */
+#define MAX_CO_EXTRA_USERS 255
+
 /* State shared between threads */
 
 struct _ts; /* Forward */
@@ -141,6 +145,9 @@ typedef struct _ts {
     PyObject *coroutine_wrapper;
     int in_coroutine_wrapper;
 
+    Py_ssize_t co_extra_user_count;
+    freefunc co_extra_freefuncs[MAX_CO_EXTRA_USERS];
+
     /* XXX signal handlers should also be here */
 
 } PyThreadState;

diff --git a/Misc/NEWS b/Misc/NEWS
index ef85d1c8efe0bddd78e6161603c9a44ba6bfc416..3dc9693585a6b3ecaa5f8c29b3df367c69ee4714 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,7 +27,7 @@ Core and Builtins
   the braces (where the expressions are). This is a breaking change
   from the 3.6 alpha releases.
 
-- Implement the frame evaluation part of PEP 523.
+- Implement PEP 523.
 
 - Issue #27870: A left shift of zero by a large integer no longer attempts
   to allocate large amounts of memory.

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 78f503439e2294ec22b3f54fa6a01693a6b682f0..98e504a5a92615798a96425d3e670e1ece9acb51 100644 (file)
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -152,6 +152,7 @@ PyCode_New(int argcount, int kwonlyargcount,
     co->co_lnotab = lnotab;
     co->co_zombieframe = NULL;
     co->co_weakreflist = NULL;
+    co->co_extra = NULL;
     return co;
 }
 
@@ -361,6 +362,20 @@ code_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 static void
 code_dealloc(PyCodeObject *co)
 {
+    if (co->co_extra != NULL) {
+        PyThreadState *tstate = PyThreadState_Get();
+
+        for (Py_ssize_t i = 0; i < co->co_extra->ce_size; i++) {
+            freefunc free_extra = tstate->co_extra_freefuncs[i];
+
+            if (free_extra != NULL) {
+                free_extra(co->co_extra->ce_extras[i]);
+            }
+        }
+
+        PyMem_FREE(co->co_extra);
+    }
+
     Py_XDECREF(co->co_code);
     Py_XDECREF(co->co_consts);
     Py_XDECREF(co->co_names);
@@ -752,3 +767,79 @@ _PyCode_CheckLineNumber(PyCodeObject* co, int lasti, PyAddrPair *bounds)
 
     return line;
 }
+
+
+int
+_PyCode_GetExtra(PyObject *code, Py_ssize_t index, void **extra)
+{
+    PyCodeObject *o;
+
+    assert(*extra == NULL);
+
+    if (!PyCode_Check(code)) {
+        PyErr_BadInternalCall();
+        return 1;
+    }
+
+    o = (PyCodeObject*) code;
+
+    if (o->co_extra == NULL || o->co_extra->ce_size <= index) {
+        return 0;
+    }
+
+    *extra = o->co_extra->ce_extras[index];
+    return 0;
+}
+
+
+int
+_PyCode_SetExtra(PyObject *code, Py_ssize_t index, void *extra)
+{
+    PyCodeObject *o;
+    PyThreadState *tstate = PyThreadState_Get();
+
+    if (!PyCode_Check(code) || index < 0 ||
+            index >= tstate->co_extra_user_count) {
+        PyErr_BadInternalCall();
+        return 1;
+    }
+
+    o = (PyCodeObject*) code;
+
+    if (o->co_extra == NULL) {
+        o->co_extra = (_PyCodeObjectExtra*) PyMem_Malloc(
+            sizeof(_PyCodeObjectExtra));
+        if (o->co_extra == NULL) {
+            return 1;
+        }
+
+        o->co_extra->ce_extras = PyMem_Malloc(
+            tstate->co_extra_user_count * sizeof(void*));
+        if (o->co_extra->ce_extras == NULL) {
+            return 1;
+        }
+
+        o->co_extra->ce_size = tstate->co_extra_user_count;
+
+        for (Py_ssize_t i = 0; i < o->co_extra->ce_size; i++) {
+            o->co_extra->ce_extras[i] = NULL;
+        }
+    }
+    else if (o->co_extra->ce_size <= index) {
+        o->co_extra->ce_extras = PyMem_Realloc(
+            o->co_extra->ce_extras, tstate->co_extra_user_count * sizeof(void*));
+
+        if (o->co_extra->ce_extras == NULL) {
+            return 1;
+        }
+
+        o->co_extra->ce_size = tstate->co_extra_user_count;
+
+        for (Py_ssize_t i = o->co_extra->ce_size; i < o->co_extra->ce_size; i++) {
+            o->co_extra->ce_extras[i] = NULL;
+        }
+    }
+
+    o->co_extra->ce_extras[index] = extra;
+    return 0;
+}

diff --git a/Python/ceval.c b/Python/ceval.c
index bf19a5b2b415303f9d9d375cf1002d5c184f5351..9109ea59f2a62a2f3e9882f8de3ea26b3f0bf98f 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5608,3 +5608,17 @@ _Py_GetDXProfile(PyObject *self, PyObject *args)
 }
 
 #endif
+
+Py_ssize_t
+_PyEval_RequestCodeExtraIndex(freefunc free)
+{
+    PyThreadState *tstate = PyThreadState_Get();
+    Py_ssize_t new_index;
+
+    if (tstate->co_extra_user_count == MAX_CO_EXTRA_USERS - 1) {
+        return -1;
+    }
+    new_index = tstate->co_extra_user_count++;
+    tstate->co_extra_freefuncs[new_index] = free;
+    return new_index;
+}

diff --git a/Python/pystate.c b/Python/pystate.c
index 2ab5d5d611692caeeb58d9e25ac25e0907b62fe2..959354d1190856167fb9e84889ccb0c1d36fea45 100644 (file)
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -227,6 +227,7 @@ new_threadstate(PyInterpreterState *interp, int init)
 
         tstate->coroutine_wrapper = NULL;
         tstate->in_coroutine_wrapper = 0;
+        tstate->co_extra_user_count = 0;
 
         if (init)
             _PyThreadState_Init(tstate);