Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

gh-124688: _decimal: Get a module state from ctx objects for performance #124691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 28, 2024
Merged

gh-124688: _decimal: Get a module state from ctx objects for performance #124691

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a9fac1
add a getter function
neonene Sep 27, 2024
818c24f
add _dec_mpd_radix()
neonene Sep 27, 2024
00d2322
PyDecType_New, dec_alloc, dec_from_long
neonene Sep 27, 2024
ab5adad
replace related get_module_state_by_def()
neonene Sep 27, 2024
a34f2d3
delete some spaces
neonene Sep 28, 2024
f7dd655
Update Modules/_decimal/_decimal.c
vstinner Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
replace related get_module_state_by_def()
  • Loading branch information
@neonene
neonene committed Sep 27, 2024
commit ab5adad4f1d40c51d2ec3dc4cb7aae5e9fc3a8d2
58 changes: 29 additions & 29 deletions 58 Modules/_decimal/_decimal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ static int
dec_addstatus(PyObject *context, uint32_t status)
{
mpd_context_t *ctx = CTX(context);
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);

ctx->status |= status;
if (status & (ctx->traps|MPD_Malloc_error)) {
Expand Down Expand Up @@ -870,7 +870,7 @@ static PyObject *
context_getround(PyObject *self, void *Py_UNUSED(closure))
{
int i = mpd_getround(CTX(self));
decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx(self);

return Py_NewRef(state->round_map[i]);
}
Expand Down Expand Up @@ -1029,7 +1029,7 @@ context_setround(PyObject *self, PyObject *value, void *Py_UNUSED(closure))
mpd_context_t *ctx;
int x;

decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx(self);
x = getround(state, value);
if (x == -1) {
return -1;
Expand Down Expand Up @@ -1088,7 +1088,7 @@ context_settraps_list(PyObject *self, PyObject *value)
{
mpd_context_t *ctx;
uint32_t flags;
decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx(self);
flags = list_as_flags(state, value);
if (flags & DEC_ERRORS) {
return -1;
Expand All @@ -1108,7 +1108,7 @@ context_settraps_dict(PyObject *self, PyObject *value)
mpd_context_t *ctx;
uint32_t flags;

decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx(self);
if (PyDecSignalDict_Check(state, value)) {
flags = SdFlags(value);
}
Expand Down Expand Up @@ -1153,7 +1153,7 @@ context_setstatus_list(PyObject *self, PyObject *value)
{
mpd_context_t *ctx;
uint32_t flags;
decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx(self);

flags = list_as_flags(state, value);
if (flags & DEC_ERRORS) {
Expand All @@ -1174,7 +1174,7 @@ context_setstatus_dict(PyObject *self, PyObject *value)
mpd_context_t *ctx;
uint32_t flags;

decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx(self);
if (PyDecSignalDict_Check(state, value)) {
flags = SdFlags(value);
}
Expand Down Expand Up @@ -1482,7 +1482,7 @@ context_repr(PyDecContextObject *self)
int n, mem;

#ifdef Py_DEBUG
decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx((PyObject *)self);
assert(PyDecContext_Check(state, self));
#endif
ctx = CTX(self);
Expand Down Expand Up @@ -1573,7 +1573,7 @@ context_copy(PyObject *self, PyObject *Py_UNUSED(dummy))
{
PyObject *copy;

decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx(self);
copy = PyObject_CallObject((PyObject *)state->PyDecContext_Type, NULL);
if (copy == NULL) {
return NULL;
Expand All @@ -1593,7 +1593,7 @@ context_reduce(PyObject *self, PyObject *Py_UNUSED(dummy))
PyObject *traps;
PyObject *ret;
mpd_context_t *ctx;
decimal_state *state = get_module_state_by_def(Py_TYPE(self));
decimal_state *state = get_module_state_from_ctx(self);

ctx = CTX(self);

Expand Down Expand Up @@ -2861,7 +2861,7 @@ dec_from_float(PyObject *type, PyObject *pyfloat)
static PyObject *
ctx_from_float(PyObject *context, PyObject *v)
{
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
return PyDec_FromFloat(state, v, context);
}

Expand All @@ -2872,7 +2872,7 @@ dec_apply(PyObject *v, PyObject *context)
PyObject *result;
uint32_t status = 0;

decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
result = dec_alloc(state);
if (result == NULL) {
return NULL;
Expand All @@ -2899,7 +2899,7 @@ dec_apply(PyObject *v, PyObject *context)
static PyObject *
PyDecType_FromObjectExact(PyTypeObject *type, PyObject *v, PyObject *context)
{
decimal_state *state = get_module_state_by_def(type);
decimal_state *state = get_module_state_from_ctx(context);
if (v == NULL) {
return PyDecType_FromSsizeExact(type, 0, context);
}
Expand Down Expand Up @@ -2934,7 +2934,7 @@ PyDecType_FromObjectExact(PyTypeObject *type, PyObject *v, PyObject *context)
static PyObject *
PyDec_FromObject(PyObject *v, PyObject *context)
{
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
if (v == NULL) {
return PyDec_FromSsize(state, 0, context);
}
Expand Down Expand Up @@ -3021,7 +3021,7 @@ ctx_create_decimal(PyObject *context, PyObject *args)
Py_LOCAL_INLINE(int)
convert_op(int type_err, PyObject **conv, PyObject *v, PyObject *context)
{
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
if (PyDec_Check(state, v)) {
*conv = Py_NewRef(v);
return 1;
Expand Down Expand Up @@ -3124,7 +3124,7 @@ multiply_by_denominator(PyObject *v, PyObject *r, PyObject *context)
if (tmp == NULL) {
return NULL;
}
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
denom = PyDec_FromLongExact(state, tmp, context);
Py_DECREF(tmp);
if (denom == NULL) {
Expand Down Expand Up @@ -3179,7 +3179,7 @@ numerator_as_decimal(PyObject *r, PyObject *context)
return NULL;
}

decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
num = PyDec_FromLongExact(state, tmp, context);
Py_DECREF(tmp);
return num;
Expand All @@ -3198,7 +3198,7 @@ convert_op_cmp(PyObject **vcmp, PyObject **wcmp, PyObject *v, PyObject *w,

*vcmp = v;

decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
if (PyDec_Check(state, w)) {
*wcmp = Py_NewRef(w);
}
Expand Down Expand Up @@ -5161,7 +5161,7 @@ ctx_##MPDFUNC(PyObject *context, PyObject *v) \
\
CONVERT_OP_RAISE(&a, v, context); \
decimal_state *state = \
get_module_state_by_def(Py_TYPE(context)); \
get_module_state_from_ctx(context); \
if ((result = dec_alloc(state)) == NULL) { \
Py_DECREF(a); \
return NULL; \
Expand Down Expand Up @@ -5193,7 +5193,7 @@ ctx_##MPDFUNC(PyObject *context, PyObject *args) \
\
CONVERT_BINOP_RAISE(&a, &b, v, w, context); \
decimal_state *state = \
get_module_state_by_def(Py_TYPE(context)); \
get_module_state_from_ctx(context); \
if ((result = dec_alloc(state)) == NULL) { \
Py_DECREF(a); \
Py_DECREF(b); \
Expand Down Expand Up @@ -5229,7 +5229,7 @@ ctx_##MPDFUNC(PyObject *context, PyObject *args) \
\
CONVERT_BINOP_RAISE(&a, &b, v, w, context); \
decimal_state *state = \
get_module_state_by_def(Py_TYPE(context)); \
get_module_state_from_ctx(context); \
if ((result = dec_alloc(state)) == NULL) { \
Py_DECREF(a); \
Py_DECREF(b); \
Expand Down Expand Up @@ -5258,7 +5258,7 @@ ctx_##MPDFUNC(PyObject *context, PyObject *args) \
} \
\
CONVERT_TERNOP_RAISE(&a, &b, &c, v, w, x, context); \
decimal_state *state = get_module_state_by_def(Py_TYPE(context)); \
decimal_state *state = get_module_state_from_ctx(context); \
if ((result = dec_alloc(state)) == NULL) { \
Py_DECREF(a); \
Py_DECREF(b); \
Expand Down Expand Up @@ -5324,7 +5324,7 @@ ctx_mpd_qdivmod(PyObject *context, PyObject *args)
}

CONVERT_BINOP_RAISE(&a, &b, v, w, context);
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
q = dec_alloc(state);
if (q == NULL) {
Py_DECREF(a);
Expand Down Expand Up @@ -5379,7 +5379,7 @@ ctx_mpd_qpow(PyObject *context, PyObject *args, PyObject *kwds)
}
}

decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
result = dec_alloc(state);
if (result == NULL) {
Py_DECREF(a);
Expand Down Expand Up @@ -5432,7 +5432,7 @@ DecCtx_BoolFunc_NO_CTX(mpd_iszero)
static PyObject *
ctx_iscanonical(PyObject *context, PyObject *v)
{
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
if (!PyDec_Check(state, v)) {
PyErr_SetString(PyExc_TypeError,
"argument must be a Decimal");
Expand All @@ -5458,7 +5458,7 @@ PyDecContext_Apply(PyObject *context, PyObject *v)
static PyObject *
ctx_canonical(PyObject *context, PyObject *v)
{
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
if (!PyDec_Check(state, v)) {
PyErr_SetString(PyExc_TypeError,
"argument must be a Decimal");
Expand All @@ -5475,7 +5475,7 @@ ctx_mpd_qcopy_abs(PyObject *context, PyObject *v)
uint32_t status = 0;

CONVERT_OP_RAISE(&a, v, context);
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
result = dec_alloc(state);
if (result == NULL) {
Py_DECREF(a);
Expand Down Expand Up @@ -5508,7 +5508,7 @@ ctx_mpd_qcopy_negate(PyObject *context, PyObject *v)
uint32_t status = 0;

CONVERT_OP_RAISE(&a, v, context);
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
result = dec_alloc(state);
if (result == NULL) {
Py_DECREF(a);
Expand Down Expand Up @@ -5605,7 +5605,7 @@ ctx_mpd_qcopy_sign(PyObject *context, PyObject *args)
}

CONVERT_BINOP_RAISE(&a, &b, v, w, context);
decimal_state *state = get_module_state_by_def(Py_TYPE(context));
decimal_state *state = get_module_state_from_ctx(context);
result = dec_alloc(state);
if (result == NULL) {
Py_DECREF(a);
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.