pythongh-116616: Use relaxed atomic ops to access socket module defaulttimeout (python#116623)

erlend-aasland · colesbury · adorilson · commit 01fa1f5941ff · 2024-03-25T14:58:45.000Z
Co-authored-by: Sam Gross &lt;colesbury@gmail.com&gt;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -1054,8 +1054,8 @@ init_sockobject(socket_state *state, PySocketSockObject *s,
     else
 #endif
     {
-        s->sock_timeout = state->defaulttimeout;
-        if (state->defaulttimeout >= 0) {
+        s->sock_timeout = _Py_atomic_load_int64_relaxed(&state->defaulttimeout);
+        if (s->sock_timeout >= 0) {
             if (internal_setblocking(s, 0) == -1) {
                 return -1;
             }
@@ -6913,11 +6913,12 @@ static PyObject *
 socket_getdefaulttimeout(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     socket_state *state = get_module_state(self);
-    if (state->defaulttimeout < 0) {
+    PyTime_t timeout = _Py_atomic_load_int64_relaxed(&state->defaulttimeout);
+    if (timeout < 0) {
         Py_RETURN_NONE;
     }
     else {
-        double seconds = PyTime_AsSecondsDouble(state->defaulttimeout);
+        double seconds = PyTime_AsSecondsDouble(timeout);
         return PyFloat_FromDouble(seconds);
     }
 }
@@ -6938,7 +6939,7 @@ socket_setdefaulttimeout(PyObject *self, PyObject *arg)
         return NULL;
 
     socket_state *state = get_module_state(self);
-    state->defaulttimeout = timeout;
+    _Py_atomic_store_int64_relaxed(&state->defaulttimeout, timeout);
 
     Py_RETURN_NONE;
 }

Original file line number	Diff line number	Diff line change
`@@ -1054,8 +1054,8 @@ init_sockobject(socket_state state, PySocketSockObject s,`
`1054`	`1054`	`else`
`1055`	`1055`	`#endif`
`1056`	`1056`	`{`
`1057`		`- s->sock_timeout = state->defaulttimeout;`
`1058`		`- if (state->defaulttimeout >= 0) {`
	`1057`	`+ s->sock_timeout = _Py_atomic_load_int64_relaxed(&state->defaulttimeout);`
	`1058`	`+ if (s->sock_timeout >= 0) {`
`1059`	`1059`	`if (internal_setblocking(s, 0) == -1) {`
`1060`	`1060`	`return -1;`
`1061`	`1061`	`}`
`@@ -6913,11 +6913,12 @@ static PyObject *`
`6913`	`6913`	`socket_getdefaulttimeout(PyObject self, PyObject Py_UNUSED(ignored))`
`6914`	`6914`	`{`
`6915`	`6915`	`socket_state *state = get_module_state(self);`
`6916`		`- if (state->defaulttimeout < 0) {`
	`6916`	`+ PyTime_t timeout = _Py_atomic_load_int64_relaxed(&state->defaulttimeout);`
	`6917`	`+ if (timeout < 0) {`
`6917`	`6918`	`Py_RETURN_NONE;`
`6918`	`6919`	`}`
`6919`	`6920`	`else {`
`6920`		`- double seconds = PyTime_AsSecondsDouble(state->defaulttimeout);`
	`6921`	`+ double seconds = PyTime_AsSecondsDouble(timeout);`
`6921`	`6922`	`return PyFloat_FromDouble(seconds);`
`6922`	`6923`	`}`
`6923`	`6924`	`}`
`@@ -6938,7 +6939,7 @@ socket_setdefaulttimeout(PyObject self, PyObject arg)`
`6938`	`6939`	`return NULL;`
`6939`	`6940`
`6940`	`6941`	`socket_state *state = get_module_state(self);`
`6941`		`- state->defaulttimeout = timeout;`
	`6942`	`+ _Py_atomic_store_int64_relaxed(&state->defaulttimeout, timeout);`
`6942`	`6943`
`6943`	`6944`	`Py_RETURN_NONE;`
`6944`	`6945`	`}`