Skip to content

Commit 71397b2

Browse files
committed
fix comment changes
1 parent 31bbc40 commit 71397b2

1 file changed

Lines changed: 18 additions & 35 deletions

File tree

Modules/_decimal/_decimal.c

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ typedef struct PyDecContextObject {
228228
} PyDecContextObject;
229229

230230
#define _PyDecContextObject_CAST(op) ((PyDecContextObject *)(op))
231-
#define _PyDecContextObject_LOCKED_CAST(op) ((PyDecContextObject *)(op))
232231

233232
typedef struct {
234233
PyObject_HEAD
@@ -248,7 +247,9 @@ typedef struct {
248247
#define SdFlagAddr(v) (_PyDecSignalDictObject_CAST(v)->flags)
249248
#define SdFlags(v) (*_PyDecSignalDictObject_CAST(v)->flags)
250249
#define CTX(v) (&_PyDecContextObject_CAST(v)->ctx)
251-
#define CTX_LOCK(v) (&_PyDecContextObject_CAST(v)->ctx_lock)
250+
#define CTX_LOCK_INIT(v) _PyDecContextObject_CAST(v)->ctx_lock = (PyMutex){0}
251+
#define CTX_LOCK(v) PyMutex_Lock(&_PyDecContextObject_CAST(v)->ctx_lock)
252+
#define CTX_UNLOCK(v) PyMutex_Unlock(&_PyDecContextObject_CAST(v)->ctx_lock)
252253
#define CtxCaps(v) (_PyDecContextObject_CAST(v)->capitals)
253254

254255
static inline decimal_state *
@@ -614,12 +615,11 @@ static int
614615
dec_addstatus(PyObject *context, uint32_t status)
615616
{
616617
mpd_context_t *ctx = CTX(context);
617-
PyMutex* ctx_lock = CTX_LOCK(context);
618618
decimal_state *state = get_module_state_from_ctx(context);
619619

620-
PyMutex_Lock(ctx_lock);
620+
CTX_LOCK(context);
621621
ctx->status |= status;
622-
PyMutex_Unlock(ctx_lock);
622+
CTX_UNLOCK(context);
623623
if (status & (ctx->traps|MPD_Malloc_error)) {
624624
PyObject *ex, *siglist;
625625

@@ -1424,10 +1424,9 @@ static PyObject *
14241424
_decimal_Context_clear_flags_impl(PyObject *self)
14251425
/*[clinic end generated code: output=c86719a70177d0b6 input=a06055e2f3e7edb1]*/
14261426
{
1427-
PyMutex* ctx_lock = CTX_LOCK(self);
1428-
PyMutex_Lock(ctx_lock);
1427+
CTX_LOCK(self);
14291428
CTX(self)->status = 0;
1430-
PyMutex_Unlock(ctx_lock);
1429+
CTX_UNLOCK(self);
14311430
Py_RETURN_NONE;
14321431
}
14331432

@@ -1446,7 +1445,6 @@ context_new(PyTypeObject *type,
14461445
{
14471446
PyDecContextObject *self = NULL;
14481447
mpd_context_t *ctx;
1449-
PyMutex* ctx_lock;
14501448

14511449
decimal_state *state = get_module_state_by_def(type);
14521450
if (type == state->PyDecContext_Type) {
@@ -1482,12 +1480,8 @@ context_new(PyTypeObject *type,
14821480
*ctx = dflt_ctx;
14831481
}
14841482

1485-
ctx_lock = CTX_LOCK(self);
1486-
14871483
SdFlagAddr(self->traps) = &ctx->traps;
1488-
PyMutex_Lock(ctx_lock);
14891484
SdFlagAddr(self->flags) = &ctx->status;
1490-
PyMutex_Unlock(ctx_lock);
14911485

14921486
CtxCaps(self) = 1;
14931487
self->tstate = NULL;
@@ -1571,7 +1565,6 @@ static PyObject *
15711565
context_repr(PyObject *self)
15721566
{
15731567
mpd_context_t *ctx;
1574-
PyMutex* ctx_lock;
15751568
char flags[MPD_MAX_SIGNAL_LIST];
15761569
char traps[MPD_MAX_SIGNAL_LIST];
15771570
int n, mem;
@@ -1582,10 +1575,9 @@ context_repr(PyObject *self)
15821575
#endif
15831576
ctx = CTX(self);
15841577

1585-
ctx_lock = CTX_LOCK(self);
1586-
PyMutex_Lock(ctx_lock);
1578+
CTX_LOCK(self);
15871579
uint32_t ctx_status = ctx->status;
1588-
PyMutex_Unlock(ctx_lock);
1580+
CTX_UNLOCK(self);
15891581

15901582
mem = MPD_MAX_SIGNAL_LIST;
15911583
n = mpd_lsnprint_signals(flags, mem, ctx_status, dec_signal_string);
@@ -1615,7 +1607,7 @@ init_basic_context(PyObject *v)
16151607
ctx.round = MPD_ROUND_HALF_UP;
16161608

16171609
*CTX(v) = ctx;
1618-
*CTX_LOCK(v) = (PyMutex){0};
1610+
CTX_LOCK_INIT(v);
16191611
CtxCaps(v) = 1;
16201612
}
16211613

@@ -1628,7 +1620,7 @@ init_extended_context(PyObject *v)
16281620
ctx.traps = 0;
16291621

16301622
*CTX(v) = ctx;
1631-
*CTX_LOCK(v) = (PyMutex){0};
1623+
CTX_LOCK_INIT(v);
16321624
CtxCaps(v) = 1;
16331625
}
16341626

@@ -1738,15 +1730,14 @@ _decimal_Context___reduce___impl(PyObject *self, PyTypeObject *cls)
17381730
PyObject *traps;
17391731
PyObject *ret;
17401732
mpd_context_t *ctx;
1741-
PyMutex* ctx_lock;
17421733
decimal_state *state = PyType_GetModuleState(cls);
17431734

17441735
ctx = CTX(self);
1745-
ctx_lock = CTX_LOCK(self);
17461736

1747-
PyMutex_Lock(ctx_lock);
1737+
CTX_LOCK(self);
17481738
uint32_t ctx_status = ctx->status;
1749-
PyMutex_Unlock(ctx_lock);
1739+
CTX_UNLOCK(self);
1740+
17501741
flags = signals_as_list(state, ctx_status);
17511742
if (flags == NULL) {
17521743
return NULL;
@@ -1946,16 +1937,12 @@ static PyObject *
19461937
init_current_context(decimal_state *state)
19471938
{
19481939
mpd_context_t* ctx;
1949-
PyMutex* ctx_lock;
19501940
PyObject *tl_context = context_copy(state, state->default_context_template);
19511941
if (tl_context == NULL) {
19521942
return NULL;
19531943
}
19541944
ctx = CTX(tl_context);
1955-
ctx_lock = CTX_LOCK(tl_context);
1956-
PyMutex_Lock(ctx_lock);
19571945
ctx->status = 0;
1958-
PyMutex_Unlock(ctx_lock);
19591946

19601947
PyObject *tok = PyContextVar_Set(state->current_context_var, tl_context);
19611948
if (tok == NULL) {
@@ -2017,10 +2004,7 @@ PyDec_SetCurrentContext(PyObject *self, PyObject *v)
20172004
return NULL;
20182005
}
20192006
mpd_context_t* ctx = CTX(v);
2020-
PyMutex* ctx_lock = CTX_LOCK(v);
2021-
PyMutex_Lock(ctx_lock);
20222007
ctx->status = 0;
2023-
PyMutex_Unlock(ctx_lock);
20242008
}
20252009
else {
20262010
Py_INCREF(v);
@@ -3517,7 +3501,6 @@ convert_op_cmp(PyObject **vcmp, PyObject **wcmp, PyObject *v, PyObject *w,
35173501
int op, PyObject *context)
35183502
{
35193503
mpd_context_t *ctx = CTX(context);
3520-
PyMutex* ctx_lock = CTX_LOCK(context);
35213504

35223505
*vcmp = v;
35233506

@@ -3534,9 +3517,9 @@ convert_op_cmp(PyObject **vcmp, PyObject **wcmp, PyObject *v, PyObject *w,
35343517
*wcmp = NULL;
35353518
}
35363519
else {
3537-
PyMutex_Lock(ctx_lock);
3520+
CTX_LOCK(ctx);
35383521
ctx->status |= MPD_Float_operation;
3539-
PyMutex_Unlock(ctx_lock);
3522+
CTX_UNLOCK(ctx);
35403523
*wcmp = PyDec_FromFloatExact(state, w, context);
35413524
}
35423525
}
@@ -3551,9 +3534,9 @@ convert_op_cmp(PyObject **vcmp, PyObject **wcmp, PyObject *v, PyObject *w,
35513534
*wcmp = NULL;
35523535
}
35533536
else {
3554-
PyMutex_Lock(ctx_lock);
3537+
CTX_LOCK(ctx);
35553538
ctx->status |= MPD_Float_operation;
3556-
PyMutex_Unlock(ctx_lock);
3539+
CTX_UNLOCK(ctx);
35573540
*wcmp = PyDec_FromFloatExact(state, tmp, context);
35583541
Py_DECREF(tmp);
35593542
}

0 commit comments

Comments
 (0)