Skip to content

Commit f23746a

Browse files
1st11st1
authored
bpo-32436: Implement PEP 567 (#5027)
1 parent 9089a26 commit f23746a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+6269
-120
lines changed

‎Include/Python.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
#include "pyerrors.h"
110110

111111
#include "pystate.h"
112+
#include "context.h"
112113

113114
#include "pyarena.h"
114115
#include "modsupport.h"

‎Include/context.h‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
#ifndef Py_CONTEXT_H
2+
#define Py_CONTEXT_H
3+
#ifdef __cplusplus
4+
extern "C" {
5+
#endif
6+
7+
#ifndef Py_LIMITED_API
8+
9+
10+
PyAPI_DATA(PyTypeObject) PyContext_Type;
11+
typedef struct _pycontextobject PyContext;
12+
13+
PyAPI_DATA(PyTypeObject) PyContextVar_Type;
14+
typedef struct _pycontextvarobject PyContextVar;
15+
16+
PyAPI_DATA(PyTypeObject) PyContextToken_Type;
17+
typedef struct _pycontexttokenobject PyContextToken;
18+
19+
20+
#define PyContext_CheckExact(o) (Py_TYPE(o) == &PyContext_Type)
21+
#define PyContextVar_CheckExact(o) (Py_TYPE(o) == &PyContextVar_Type)
22+
#define PyContextToken_CheckExact(o) (Py_TYPE(o) == &PyContextToken_Type)
23+
24+
25+
PyAPI_FUNC(PyContext *) PyContext_New(void);
26+
PyAPI_FUNC(PyContext *) PyContext_Copy(PyContext *);
27+
PyAPI_FUNC(PyContext *) PyContext_CopyCurrent(void);
28+
29+
PyAPI_FUNC(int) PyContext_Enter(PyContext *);
30+
PyAPI_FUNC(int) PyContext_Exit(PyContext *);
31+
32+
33+
/* Create a new context variable.
34+
35+
default_value can be NULL.
36+
*/
37+
PyAPI_FUNC(PyContextVar *) PyContextVar_New(
38+
const char *name, PyObject *default_value);
39+
40+
41+
/* Get a value for the variable.
42+
43+
Returns -1 if an error occurred during lookup.
44+
45+
Returns 0 if value either was or was not found.
46+
47+
If value was found, *value will point to it.
48+
If not, it will point to:
49+
50+
- default_value, if not NULL;
51+
- the default value of "var", if not NULL;
52+
- NULL.
53+
54+
'*value' will be a new ref, if not NULL.
55+
*/
56+
PyAPI_FUNC(int) PyContextVar_Get(
57+
PyContextVar *var, PyObject *default_value, PyObject **value);
58+
59+
60+
/* Set a new value for the variable.
61+
Returns NULL if an error occurs.
62+
*/
63+
PyAPI_FUNC(PyContextToken *) PyContextVar_Set(
64+
PyContextVar *var, PyObject *value);
65+
66+
67+
/* Reset a variable to its previous value.
68+
Returns 0 on sucess, -1 on error.
69+
*/
70+
PyAPI_FUNC(int) PyContextVar_Reset(
71+
PyContextVar *var, PyContextToken *token);
72+
73+
74+
/* This method is exposed only for CPython tests. Don not use it. */
75+
PyAPI_FUNC(PyObject *) _PyContext_NewHamtForTests(void);
76+
77+
78+
PyAPI_FUNC(int) PyContext_ClearFreeList(void);
79+
80+
81+
#endif /* !Py_LIMITED_API */
82+
83+
#ifdef __cplusplus
84+
}
85+
#endif
86+
#endif /* !Py_CONTEXT_H */

‎Include/internal/context.h‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#ifndef Py_INTERNAL_CONTEXT_H
2+
#define Py_INTERNAL_CONTEXT_H
3+
4+
5+
#include "internal/hamt.h"
6+
7+
8+
struct _pycontextobject {
9+
PyObject_HEAD
10+
PyContext *ctx_prev;
11+
PyHamtObject *ctx_vars;
12+
PyObject *ctx_weakreflist;
13+
int ctx_entered;
14+
};
15+
16+
17+
struct _pycontextvarobject {
18+
PyObject_HEAD
19+
PyObject *var_name;
20+
PyObject *var_default;
21+
PyObject *var_cached;
22+
uint64_t var_cached_tsid;
23+
uint64_t var_cached_tsver;
24+
Py_hash_t var_hash;
25+
};
26+
27+
28+
struct _pycontexttokenobject {
29+
PyObject_HEAD
30+
PyContext *tok_ctx;
31+
PyContextVar *tok_var;
32+
PyObject *tok_oldval;
33+
int tok_used;
34+
};
35+
36+
37+
int _PyContext_Init(void);
38+
void _PyContext_Fini(void);
39+
40+
41+
#endif /* !Py_INTERNAL_CONTEXT_H */

‎Include/internal/hamt.h‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
#ifndef Py_INTERNAL_HAMT_H
2+
#define Py_INTERNAL_HAMT_H
3+
4+
5+
#define _Py_HAMT_MAX_TREE_DEPTH 7
6+
7+
8+
#define PyHamt_Check(o) (Py_TYPE(o) == &_PyHamt_Type)
9+
10+
11+
/* Abstract tree node. */
12+
typedef struct {
13+
PyObject_HEAD
14+
} PyHamtNode;
15+
16+
17+
/* An HAMT immutable mapping collection. */
18+
typedef struct {
19+
PyObject_HEAD
20+
PyHamtNode *h_root;
21+
PyObject *h_weakreflist;
22+
Py_ssize_t h_count;
23+
} PyHamtObject;
24+
25+
26+
/* A struct to hold the state of depth-first traverse of the tree.
27+
28+
HAMT is an immutable collection. Iterators will hold a strong reference
29+
to it, and every node in the HAMT has strong references to its children.
30+
31+
So for iterators, we can implement zero allocations and zero reference
32+
inc/dec depth-first iteration.
33+
34+
- i_nodes: an array of seven pointers to tree nodes
35+
- i_level: the current node in i_nodes
36+
- i_pos: an array of positions within nodes in i_nodes.
37+
*/
38+
typedef struct {
39+
PyHamtNode *i_nodes[_Py_HAMT_MAX_TREE_DEPTH];
40+
Py_ssize_t i_pos[_Py_HAMT_MAX_TREE_DEPTH];
41+
int8_t i_level;
42+
} PyHamtIteratorState;
43+
44+
45+
/* Base iterator object.
46+
47+
Contains the iteration state, a pointer to the HAMT tree,
48+
and a pointer to the 'yield function'. The latter is a simple
49+
function that returns a key/value tuple for the 'Items' iterator,
50+
just a key for the 'Keys' iterator, and a value for the 'Values'
51+
iterator.
52+
*/
53+
typedef struct {
54+
PyObject_HEAD
55+
PyHamtObject *hi_obj;
56+
PyHamtIteratorState hi_iter;
57+
binaryfunc hi_yield;
58+
} PyHamtIterator;
59+
60+
61+
PyAPI_DATA(PyTypeObject) _PyHamt_Type;
62+
PyAPI_DATA(PyTypeObject) _PyHamt_ArrayNode_Type;
63+
PyAPI_DATA(PyTypeObject) _PyHamt_BitmapNode_Type;
64+
PyAPI_DATA(PyTypeObject) _PyHamt_CollisionNode_Type;
65+
PyAPI_DATA(PyTypeObject) _PyHamtKeys_Type;
66+
PyAPI_DATA(PyTypeObject) _PyHamtValues_Type;
67+
PyAPI_DATA(PyTypeObject) _PyHamtItems_Type;
68+
69+
70+
/* Create a new HAMT immutable mapping. */
71+
PyHamtObject * _PyHamt_New(void);
72+
73+
/* Return a new collection based on "o", but with an additional
74+
key/val pair. */
75+
PyHamtObject * _PyHamt_Assoc(PyHamtObject *o, PyObject *key, PyObject *val);
76+
77+
/* Return a new collection based on "o", but without "key". */
78+
PyHamtObject * _PyHamt_Without(PyHamtObject *o, PyObject *key);
79+
80+
/* Find "key" in the "o" collection.
81+
82+
Return:
83+
- -1: An error ocurred.
84+
- 0: "key" wasn't found in "o".
85+
- 1: "key" is in "o"; "*val" is set to its value (a borrowed ref).
86+
*/
87+
int _PyHamt_Find(PyHamtObject *o, PyObject *key, PyObject **val);
88+
89+
/* Check if "v" is equal to "w".
90+
91+
Return:
92+
- 0: v != w
93+
- 1: v == w
94+
- -1: An error occurred.
95+
*/
96+
int _PyHamt_Eq(PyHamtObject *v, PyHamtObject *w);
97+
98+
/* Return the size of "o"; equivalent of "len(o)". */
99+
Py_ssize_t _PyHamt_Len(PyHamtObject *o);
100+
101+
/* Return a Keys iterator over "o". */
102+
PyObject * _PyHamt_NewIterKeys(PyHamtObject *o);
103+
104+
/* Return a Values iterator over "o". */
105+
PyObject * _PyHamt_NewIterValues(PyHamtObject *o);
106+
107+
/* Return a Items iterator over "o". */
108+
PyObject * _PyHamt_NewIterItems(PyHamtObject *o);
109+
110+
int _PyHamt_Init(void);
111+
void _PyHamt_Fini(void);
112+
113+
#endif /* !Py_INTERNAL_HAMT_H */

‎Include/pystate.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ typedef struct _is {
143143
/* AtExit module */
144144
void (*pyexitfunc)(PyObject *);
145145
PyObject *pyexitmodule;
146+
147+
uint64_t tstate_next_unique_id;
146148
} PyInterpreterState;
147149
#endif /* !Py_LIMITED_API */
148150

@@ -270,6 +272,12 @@ typedef struct _ts {
270272
PyObject *async_gen_firstiter;
271273
PyObject *async_gen_finalizer;
272274

275+
PyObject *context;
276+
uint64_t context_ver;
277+
278+
/* Unique thread state id. */
279+
uint64_t id;
280+
273281
/* XXX signal handlers should also be here */
274282

275283
} PyThreadState;

‎Lib/asyncio/base_events.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ def time(self):
489489
"""
490490
return time.monotonic()
491491

492-
def call_later(self, delay, callback, *args):
492+
def call_later(self, delay, callback, *args, context=None):
493493
"""Arrange for a callback to be called at a given time.
494494
495495
Return a Handle: an opaque object with a cancel() method that
@@ -505,12 +505,13 @@ def call_later(self, delay, callback, *args):
505505
Any positional arguments after the callback will be passed to
506506
the callback when it is called.
507507
"""
508-
timer = self.call_at(self.time() + delay, callback, *args)
508+
timer = self.call_at(self.time() + delay, callback, *args,
509+
context=context)
509510
if timer._source_traceback:
510511
del timer._source_traceback[-1]
511512
return timer
512513

513-
def call_at(self, when, callback, *args):
514+
def call_at(self, when, callback, *args, context=None):
514515
"""Like call_later(), but uses an absolute time.
515516
516517
Absolute time corresponds to the event loop's time() method.
@@ -519,14 +520,14 @@ def call_at(self, when, callback, *args):
519520
if self._debug:
520521
self._check_thread()
521522
self._check_callback(callback, 'call_at')
522-
timer = events.TimerHandle(when, callback, args, self)
523+
timer = events.TimerHandle(when, callback, args, self, context)
523524
if timer._source_traceback:
524525
del timer._source_traceback[-1]
525526
heapq.heappush(self._scheduled, timer)
526527
timer._scheduled = True
527528
return timer
528529

529-
def call_soon(self, callback, *args):
530+
def call_soon(self, callback, *args, context=None):
530531
"""Arrange for a callback to be called as soon as possible.
531532
532533
This operates as a FIFO queue: callbacks are called in the
@@ -540,7 +541,7 @@ def call_soon(self, callback, *args):
540541
if self._debug:
541542
self._check_thread()
542543
self._check_callback(callback, 'call_soon')
543-
handle = self._call_soon(callback, args)
544+
handle = self._call_soon(callback, args, context)
544545
if handle._source_traceback:
545546
del handle._source_traceback[-1]
546547
return handle
@@ -555,8 +556,8 @@ def _check_callback(self, callback, method):
555556
f'a callable object was expected by {method}(), '
556557
f'got {callback!r}')
557558

558-
def _call_soon(self, callback, args):
559-
handle = events.Handle(callback, args, self)
559+
def _call_soon(self, callback, args, context):
560+
handle = events.Handle(callback, args, self, context)
560561
if handle._source_traceback:
561562
del handle._source_traceback[-1]
562563
self._ready.append(handle)
@@ -579,12 +580,12 @@ def _check_thread(self):
579580
"Non-thread-safe operation invoked on an event loop other "
580581
"than the current one")
581582

582-
def call_soon_threadsafe(self, callback, *args):
583+
def call_soon_threadsafe(self, callback, *args, context=None):
583584
"""Like call_soon(), but thread-safe."""
584585
self._check_closed()
585586
if self._debug:
586587
self._check_callback(callback, 'call_soon_threadsafe')
587-
handle = self._call_soon(callback, args)
588+
handle = self._call_soon(callback, args, context)
588589
if handle._source_traceback:
589590
del handle._source_traceback[-1]
590591
self._write_to_self()

‎Lib/asyncio/base_futures.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ def format_cb(callback):
4141
return format_helpers._format_callback_source(callback, ())
4242

4343
if size == 1:
44-
cb = format_cb(cb[0])
44+
cb = format_cb(cb[0][0])
4545
elif size == 2:
46-
cb = '{}, {}'.format(format_cb(cb[0]), format_cb(cb[1]))
46+
cb = '{}, {}'.format(format_cb(cb[0][0]), format_cb(cb[1][0]))
4747
elif size > 2:
48-
cb = '{}, <{} more>, {}'.format(format_cb(cb[0]),
48+
cb = '{}, <{} more>, {}'.format(format_cb(cb[0][0]),
4949
size - 2,
50-
format_cb(cb[-1]))
50+
format_cb(cb[-1][0]))
5151
return f'cb=[{cb}]'
5252

5353

0 commit comments

Comments
 (0)