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

system/cpuload: Fix application's Make.defs location #3002

Merged
merged 1 commit into from
Feb 20, 2025

Conversation

tmedicci
Copy link
Contributor

Summary

  • system/cpuload: Fix application's Make.defs location

The PR #2974 first moved it to testing/sched/cpuload and the Make.defs was adjusted accordingly. However, during the review process, it was moved to system/cpuload folder, but its Make.defs wasn't updated. This PR fixes it.

Impact

Impact on user: YES. It enables users to build cpuload app.

Impact on build: YES. Now we can build it.

Impact on hardware: NO.

Impact on documentation: NO.

Impact on security: NO.

Impact on compatibility: NO.

Testing

Test it for ESP32-S3's nsh defconfig, for instance:

Building

make -j distclean && ./tools/configure.sh esp32s3-devkit:nsh && kconfig-tweak -e SCHED_CPULOAD_SYSCLK && kconfig-tweak -e CONFIG_SYSTEM_CPULOAD && make olddefconfig && make flash ESPTOOL_BINDIR=./ ESPTOOL_PORT=/dev/ttyUSB0 -s -j$(nproc) && minicom -D /dev/ttyUSB0

Running

Run cpuload on NSH:

nsh> cpuload &
cpuload [2:253]
nsh> ps
  PID GROUP PRI POLICY   TYPE    NPX STATE    EVENT     SIGMASK            STACK    CPU COMMAND
    0     0   0 FIFO     Kthread   - Ready              0000000000000000 0003056 88.0% Idle_Task
    1     1 100 RR       Task      - Running            0000000000000000 0003024  0.0% nsh_main
    2     2 253 RR       Task      - Waiting  Signal    0000000000000000 0002016 11.9% cpuload
nsh> ps
  PID GROUP PRI POLICY   TYPE    NPX STATE    EVENT     SIGMASK            STACK    CPU COMMAND
    0     0   0 FIFO     Kthread   - Ready              0000000000000000 0003056 57.4% Idle_Task
    1     1 100 RR       Task      - Running            0000000000000000 0003024  0.0% nsh_main
    2     2 253 RR       Task      - Waiting  Signal    0000000000000000 0002016 42.5% cpuload

Results

Before applying this patch, it fails to build with:

make[3]: *** /home/tiago/Documents/work/espressif/projects/nuttx/nuttxspace_alfa/apps/testing/sched/cpuload: No such file or directory.  Stop.

Now, it's been fixed ;)

The PR apache#2974 first moved
it to `testing/sched/cpuload` and the Make.defs was adjusted
accordingly. However, during the review process, it was moved to
`system/cpuload` folder, but its Make.defs wasn't updated. This
commit fixes it.

Signed-off-by: Tiago Medicci <[email protected]>
Copy link

@cederom cederom left a comment

Choose a reason for hiding this comment

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

Thank you @tmedicci good catch! :-)

@raiden00pl raiden00pl merged commit ece1480 into apache:master Feb 20, 2025
37 checks passed
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.

5 participants