Skip to content

bpo-41798: Allocate unicodedata CAPI on the heap #24128

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 3 commits into from
Jan 20, 2021
Merged

bpo-41798: Allocate unicodedata CAPI on the heap #24128

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b354265
Allocate unicodedata CAPI on the heap
Jan 5, 2021
bf0e601
Address review: Use PyModule_AddObjectRef iso. PyModuel_AddObject
Jan 10, 2021
720ada4
Address review
Jan 20, 2021
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
Allocate unicodedata CAPI on the heap
  • Loading branch information
Erlend E. Aasland
Erlend E. Aasland committed Jan 5, 2021
commit b3542651fb35abacdc085e8689546090eda71ab4
36 changes: 28 additions & 8 deletions Modules/unicodedata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,10 +1308,24 @@ capi_getcode(const char* name, int namelen, Py_UCS4* code,

}

static const _PyUnicode_Name_CAPI unicodedata_capi =
static void
udc_destroy_capi(PyObject *capsule)
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
{
void *capi = PyCapsule_GetPointer(capsule, PyUnicodeData_CAPSULE_NAME);
PyMem_Free(capi);
}

static _PyUnicode_Name_CAPI *
udc_get_capi(void)
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
{
.getname = capi_getucname,
.getcode = capi_getcode,
_PyUnicode_Name_CAPI *capi = PyMem_Malloc(sizeof(_PyUnicode_Name_CAPI));
if (capi == NULL) {
PyErr_NoMemory();
return NULL;
}
capi->getname = capi_getucname;
capi->getcode = capi_getcode;
return capi;
};


Expand Down Expand Up @@ -1477,13 +1491,19 @@ unicodedata_exec(PyObject *module)
}

/* Export C API */
Comment thread
erlend-aasland marked this conversation as resolved.
v = PyCapsule_New((void *)&unicodedata_capi, PyUnicodeData_CAPSULE_NAME,
NULL);
if (v == NULL) {
_PyUnicode_Name_CAPI *capi = udc_get_capi();
if (capi == NULL) {
return -1;
}
if (PyModule_AddObject(module, "_ucnhash_CAPI", v) < 0) {
Py_DECREF(v);
PyObject *capsule = PyCapsule_New(capi,
PyUnicodeData_CAPSULE_NAME,
udc_destroy_capi);
if (capsule == NULL) {
PyMem_Free(capi);
return -1;
}
if (PyModule_AddObject(module, "_ucnhash_CAPI", capsule) < 0) {

@shihai1991 shihai1991 Jan 6, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using PyModule_AddObjectRef in here too?

@erlend-aasland erlend-aasland Jan 6, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could do that, but I'm not sure it would improve this code. What do you think?

@shihai1991 shihai1991 Jan 10, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PyModule_AddObjectRef() is more easy to understand than PyModule_AddObject(), because PyModule_AddObject() will steal the refs sometimes.

@erlend-aasland erlend-aasland Jan 10, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After thinking about it, I do agree. It's easier to follow the ref count when reading the code. I'll change it. Thanks!

@erlend-aasland erlend-aasland Jan 10, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I change the other PyModule_AddObject in unicodedata_exec() while we're there?

Py_DECREF(capsule);
return -1;
}
return 0;
Expand Down