8000 bpo-47003: Cleanup _overlapped module by asvetlov · Pull Request #31848 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-47003: Cleanup _overlapped module #31848

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 5 commits into from
Mar 13, 2022
Merged

bpo-47003: Cleanup _overlapped module #31848

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f635f4
Cleanup _overlapped module
asvetlov Mar 13, 2022
2243f0b
Run CancelIOEx with GIL released
asvetlov Mar 13, 2022
357df44
Fix compiler errors
asvetlov Mar 13, 2022
720fd84
Fix memory management
asvetlov Mar 13, 2022
50b1380
Fix compile error
asvetlov Mar 13, 2022
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
Fix memory management
  • Loading branch information
@asvetlov
asvetlov committed Mar 13, 2022
commit 720fd84e2151abff16d3cb8595e758950346b3f5
60 changes: 35 additions & 25 deletions Modules/overlapped.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ typedef struct {
/* Buffer allocated by us: TYPE_READ and TYPE_ACCEPT */
PyObject *allocated_buffer;
/* Buffer passed by the user: TYPE_WRITE, TYPE_WRITE_TO, and TYPE_READINTO */
Py_buffer *user_buffer;
Py_buffer user_buffer;

/* Data used for reading from a connectionless socket:
TYPE_READ_FROM */
Expand All @@ -98,7 +98,7 @@ typedef struct {
// A (number of bytes read, (host, port)) tuple
PyObject* result;
/* Buffer passed by the user */
Py_buffer *user_buffer;
Py_buffer user_buffer;
struct sockaddr_in6 address;
int address_length;
} read_from_into;
Expand All @@ -118,6 +118,13 @@ overlapped_get_state(PyObject *module)
}


static inline void
steal_buffer(Py_buffer * dst, Py_buffer * src)
{
memcpy(dst, src, sizeof(Py_buffer));
memset(src, 0, sizeof(Py_buffer));
}

/*
* Map Windows error codes to subclasses of OSError
*/
Expand Down Expand Up @@ -644,7 +651,7 @@ _overlapped_Overlapped_impl(PyTypeObject *type, HANDLE event)
self->type = TYPE_NONE;
self->allocated_buffer = NULL;
memset(&self->overlapped, 0, sizeof(OVERLAPPED));
memset(self->user_buffer, 0, sizeof(Py_buffer));
memset(&self->user_buffer, 0, sizeof(Py_buffer));
if (event)
self->overlapped.hEvent = event;
return (PyObject *)self;
Expand Down Expand Up @@ -680,13 +687,16 @@ Overlapped_clear(OverlappedObject *self)
// We've received a message, free the result tuple.
Py_CLEAR(self->read_from_into.result);
}
if (self->read_from_into->user_buffer.obj) {
PyBuffer_Release(&self->read_from_into->user_buffer);
}
break;
}
case TYPE_WRITE:
case TYPE_WRITE_TO:
case TYPE_READINTO: {
if (self->user_buffer->obj) {
PyBuffer_Release(self->user_buffer);
if (self->user_buffer.obj) {
PyBuffer_Release(&self->user_buffer);
}
break;
}
Expand Down Expand Up @@ -1055,13 +1065,13 @@ _overlapped_Overlapped_ReadFileInto_impl(OverlappedObject *self,
return NULL;
}
#endif
self->user_buffer = bufobj;
steal_buffer(&self->user_buffer, bufobj);

self->type = TYPE_READINTO;
self->handle = handle;

return do_ReadFile(self, handle, self->user_buffer->buf,
(DWORD)self->user_buffer->len);
return do_ReadFile(self, handle, self->user_buffer.buf,
(DWORD)self->user_buffer.len);
}

static PyObject *
Expand Down Expand Up @@ -1162,13 +1172,13 @@ _overlapped_Overlapped_WSARecvInto_impl(OverlappedObject *self,
return NULL;
}
#endif
self->user_buffer = bufobj;
steal_buffer(&self->user_buffer, bufobj);

self->type = TYPE_READINTO;
self->handle = handle;

return do_WSARecv(self, handle, self->user_buffer->buf,
(DWORD)self->user_buffer->len, flags);
return do_WSARecv(self, handle, self->user_buffer.buf,
(DWORD)self->user_buffer.len, flags);
}

/*[clinic input]
Expand Down Expand Up @@ -1201,14 +1211,14 @@ _overlapped_Overlapped_WriteFile_impl(OverlappedObject *self, HANDLE handle,
return NULL;
}
#endif
self->user_buffer = bufobj;
steal_buffer(&self->user_buffer, bufobj);

self->type = TYPE_WRITE;
self->handle = handle;

Py_BEGIN_ALLOW_THREADS
ret = WriteFile(handle, self->user_buffer->buf,
(DWORD)self->user_buffer->len,
ret = WriteFile(handle, self->user_buffer.buf,
(DWORD)self->user_buffer.len,
&written, &self->overlapped);
Py_END_ALLOW_THREADS

Expand Down Expand Up @@ -1255,12 +1265,12 @@ _overlapped_Overlapped_WSASend_impl(OverlappedObject *self, HANDLE handle,
return NULL;
}
#endif
self->user_buffer = bufobj;
steal_buffer(&self->user_buffer, bufobj);

self->type = TYPE_WRITE;
self->handle = handle;
wsabuf.len = (DWORD)self->user_buffer->len;
wsabuf.buf = self->user_buffer->buf;
wsabuf.len = (DWORD)self->user_buffer.len;
wsabuf.buf = self->user_buffer.buf;

Py_BEGIN_ALLOW_THREADS
ret = WSASend((SOCKET)handle, &wsabuf, 1, &written, flags,
Expand Down Expand Up @@ -1645,8 +1655,8 @@ Overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
case TYPE_WRITE:
case TYPE_WRITE_TO:
case TYPE_READINTO:
if (self->user_buffer->obj) {
Py_VISIT(&self->user_buffer->obj);
if (self->user_buffer.obj) {
Py_VISIT(&self->user_buffer.obj);
}
break;
case TYPE_READ_FROM:
Expand All @@ -1655,8 +1665,8 @@ Overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
break;
case TYPE_READ_FROM_INTO:
Py_VISIT(self->read_from_into.result);
if (self->read_from_into.user_buffer->obj) {
Py_VISIT(&self->read_from_into.user_buffer->obj);
if (self->read_from_into.user_buffer.obj) {
Py_VISIT(&self->read_from_into.user_buffer.obj);
}
break;
}
Expand Down Expand Up @@ -1755,12 +1765,12 @@ _overlapped_Overlapped_WSASendTo_impl(OverlappedObject *self, HANDLE handle,
return NULL;
}
#endif
self->user_buffer = bufobj;
steal_buffer(&self->user_buffer, bufobj);

self->type = TYPE_WRITE_TO;
self->handle = handle;
wsabuf.len = (DWORD)self->user_buffer->len;
wsabuf.buf = self->user_buffer->buf;
wsabuf.len = (DWORD)self->user_buffer.len;
wsabuf.buf = self->user_buffer.buf;

Py_BEGIN_ALLOW_THREADS
ret = WSASendTo((SOCKET)handle, &wsabuf, 1, &written, flags,
Expand Down Expand Up @@ -1895,7 +1905,7 @@ _overlapped_Overlapped_WSARecvFromInto_impl(OverlappedObject *self,

self->type = TYPE_READ_FROM_INTO;
self->handle = handle;
self->read_from_into.user_buffer = bufobj;
steal_buffer(&self->read_from_into.user_buffer, bufobj);
memset(&self->read_from_into.address, 0, sizeof(self->read_from_into.address));
self->read_from_into.address_length = sizeof(self->read_from_into.address);

Expand Down
0