top: Replace MICROPY_PORT_BUILTIN_MODULES with MP_REGISTER_MODULE. #8566

jimmo · 2022-04-20T11:46:01Z

No need to have two different ways of registering modules. Simplifies mpconfigport.h and makes it consistent across all ways of defining modules (built-in, extmod, port, board, user-c-module).

It might be good to extend makemodulesdefs.py to also handle module constants (and maybe root pointers?) in the future.

dlech · 2022-04-21T23:46:42Z

py/makemoduledefs.py

        print(
            (
                "#if ({enabled_define})\n"
                "    extern const struct _mp_obj_module_t {obj_module};\n"
+                "    #undef {mod_def}\n"


Does this mean that if two or more modules with the same name are enabled, then the last one (according to sorted()) "wins"?

dlech · 2022-04-22T13:49:03Z

Not a big deal, but is seems like in the vast majority of the cases, the 3rd parameter is 1 or could be 1, so perhaps we should just drop this parameter?

dpgeorge · 2022-04-22T14:04:09Z

Not a big deal, but is seems like in the vast majority of the cases, the 3rd parameter is 1 or could be 1, so perhaps we should just drop this parameter?

You mean the #if config option to enable the module? That is definitely needed so that ports can selectively enable the modules (if the 3rd param was 1 then all modules would always be enabled on all builds).

dlech · 2022-04-22T14:06:57Z

OK, maybe I misunderstood how the code generator works.

jimmo · 2022-04-22T14:08:49Z

You mean the #if config option to enable the module? That is definitely needed so that ports can selectively enable the modules (if the 3rd param was 1 then all modules would always be enabled on all builds).

In most cases the MP_REGISTER_MODULE(..., ..., X) is already inside an #if X, so it could well be just 1. I followed the existing pattern from modarray.c.

I could try and come up with a varargs macro that makes that last parameter optional (default to 1).

dlech · 2022-04-22T14:14:40Z

I could try and come up with a varargs macro that makes that last parameter optional (default to 1).

There are probably better ways to spend your time. 😉

In most cases the MP_REGISTER_MODULE(..., ..., X) is already inside an #if X, so it could well be just 1. I followed the existing pattern from modarray.c.

This is why I thought we could just eliminate the parameter altogether. But if there are a few special cases where this doesn't work and can't be worked around by adding a #if then we need the 3rd parameter.

dpgeorge · 2022-05-12T07:33:06Z

Note that MP_REGISTER_MODULE() is not scanned if the file it is in is #include'd. Eg defining a custom board that has a file board.c that has:

#include "common_board_files/modfoo.c`
...

And then modfoo.c uses MP_REGISTER_MODULE(foo), this will not be picked up. At the moment the way around this issue is to add another MP_REGISTER_MODULE(foo) in board.c (in this example).

jimmo · 2022-05-13T06:31:25Z

I've rebased this and updated the renesas-ra port to use it.

Note that MP_REGISTER_MODULE() is not scanned if the file it is in is #include'd.

*blinks*

...I guess that's a good argument for making makemoduledefs.py run on the qstr pre-processed code (like error compression does). I think that's a good idea anyway, and it lets us solve the third-argument problem that was discussed above. I will do that in a follow-up PR.

ports/nrf/boards/microbit/modules/boardmodules.mk

ports/stm32/mpconfigport.h

For example, ussl can come from axtls or mbedtls. If neither are enabled then don't try and set an empty definition twice, and only include it once in MICROPY_REGISTERED_MODULES. Signed-off-by: Jim Mussared <[email protected]>

Signed-off-by: Jim Mussared <[email protected]>

_onewire, socket, and network were previously added by the port rather than objmodule.c. Signed-off-by: Jim Mussared <[email protected]>

Signed-off-by: Jim Mussared <[email protected]>

This functionality is now replaced with MP_REGISTER_MODULE. Signed-off-by: Jim Mussared <[email protected]>

dpgeorge · 2022-05-19T05:40:44Z

Thanks for updating, now merged.

robert-hh · 2022-05-20T08:42:54Z

@jimmo As consequence of this and the previous related change, ports which use lwip do not have a usocket module any more registered, causing some tests and uasyncio/stream.py to fail.
See also #8681

jimmo · 2022-05-20T08:47:48Z

@jimmo As consequence of this and the previous related change, ports which use lwip do not have a usocket module any more registered, causing some tests and uasyncio/stream.py to fail.

@robert-hh Thanks. I will take a look ASAP.

jimmo mentioned this pull request Apr 21, 2022

Allow Unix variant to override MICROPY_EVENT_POLL_HOOK #8278

Closed

dlech reviewed Apr 21, 2022

View reviewed changes

dpgeorge added the py-core Relates to py/ directory in source label Apr 29, 2022

dpgeorge mentioned this pull request May 6, 2022

py/modsys: Add sys.builtin_module_names #4468

Closed

jimmo force-pushed the module-register branch from 894af03 to 3afd625 Compare May 13, 2022 06:30

dpgeorge reviewed May 18, 2022

View reviewed changes

ports/nrf/boards/microbit/modules/boardmodules.mk Outdated Show resolved Hide resolved

dpgeorge reviewed May 18, 2022

View reviewed changes

ports/stm32/mpconfigport.h Show resolved Hide resolved

jimmo added 16 commits May 18, 2022 20:49

extmod: Make extmod modules use MP_REGISTER_MODULE.

4eab44a

Signed-off-by: Jim Mussared <[email protected]>

py: Make builtin modules use MP_REGISTER_MODULE.

d8d3e6a

Signed-off-by: Jim Mussared <[email protected]>

extmod: Make port-included extmod modules use MP_REGISTER_MODULES.

bb794f0

_onewire, socket, and network were previously added by the port rather than objmodule.c. Signed-off-by: Jim Mussared <[email protected]>

stm32: Make port-specific modules use MP_REGISTER_MODULE.

0a92469

Signed-off-by: Jim Mussared <[email protected]>

esp32: Make port-specific modules use MP_REGISTER_MODULE.

24127a4

Signed-off-by: Jim Mussared <[email protected]>

esp8266: Make port-specific modules use MP_REGISTER_MODULE.

4274b34

Signed-off-by: Jim Mussared <[email protected]>

mimxrt: Make port-specific modules use MP_REGISTER_MODULE.

7d79fd7

Signed-off-by: Jim Mussared <[email protected]>

nrf: Make port-specific modules use MP_REGISTER_MODULE.

f67ac90

Signed-off-by: Jim Mussared <[email protected]>

pic16bit: Make port-specific modules use MP_REGISTER_MODULE.

60c5968

Signed-off-by: Jim Mussared <[email protected]>

rp2: Make port-specific modules use MP_REGISTER_MODULE.

62f00a4

Signed-off-by: Jim Mussared <[email protected]>

samd: Make port-specific modules use MP_REGISTER_MODULE.

c3f7424

Signed-off-by: Jim Mussared <[email protected]>

teensy: Make port-specific modules use MP_REGISTER_MODULE.

d0307e7

Signed-off-by: Jim Mussared <[email protected]>

unix: Make port-specific modules use MP_REGISTER_MODULE.

63431a5

Signed-off-by: Jim Mussared <[email protected]>

zephyr: Make port-specific modules use MP_REGISTER_MODULE.

ec2fe5d

Signed-off-by: Jim Mussared <[email protected]>

javascript: Make port-specific modules use MP_REGISTER_MODULE.

9e4da23

Signed-off-by: Jim Mussared <[email protected]>

jimmo added 3 commits May 18, 2022 20:57

cc3200: Make port-specific modules use MP_REGISTER_MODULE.

1d33ceb

Signed-off-by: Jim Mussared <[email protected]>

renesas-ra: Make port-specific modules use MP_REGISTER_MODULE.

c2d889f

Signed-off-by: Jim Mussared <[email protected]>

py: Remove support for MICROPY_PORT_BUILTIN_MODULES.

8b201dc

This functionality is now replaced with MP_REGISTER_MODULE. Signed-off-by: Jim Mussared <[email protected]>

jimmo force-pushed the module-register branch from 3afd625 to 8b201dc Compare May 18, 2022 10:58

dpgeorge merged commit 8b201dc into micropython:master May 19, 2022

jimmo mentioned this pull request May 20, 2022

extmod: Revert accidental usocket->socket rename. #8684

Closed

dpgeorge mentioned this pull request May 31, 2022

py: Change makemoduledefs process so it uses output of qstr extraction. #8714

Merged

dlech mentioned this pull request Jul 1, 2022

replace MICROPY_PORT_ROOT_POINTERS with MP_REGISTER_ROOT_PONTER #8849

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

top: Replace MICROPY_PORT_BUILTIN_MODULES with MP_REGISTER_MODULE. #8566

top: Replace MICROPY_PORT_BUILTIN_MODULES with MP_REGISTER_MODULE. #8566

Uh oh!

jimmo commented Apr 20, 2022

Uh oh!

dlech Apr 21, 2022

Uh oh!

dlech commented Apr 22, 2022

Uh oh!

dpgeorge commented Apr 22, 2022

Uh oh!

dlech commented Apr 22, 2022

Uh oh!

jimmo commented Apr 22, 2022

Uh oh!

dlech commented Apr 22, 2022

Uh oh!

dpgeorge commented May 12, 2022

Uh oh!

jimmo commented May 13, 2022

Uh oh!

Uh oh!

Uh oh!

dpgeorge commented May 19, 2022

Uh oh!

robert-hh commented May 20, 2022 •

edited

Loading

Uh oh!

jimmo commented May 20, 2022

Uh oh!

Uh oh!

Uh oh!

top: Replace MICROPY_PORT_BUILTIN_MODULES with MP_REGISTER_MODULE. #8566

top: Replace MICROPY_PORT_BUILTIN_MODULES with MP_REGISTER_MODULE. #8566

Uh oh!

Conversation

jimmo commented Apr 20, 2022

Uh oh!

dlech Apr 21, 2022

Choose a reason for hiding this comment

Uh oh!

dlech commented Apr 22, 2022

Uh oh!

dpgeorge commented Apr 22, 2022

Uh oh!

dlech commented Apr 22, 2022

Uh oh!

jimmo commented Apr 22, 2022

Uh oh!

dlech commented Apr 22, 2022

Uh oh!

dpgeorge commented May 12, 2022

Uh oh!

jimmo commented May 13, 2022

Uh oh!

Uh oh!

Uh oh!

dpgeorge commented May 19, 2022

Uh oh!

robert-hh commented May 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jimmo commented May 20, 2022

Uh oh!

Uh oh!

robert-hh commented May 20, 2022 •

edited

Loading