Skip to content

sync: 验证 OnePlus 13 调度冲突解决第四轮 - #14

Merged
Zhanfg merged 6 commits into
6.6-finalfrom
sync/resolution-pass4-scheduler-16.0.9.401
Jul 29, 2026
Merged

Zhanfg merged 6 commits into
6.6-finalfrom
sync/resolution-pass4-scheduler-16.0.9.401

Conversation

@Zhanfg

@Zhanfg Zhanfg commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

调度架构

本轮明确采用:

Default: fair / wait
Optional: HMBIRD / 风驰
Official SCHED_CLASS_EXT / SCX: disabled
Official CONFIG_SLIM_SCHED: disabled

HMBIRD 与官方 SCX 均使用策略编号 7,并改写相同的 fork、tick、pick-next、setscheduler、cgroup 与 idle 接口,不能直接共存。

第四轮范围

  • 处理 17 个调度相关冲突路径。
  • 10 个文件统一保留 HMBIRD 侧冲突块。
  • 3 个 Android trace hook 文件采用官方侧。
  • 4 个混合文件使用逐冲突块 JSON 计划组合处理。
  • 新增 resolve_merge_plan.py,严格校验每个文件的冲突块数量。

预期结果

116 initial conflicts
85 after pass 1
67 after pass 2
50 after pass 3
33 after scheduler pass 4

安全边界

本 PR 只加入调度解决规则、验证脚本和架构说明,不生成最终源码 merge commit。剩余冲突、完整 OKI 构建、ABI/KMI 和真机验证继续阻断 PR #6。

@Zhanfg
Zhanfg merged commit 9cb175e into 6.6-final Jul 29, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant