Skip to content

gh-114314: Move types to ctypes_state - #114316

Closed
vstinner wants to merge 3 commits into
python:mainfrom
vstinner:ctypes_state
Closed

gh-114314: Move types to ctypes_state#114316
vstinner wants to merge 3 commits into
python:mainfrom
vstinner:ctypes_state

Conversation

@vstinner

@vstinnervstinner commented Jan 19, 2024

Copy link
Copy Markdown
Member

Move types to the ctypes_state structure:

  • PyCArray_Type
  • PyCData_Type
  • PyCFuncPtr_Type
  • PyCPointer_Type
  • Simple_Type

The following macros get an additional state parameter:

  • ArrayObject_Check()
  • CDataObject_Check()
  • CDataObject_CheckExact()
  • PointerObject_Check()
  • PyCFuncPtrObject_Check()

The following function gets an additional state parameter:

  • _PyCData_set()

Move types to the ctypes_state structure:
* PyCArray_Type
* PyCData_Type
* PyCFuncPtr_Type
* PyCPointer_Type
* Simple_Type
The following macros get an additional state parameter:
* ArrayObject_Check()
* CDataObject_Check()
* CDataObject_CheckExact()
* PointerObject_Check()
* PyCFuncPtrObject_Check()
The following function gets an additional state parameter:
* _PyCData_set()
Co-Authored-By: neonene <53406459+neonene@users.noreply.github.com>
@vstinner

Copy link
Copy Markdown
MemberAuthor

This change only prepares the code to convert static types to heap types. It doesn't change the behavior.

It only moves references to types from global variables to the _ctypesstate and pass the state to macros and functions using it.

@vstinner

Copy link
Copy Markdown
MemberAuthor

To keep this change as small as possible, I didn't change the following macros to add a new state parameter.

#define PyCSimpleTypeObject_CheckExact(v) Py_IS_TYPE(v, GLOBAL_STATE()->PyCSimpleType_Type)
#define PyCSimpleTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCSimpleType_Type)
#define PyCArrayTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCArrayType_Type)
#define PyCPointerTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCPointerType_Type)
#define PyCFuncPtrTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCFuncPtrType_Type)
#define PyCStructTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCStructType_Type)

These macros can be changed afterwards.

@vstinner

Copy link
Copy Markdown
MemberAuthor

@neonene

Copy link
Copy Markdown
Contributor

PR #113857, which expects fewer follow-up PRs, can be closed after this is landed.

@vstinner

Copy link
Copy Markdown
MemberAuthor

I merged #113857 instead.

@vstinner
vstinner deleted the ctypes_state branch January 22, 2024 13:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@vstinner@neonene