You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
[components][dfs]Split F_GETFL/F_SETFL from RT_DEVICE_CTRL_* via args… - #11869
👋 感谢您对 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).
Use workflow from 保持默认分支(通常为 master)
Keep the default branch (usually master) in Use workflow from
在 branch 输入框填写 PR 分支 fix_5769
Enter PR branch fix_5769 in the branch field
设置需排除的文件/目录(目录请以"/"结尾)
Set files/directories to exclude (directories should end with "/")
等待工作流完成 | Wait for the workflow to complete
格式化后的代码将作为独立提交推送至你的分支。
The formatting changes will be pushed to your branch as a separate commit.
完成后,提交将自动更新至 fix_5769 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix_5769 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!
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
… nullness
拉取/合并请求描述:(PR description)
[
为什么提交这份PR (why to submit this PR)
F_GETFL (=3)在数值上与RT_DEVICE_CTRL_CONFIG (=3)撞码,F_SETFL (=4)与RT_DEVICE_CTRL_CLOSE (=4)撞码。两套 cmd 共享同一个int参数,POSIX 路径下(fcntl→dfs_file_ioctl/dfs_file_fcntl→fops->ioctl)会被 driver 误解释。具体表现:
FT_REGULAR/FT_DEVICEvnode 在dfs_file_ioctl内已经拦截 F_GETFL/F_SETFL,但FT_SOCKET仍会 fall-through;dfs_v2 的dfs_file_ioctl是 fops 的纯 passthrough,没有任何拦截,串口等 driver 在 LWP 关闭时会把F_GETFL误当成RT_DEVICE_CTRL_CONFIG实际重配硬件。fcntl调用 RT-Thread device control cmd 时被静默截胡,无法到达 driver。你的解决方案是什么 (what is your solution)
利用 POSIX 与 RT-Thread 在两个 cmd 上对
args参数的互补要求做 disambiguator,无需改动 cmd 编码:args == NULL意为struct *改动文件:
components/dfs/dfs_v1/src/dfs_file.c::dfs_file_ioctlcase F_GETFL:args != NULL && fops->ioctl→ 转发 driver(RTT CONFIG);否则返回fd->flags(POSIX)。case F_SETFL:args == NULL && fops->ioctl→ 转发 driver(RTT CLOSE);否则改fd->flags(POSIX)。components/dfs/dfs_v2/src/dfs_file.c::dfs_file_fcntlF_GETFL/F_SETFL分支按相同镜像逻辑改造,保留原 socket 通知路径(FT_SOCKET 仍调fops->ioctl(file, F_SETFL, …)更新sock->flags)。角落场景:
fcntl(fd, F_SETFL, 0)与rt_device_control(dev, RT_DEVICE_CTRL_CLOSE, NULL)在 variadic 协议下位模式相同,无法稳定判别。文档建议避免F_SETFL(0),需要清非阻塞时用fcntl(fd, F_SETFL, fd->flags & ~O_NONBLOCK)。请提供验证的bsp和config (provide the config and bsp)
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality:
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up