Visitar URL original
bpo-1635741: port winapi to multi-stage init by koubaa · Pull Request #21371 · python/cpython · GitHub
Skip to content

bpo-1635741: port winapi to multi-stage init #21371

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
vstinner merged 9 commits into from
Aug 13, 2020
Merged

bpo-1635741: port winapi to multi-stage init #21371

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67c2350
port winapi to multi-stage init
koubaa Jul 7, 2020
12c41c8
blurb
koubaa Jul 7, 2020
f5e2fc2
reviewer suggestions
koubaa Jul 7, 2020
283911c
fix refcount
Jul 8, 2020
e0e1b30
update based on review
koubaa Jul 9, 2020
7195743
update based on review
koubaa Jul 9, 2020
a836c71
update based on review
koubaa Jul 9, 2020
af115c1
fix typo
koubaa Jul 9, 2020
42352a4
check result of Py_BuildValue
koubaa Aug 10, 2020
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
Next Next commit
port winapi to multi-stage init
  • Loading branch information
@koubaa
koubaa committed Aug 13, 2020
commit 67c23500c1131048737efacf7f2aec4a9ffd13ed
129 changes: 63 additions & 66 deletions Modules/_winapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@
/* See http://www.python.org/2.4/license for licensing details. */

#include "Python.h"
#include "moduleobject.h" // PyModuleDef_Slot
#include "structmember.h" // PyMemberDef


#define WINDOWS_LEAN_AND_MEAN
#include "windows.h"
#include <crtdbg.h>
Expand Down Expand Up @@ -78,6 +80,17 @@ check_CancelIoEx()
return has_CancelIoEx;
}

typedef struct {
PyTypeObject *overlapped_type;
} WinApiState;

static inline WinApiState*
winapi_get_state(PyObject *module)
{
void *state = PyModule_GetState(module);
assert(state != NULL);
return (WinApiState *)state;
}

/*
* A Python object wrapping an OVERLAPPED structure and other useful data
Expand Down Expand Up @@ -305,53 +318,30 @@ static PyMemberDef overlapped_members[] = {
{NULL}
};

PyTypeObject OverlappedType = {
PyVarObject_HEAD_INIT(NULL, 0)
/* tp_name */ "_winapi.Overlapped",
/* tp_basicsize */ sizeof(OverlappedObject),
/* tp_itemsize */ 0,
/* tp_dealloc */ (destructor) overlapped_dealloc,
/* tp_vectorcall_offset */ 0,
/* tp_getattr */ 0,
/* tp_setattr */ 0,
/* tp_as_async */ 0,
/* tp_repr */ 0,
/* tp_as_number */ 0,
/* tp_as_sequence */ 0,
/* tp_as_mapping */ 0,
/* tp_hash */ 0,
/* tp_call */ 0,
/* tp_str */ 0,
/* tp_getattro */ 0,
/* tp_setattro */ 0,
/* tp_as_buffer */ 0,
/* tp_flags */ Py_TPFLAGS_DEFAULT,
/* tp_doc */ "OVERLAPPED structure wrapper",
/* tp_traverse */ 0,
/* tp_clear */ 0,
/* tp_richcompare */ 0,
/* tp_weaklistoffset */ 0,
/* tp_iter */ 0,
/* tp_iternext */ 0,
/* tp_methods */ overlapped_methods,
/* tp_members */ overlapped_members,
/* tp_getset */ 0,
/* tp_base */ 0,
/* tp_dict */ 0,
/* tp_descr_get */ 0,
/* tp_descr_set */ 0,
/* tp_dictoffset */ 0,
/* tp_init */ 0,
/* tp_alloc */ 0,
/* tp_new */ 0,
static PyType_Slot winapi_overlapped_type_slots[] = {
{Py_tp_dealloc, overlapped_dealloc},
Comment thread
koubaa marked this conversation as resolved.
Outdated
{Py_tp_doc, "OVERLAPPED structure wrapper"},
{Py_tp_methods, overlapped_methods},
{Py_tp_members, overlapped_members},
{0,0}
};

static PyType_Spec winapi_overlapped_type_spec = {
.name = "_winapi.Overlapped",
.basicsize = sizeof(OverlappedObject),
.flags = Py_TPFLAGS_DEFAULT,
.slots = winapi_overlapped_type_slots,
};

static OverlappedObject *
new_overlapped(HANDLE handle)
new_overlapped(PyObject *module, HANDLE handle)
{
OverlappedObject *self;

self = PyObject_New(OverlappedObject, &OverlappedType);
WinApiState *st;
st = winapi_get_state(module);
Comment thread
koubaa marked this conversation as resolved.
Outdated

self = PyObject_New(OverlappedObject, st->overlapped_type);
if (!self)
return NULL;
self->handle = handle;
Expand Down Expand Up @@ -409,7 +399,7 @@ _winapi_ConnectNamedPipe_impl(PyObject *module, HANDLE handle,
OverlappedObject *overlapped = NULL;

if (use_overlapped) {
overlapped = new_overlapped(handle);
overlapped = new_overlapped(module, handle);
if (!overlapped)
return NULL;
}
Expand Down Expand Up @@ -1527,7 +1517,7 @@ _winapi_ReadFile_impl(PyObject *module, HANDLE handle, DWORD size,
if (!buf)
return NULL;
if (use_overlapped) {
overlapped = new_overlapped(handle);
overlapped = new_overlapped(module, handle);
if (!overlapped) {
Py_DECREF(buf);
return NULL;
Expand Down Expand Up @@ -1810,7 +1800,7 @@ _winapi_WriteFile_impl(PyObject *module, HANDLE handle, PyObject *buffer,
OverlappedObject *overlapped = NULL;

if (use_overlapped) {
overlapped = new_overlapped(handle);
overlapped = new_overlapped(module, handle);
if (!overlapped)
return NULL;
buf = &overlapped->write_buffer;
Expand Down Expand Up @@ -1921,36 +1911,24 @@ static PyMethodDef winapi_functions[] = {
{NULL, NULL}
};

static struct PyModuleDef winapi_module = {
PyModuleDef_HEAD_INIT,
"_winapi",
NULL,
-1,
winapi_functions,
NULL,
NULL,
NULL,
NULL
};

#define WINAPI_CONSTANT(fmt, con) \
PyDict_SetItemString(d, #con, Py_BuildValue(fmt, con))
Comment thread
koubaa marked this conversation as resolved.
Outdated

PyMODINIT_FUNC
PyInit__winapi(void)
static int winapi_exec(PyObject *m)
{
PyObject *d;
PyObject *m;
WinApiState *st;

if (PyType_Ready(&OverlappedType) < 0)
return NULL;
st = winapi_get_state(m);

st->overlapped_type = (PyTypeObject *)PyType_FromModuleAndSpec(m, &winapi_overlapped_type_spec, NULL);
if (st->overlapped_type == NULL) {
return -1;
}

m = PyModule_Create(&winapi_module);
if (m == NULL)
return NULL;
d = PyModule_GetDict(m);
Comment thread
koubaa marked this conversation as resolved.
Outdated

PyDict_SetItemString(d, "Overlapped", (PyObject *) &OverlappedType);
PyDict_SetItemString(d, "Overlapped", (PyObject *) st->overlapped_type);
Comment thread
koubaa marked this conversation as resolved.
Outdated

/* constants */
WINAPI_CONSTANT(F_DWORD, CREATE_NEW_CONSOLE);
Expand Down Expand Up @@ -2049,5 +2027,24 @@ PyInit__winapi(void)

WINAPI_CONSTANT("i", NULL);

return m;
return 0;
}

static PyModuleDef_Slot winapi_slots[] = {
{Py_mod_exec, winapi_exec},
{0, NULL}
};

static struct PyModuleDef winapi_module = {
PyModuleDef_HEAD_INIT,
.m_name = "_winapi",
.m_size = sizeof(WinApiState),
.m_methods = winapi_functions,
.m_slots = winapi_slots,
};

PyMODINIT_FUNC
PyInit__winapi(void)
{
return PyModuleDef_Init(&winapi_module);
}