Skip to content

utest: fix hooklist testcase reinit#11521

Merged
Rbb666 merged 1 commit into
RT-Thread:masterfrom
CYFS3:fix/utest-hooklist-reinit
Jun 26, 2026
Merged

utest: fix hooklist testcase reinit#11521
Rbb666 merged 1 commit into
RT-Thread:masterfrom
CYFS3:fix/utest-hooklist-reinit

Conversation

@CYFS3

@CYFS3 CYFS3 commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

为什么提交这份 PR (why to submit this PR)

修复 core.hooklist 用例在重复运行时偶现 rt_object_init 中 obj != object 断言失败的问题。

根因是测试中复用了静态线程对象 thr_tobe_inited。原实现通过 rt_thread_detach() 后延时 1 tick 等待回收，但 detach 的实际 object detach 依赖 defunct 回收时机，重复执行时可能在对象还留在线程对象链表中时再次调用 rt_thread_init()，从而触发重复对象断言。

你的解决方案是什么 (what is your solution)

为测试线程增加同步清理逻辑：测试线程从未启动，因此在清理时先关闭线程内部 timer，再同步从 object 容器中 detach，避免依赖异步 defunct 回收。

同时在 testcase init/cleanup 和 hook 注册前清理残留 hook 节点，保证重复运行 core.hooklist 时测试状态干净，不影响原本验证 rt_thread_inited_sethook() / rt_thread_inited_rmhook() 的目的。

请提供验证的 bsp 和 config (provide the config and bsp)

  • BSP: bsp/qemu-vexpress-a9

  • .config:

    • CONFIG_RT_USING_SMART=y
    • CONFIG_RT_USING_HOOKLIST=y
    • CONFIG_RT_USING_UTEST=y
    • CONFIG_RT_USING_UTESTCASES=y
    • CONFIG_RT_UTEST_HOOKLIST=y

  • action: 本地验证

    • Windows 工具链：arm-linux-musleabi-gcc 12.2.0
    • 编译：scons -j1 --strict 通过
    • QEMU：qemu-system-arm -M vexpress-a9 -kernel rtthread.bin -nographic -sd sd.bin
    • 运行：utest_run core.hooklist 10，10 轮全部通过

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I have considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确，包括缩进空格，命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有冗余代码，代码尽量精简，不包含 #if 0 代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的，并且不会影响到其他软件组件代码或 BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I have commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用 formatting 等源码格式化工具确保格式符合 RT-Thread 代码规范 This PR complies with RT-Thread code specification
  • 如果是新增 BSP, 已经添加 ci 检查到 .github/ALL_BSP_COMPILE.json

@github-actions

github-actions Bot commented Jun 26, 2026

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).

🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • 设置需排除的文件/目录（目录请以"/"结尾）
    Set files/directories to exclude (directories should end with "/")
  • 将目标分支设置为 \ Set the target branch to：fix/utest-hooklist-reinit
  • 设置PR number为 \ Set the PR number to：11521
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后，提交将自动更新至 fix/utest-hooklist-reinit 分支，关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix/utest-hooklist-reinit branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们，再次感谢您的贡献！💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions github-actions Bot added the Kernel PR has src relate code label Jun 26, 2026
@github-actions

github-actions Bot commented Jun 26, 2026 •
edited
Loading

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: kernel

Reviewers: GorrayLi ReviewSun hamburger-os lianux-mm wdfk-prog xu18838022837

Changed Files (Click to expand)
  • src/utest/hooklist_tc.c

📊 Current Review Status (Last Updated: 2026-06-26 15:59 CST)

  • ⌛ GorrayLi Pending Review
  • ⌛ ReviewSun Pending Review
  • ⌛ hamburger-os Pending Review
  • ⌛ lianux-mm Pending Review
  • ⌛ wdfk-prog Pending Review
  • ⌛ xu18838022837 Pending Review

📝 Review Instructions

  1. 维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
    Maintainers can refresh the review status by clicking here: 🔄 Refresh Status

  2. 确认审核通过后评论 LGTM/lgtm
    Comment LGTM/lgtm after confirming approval

  3. PR合并前需至少一位维护者确认
    PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

@CYFS3 CYFS3 marked this pull request as ready for review June 26, 2026 07:37
@CYFS3

CYFS3 commented Jun 26, 2026

Copy link
Copy Markdown
Contributor Author
image 本地测试100轮通过

Rbb666
Rbb666 reviewed Jun 26, 2026
View reviewed changes
Comment thread src/utest/hooklist_tc.c Outdated

rt_thread_detach(&thr_tobe_inited);
rt_thread_mdelay(1); /* wait recycling done */
cleanup_thr_tobe_inited();

@Rbb666 Rbb666 Jun 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

线程有 cleanup 回调，可以设置下，在回调里面处理

@CYFS3 CYFS3 Jun 26, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

线程有 cleanup 回调，可以设置下，在回调里面处理

down

@CYFS3 CYFS3 force-pushed the fix/utest-hooklist-reinit branch from 0993903 to 428d18f Compare June 26, 2026 07:59
@CYFS3

CYFS3 commented Jun 26, 2026

Copy link
Copy Markdown
Contributor Author
image

@github-actions

github-actions Bot commented Jun 26, 2026

Copy link
Copy Markdown

MemBrowse Memory Report

No memory changes detected for:

@Rbb666 Rbb666 merged commit caca34c into RT-Thread:master Jun 26, 2026
105 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Rbb666 Rbb666 Rbb666 approved these changes

Assignees

No one assigned

Labels

Kernel PR has src relate code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@CYFS3 @Rbb666