Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cext/revlog.c @ 43964:f384d68d8ea8
revlog: made C Capsule an array of function pointers
Although it's perfectly valid to put a function pointer in
a capsule, as we've been doing since the start of rust/hg-cpython,
an array of function pointers has several advantages:
- it can hold several functions. That's our main motivation here.
We plan to expose index_length() and index_node(), which will
be needed for a Rust implementation of nodemap.
- it could also have data
- (probably minor in the case of Mercurial) proper support for
architectures for which data and code pointers don't have the
same size.
Differential Revision: https://phab.mercurial-scm.org/D7543
| author | Georges Racinet <georges.racinet@octobus.net> |
|---|---|
| date | Wed, 27 Nov 2019 17:59:58 +0100 |
| parents | 49fa0b31ee1d |
| children | f5d2720f3bea |
line wrap: on
line diff
--- a/mercurial/cext/revlog.c Sun Dec 22 23:09:37 2019 -0500 +++ b/mercurial/cext/revlog.c Wed Nov 27 17:59:58 2019 +0100 @@ -37,6 +37,10 @@ int children[16]; } nodetreenode; +typedef struct { + int (*index_parents)(PyObject *, int, int *); +} Revlog_CAPI; + /* * A base-16 trie for fast node->rev mapping. * @@ -3032,6 +3036,10 @@ }; #endif /* WITH_RUST */ +static Revlog_CAPI CAPI = { + HgRevlogIndex_GetParents, +}; + void revlog_module_init(PyObject *mod) { PyObject *caps = NULL; @@ -3055,11 +3063,9 @@ if (nullentry) PyObject_GC_UnTrack(nullentry); - caps = PyCapsule_New(HgRevlogIndex_GetParents, - "mercurial.cext.parsers.index_get_parents_CAPI", - NULL); + caps = PyCapsule_New(&CAPI, "mercurial.cext.parsers.revlog_CAPI", NULL); if (caps != NULL) - PyModule_AddObject(mod, "index_get_parents_CAPI", caps); + PyModule_AddObject(mod, "revlog_CAPI", caps); #ifdef WITH_RUST rustlazyancestorsType.tp_new = PyType_GenericNew;