Skip to content
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.

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

gh-101819: Prepare to modernize the _io extension #104178

Merged
merged 1 commit into from
May 5, 2023

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented May 4, 2023

  • Add references to static types to _PyIO_State:

    • PyBufferedIOBase_Type
    • PyBytesIOBuffer_Type
    • PyIncrementalNewlineDecoder_Type
    • PyRawIOBase_Type
    • PyTextIOBase_Type
  • Add the defining class to methods:

    • _io.BytesIO.getbuffer()
    • _io.FileIO.close()
  • Add get_io_state_by_cls() function.

  • Add state parameter to _textiowrapper_decode()

  • io_TextIOWrapper___init_() now sets self->state before calling _textiowrapper_set_decoder().

@vstinner
Copy link
Member Author

vstinner commented May 4, 2023

This PR is based on @erlend-aasland's PR #101948. Changes:

  • Don't convert static types to heap types: it will be done on a separated PR
  • _io_StringIO___init___impl() only calls find_io_state_by_def() once
  • _io__WindowsConsoleIO___init___impl() doesn't declare a variable which is only used by an assertion, to avoid the risk of getting a compiler warning. If the line is too long, I can make the declaration conditional on the NDEBUG macro.
  • _io_FileIO_close_impl() and _io__WindowsConsoleIO_close_impl(): move variable declaration (minor coding style change).
  • Don't add PyIOBase_Type since such change would have no point for now.

I copied the clinic_state() macros.

Add the defining class to methods: (...)

I was not sure that it works on static types... but it seems like it does :-) I didn't get any crash.

@vstinner
Copy link
Member Author

vstinner commented May 4, 2023

@corona10 @erlend-aasland: Would you mind to review it?

@corona10
Copy link
Member

corona10 commented May 4, 2023

sure

@corona10 corona10 self-requested a review May 4, 2023 17:32
@vstinner
Copy link
Member Author

vstinner commented May 5, 2023

Oh, the Windows change didn't go well:

0:20:02 load avg: 8.57 [317/463/2] test_winconsoleio crashed (Exit code 3) -- (...)
Assertion failed: mod != NULL, file D:\a\cpython\cpython\Modules\_io\_iomodule.h, line 192
Fatal Python error: Aborted

Current thread 0x000004a0 (most recent call first):
  File "D:\a\cpython\cpython\Lib\test\test_winconsoleio.py", line 104 in test_conin_conout_names
(...)

@vstinner
Copy link
Member Author

vstinner commented May 5, 2023

The failed assertion is:

assert(PyObject_TypeCheck(self, find_io_state_by_def(Py_TYPE(self))->PyWindowsConsoleIO_Type));

in _io__WindowsConsoleIO___init___impl(). The assertion fails because PyType_GetModuleByDef() returns NULL.

@vstinner
Copy link
Member Author

vstinner commented May 5, 2023

On static types, PyType_GetModuleByDef() always returns NULL, since the function reads PyHeapTypeObject.ht_module which only exists in heap types:

        if(!_PyType_HasFeature((PyTypeObject *)super, Py_TPFLAGS_HEAPTYPE)) {
            // Static types in the MRO need to be skipped
            continue;
        }

@erlend-aasland

This comment was marked as outdated.

* Add references to static types to _PyIO_State:

  * PyBufferedIOBase_Type
  * PyBytesIOBuffer_Type
  * PyIncrementalNewlineDecoder_Type
  * PyRawIOBase_Type
  * PyTextIOBase_Type

* Add the defining class to methods:

  * _io.BytesIO.getbuffer()
  * _io.FileIO.close()

* Add get_io_state_by_cls() function.
* Add state parameter to _textiowrapper_decode()
* _io_TextIOWrapper___init__() now sets self->state before calling
  _textiowrapper_set_decoder().

Co-Authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@vstinner
Copy link
Member Author

vstinner commented May 5, 2023

Using APIs to get the module state from a type works on heap types like _io.FileIO, but failed on _io.WindowsConsoleIO which remains a static type with my PR.

I fixed my PR by reverting changes related to WindowsConsoleIO: this type should be modified in a following PR.

@vstinner
Copy link
Member Author

vstinner commented May 5, 2023

I reverted changes related to PyWindowsConsoleIO_Type and _io._WindowsConsoleIO.close().

@erlend-aasland
Copy link
Contributor

I prefer doing Windows only changes in separate PRs. Everytime I touch Windows stuff, something weird happen :)

@vstinner
Copy link
Member Author

vstinner commented May 5, 2023

Aha, now the CI pass. I would feel more comfortable with a review. @erlend-aasland: you can also review if you want, to check if i picked the right parts or tour code 😁

@corona10 corona10 added the 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section label May 5, 2023
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @corona10 for commit dfc1e9e 🤖

If you want to schedule another build, you need to add the 🔨 test-with-refleak-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section label May 5, 2023
Copy link
Member

@corona10 corona10 left a comment

Choose a reason for hiding this comment

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

lgtm, let's wait refleak bot.

@vstinner
Copy link
Member Author

vstinner commented May 5, 2023

I was not sure that it works on static types... but it seems like it does :-) I didn't get any crash.

I missed something: Erlend already converted multiple _io types to heap types: see commit c00faf7. Types used in this PR are heap types, that's why it just works!

@vstinner
Copy link
Member Author

vstinner commented May 5, 2023

let's wait refleak bot

Thanks for running these jobs. I ran refleaks locally on test_io, but i don't trust myself 🤣 So having reliable buildbot checks sound safer.

I will merge my PR once the Refleaks jobs pass, unless someome wants me to wait for their second review.

@erlend-aasland
Copy link
Contributor

No refleaks; good bot 🤖 ✅

@vstinner vstinner merged commit c840291 into python:main May 5, 2023
@vstinner vstinner deleted the io_prepare branch May 5, 2023 23:54
jbower-fb pushed a commit to jbower-fb/cpython-jbowerfb that referenced this pull request May 8, 2023
* Add references to static types to _PyIO_State:

  * PyBufferedIOBase_Type
  * PyBytesIOBuffer_Type
  * PyIncrementalNewlineDecoder_Type
  * PyRawIOBase_Type
  * PyTextIOBase_Type

* Add the defining class to methods:

  * _io.BytesIO.getbuffer()
  * _io.FileIO.close()

* Add get_io_state_by_cls() function.
* Add state parameter to _textiowrapper_decode()
* _io_TextIOWrapper___init__() now sets self->state before calling
  _textiowrapper_set_decoder().

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
Sign up for free to 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.

4 participants