AskaEth
7c7d891570
脏工作区现场收编：devdocs/local/m6_44_45_dirty_tracked.patch(46 个已跟踪文本文件,
+3090/-585, 已对 M6.43 基线干净适配) + m6_44_45_untracked_src.tar.gz 中 patch_v2/ 下
13 个新增源文件, 合成单个提交, 内容与容器工作树(R3ProII/patch_v2)逐字节一致。
- reader 章节: 新增 core/rdchapter.{h,c} — TXT 章节规范解析器, 扫描 512KB 码位对齐段文件
逐段流式识别标题行(行首缩进≤4/显示宽≤40/行内标点≤1 三重约束防误判), 输出标题+全书字符
偏移+段号/段内偏移+阿拉伯章号(中文数字归一), 首章前内容归"卷首"; book/reader/rdenc/
rdlayout/settings 接入章节跳转与进度锚点, 附 chapter_smoke/turn_repro/build_turn_repro.sh
- key_router 按键路由: 新增 meow_launcherd/key_router.{h,c} — launcher-UI 页物理键统一路由
(P1 仅音量键), 把读取边沿+防抖+长按 held+ramp 推进从 5 个会话收敛为进程内单开;
各页每圈 key_router_pump() 取防抖后边沿, 动作(调音量/光标导航)仍由调用页决定,
保留 run_menu 的 meow_mode 分支; App 前台 volume_page 武装时边沿抑制;
main_menu/now_playing/notif_center/settings_page/subpage 接入, 附 test_key_router_vol/test_np_keys
- WiFi 连接修复: meow_netmgrd connect 有界等待 wpa_state=COMPLETED(普通 10s/隐藏网络 15s,
env 可调)修设置页连接无响应; list_networks/scan_results 的 \xNN 转义还原始字节, 修中文 SSID
永不命中致新建同名 open 记录顶影; launcher netmgr_ipc 配读超时; 附 test_wifi_connect(桩
wpa_cli 驱动 static wifi_connect_ex), test_netmgrd.sh 补用例; wifi_page 同步
- ncm bench: 新增 bench/lyric_sim.c、bench/plpage_sim.c, vol_sync_sim 与 ncm core/app 同步
- SDK IME 修复: shift 大小写、K_ENTER 只提交不关、阻塞 IME 循环喂 on_tick 不被遮挡、
IME 打开 ~200ms TAP 冷却窗吞 stray-TAP; 附 sdk/test_ime_fix.c
- 同期: meow_audiod 音量异步 ACK 线程(代际防 fd/槽复用竞态)、watchdog 音量收编(首选 audiod
权威, settings.conf 覆盖路径)、panel 文件搜索(F1-④)与蓝牙只读详情(F1-③)、各类 build 脚本同步
范围红线: third_party/legado-E-main 原开发者未跟踪, 本次不入库(保留 devdocs/local tar 参考);
二进制不入库(后续重编); devdocs/ 不入库。59 文件全部在 patch_v2/ 下, 无 third_party/devdocs。
验证: git apply --check 干净; 59 文件 md5 与容器 patch_v2 逐一比对 59/59 一致(含
key_router.c/rdchapter.c/meow_ui_ime.c/test_wifi_connect.c 抽查); 可执行位保守
(check_lgpl_release.sh 100755, build_turn_repro.sh 100644 与容器一致)。
151 lines
9.1 KiB
Bash
Executable File
151 lines
9.1 KiB
Bash
Executable File
#!/bin/bash
|
||
# bench/... 各 sim 的宿主编译+运行（命令取自各 sim 文件头注释；agent 308 内存瘦身回归用）。
|
||
# 在 ncm_app 目录下运行。
|
||
set -e
|
||
cd "$(dirname "$0")"
|
||
|
||
CC=gcc
|
||
INC="-DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd"
|
||
VINC="-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include -Ivendor/mbedtls/include"
|
||
# 部分 sim 的 include 路径写法用 vendor/（window/search），有的用 ../vendor/（bench 内部相对），
|
||
# 统一用绝对相对路径（项目根 pub）。这里按各 sim 头部原样拼接。
|
||
|
||
run_sim () { echo "===== $1 ====="; ./$1; echo "[$1 exit=$?]"; }
|
||
|
||
echo "==> build stream_sim"
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include \
|
||
-c bench/stream_sim.c -o /tmp/ss.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include \
|
||
-c app/play/stream_src.c -o /tmp/ss_src.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include \
|
||
-c app/play/decoder.c -o /tmp/ss_dec.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include \
|
||
-c app/play/audio_out.c -o /tmp/ss_ao.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include \
|
||
-c core/ncm_cache.c -o /tmp/ss_cache.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include \
|
||
-c core/ncm_common.c -o /tmp/ss_common.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include \
|
||
-c core/ncm_http.c -o /tmp/ss_http.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include \
|
||
-c core/ncm_json.c -o /tmp/ss_json.o
|
||
gcc -O2 -c -Ivendor/minimp3 app/play/minimp3_impl.c -o /tmp/ss_mp3.o
|
||
gcc -O2 -c -Ivendor/dr_flac app/play/dr_flac_impl.c -o /tmp/ss_flac.o
|
||
gcc -O2 -o stream_sim /tmp/ss.o /tmp/ss_src.o /tmp/ss_dec.o /tmp/ss_ao.o /tmp/ss_cache.o /tmp/ss_mp3.o /tmp/ss_flac.o -lpthread -lm
|
||
run_sim stream_sim
|
||
|
||
echo "==> build player_flow_sim"
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd -Icore -Ivendor/jsmn -Ivendor/mbedtls/include \
|
||
-c bench/player_flow_sim.c -o /tmp/pf.o
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd \
|
||
-Icore -Ivendor/jsmn -Ivendor/mbedtls/include -Ivendor/minimp3 -Ivendor/dr_flac -Ivendor/mbedtls/include -c app/play/player_manager.c -o /tmp/pf_pm.o
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd \
|
||
-Icore -c app/play/stream_src.c -o /tmp/pf_ss.o
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd \
|
||
-Icore -c app/play/mem_watch.c -o /tmp/pf_mw.o # player_manager 引用（边播边监控取证，agent 32bit OOM）
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd -Icore \
|
||
-c ../sdk/meow_cachegov.c -o /tmp/pf_cg.o # player_manager 引 meow_cachegov_*（page-cache 治理 A）
|
||
gcc -O2 -Wl,--gc-sections -o player_flow_sim /tmp/pf.o /tmp/pf_pm.o /tmp/pf_ss.o /tmp/pf_mw.o /tmp/pf_cg.o -lpthread -lm
|
||
run_sim player_flow_sim
|
||
|
||
echo "==> build mem_watch_sim（边播边监控阈值/滞回/调度器，宿主桩驱动；agent 32bit OOM。"
|
||
echo " mem_release_sim 无累积断言在 bench/ 头注释手动构建：需预生成 24bit flac 素材）"
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd \
|
||
-c bench/mem_watch_sim.c -o /tmp/mw.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -I../sdk -c app/play/mem_watch.c -o /tmp/mw_mod.o
|
||
gcc -O2 -o mem_watch_sim /tmp/mw.o /tmp/mw_mod.o -lpthread -lm
|
||
run_sim mem_watch_sim
|
||
|
||
echo "==> build window_sim"
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd -Icore -Ivendor/jsmn -Ivendor/mbedtls/include \
|
||
-c bench/window_sim.c -o /tmp/ws.o
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd \
|
||
-Icore -Ivendor/jsmn -Ivendor/mbedtls/include -c app/logic/appstate.c -o /tmp/ws_app.o
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd \
|
||
-Icore -Ivendor/jsmn -Ivendor/mbedtls/include -c app/logic/songmeta.c -o /tmp/ws_meta.o
|
||
gcc -O2 -Wl,--gc-sections -o window_sim /tmp/ws.o /tmp/ws_app.o /tmp/ws_meta.o \
|
||
out/core-host/ncm_apicache.o -lpthread # appstate.c 调 ncm_apicache_init/clear（自包含模块）
|
||
run_sim window_sim
|
||
|
||
echo "==> build plpage_sim（歌单页懒加载分页 + 加载后列表刷新；真实 playlist.c 全链路 + 宿主 SDK，0 网络。"
|
||
echo " 依赖 out/host/sdk_*.o：若缺请先跑 build_ncm_host.sh）"
|
||
PPINC="-DMEOW_UI_HOST_TEST -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd -Icore -Ivendor/jsmn -Ivendor/mbedtls/include -Ivendor/minimp3 -Ivendor/dr_flac"
|
||
for f in bench/plpage_sim.c app/ui/playlist.c app/logic/appstate.c app/logic/songmeta.c app/ui/chrome.c app/ui/ncm_colors.c; do
|
||
b=$(basename "$f" .c)
|
||
gcc -O2 -Wall -Wextra -ffunction-sections -fdata-sections $PPINC -c "$f" -o /tmp/pp_$b.o
|
||
done
|
||
gcc -O2 -Wl,--gc-sections -Wl,--wrap=meow_ui_paint_full -o plpage_sim \
|
||
/tmp/pp_plpage_sim.o /tmp/pp_playlist.o /tmp/pp_appstate.o /tmp/pp_songmeta.o /tmp/pp_chrome.o /tmp/pp_ncm_colors.o \
|
||
out/host/sdk_*.o -lz -lpthread -lm
|
||
run_sim plpage_sim
|
||
|
||
echo "==> build search_sim"
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd -Icore -Ivendor/jsmn \
|
||
-c bench/search_sim.c -o /tmp/sh.o
|
||
gcc -O2 -ffunction-sections -DJSMN_HEADER -I. -I../sdk -I../meow_launcherd \
|
||
-Icore -Ivendor/jsmn -c app/logic/appstate.c -o /tmp/sh_app.o
|
||
gcc -O2 -Wl,--gc-sections -o search_sim /tmp/sh.o /tmp/sh_app.o \
|
||
out/core-host/ncm_apicache.o -lpthread # appstate.c 调 ncm_apicache_init/clear
|
||
run_sim search_sim
|
||
|
||
echo "==> build cache_evict_sim"
|
||
gcc -O2 -DJSMN_HEADER -I. -Icore -Ivendor/mbedtls/include -c bench/cache_evict_sim.c -o /tmp/ce.o
|
||
gcc -O2 -DJSMN_HEADER -I. -Icore -Ivendor/mbedtls/include -c core/ncm_cache.c -o /tmp/ce_cache.o
|
||
gcc -O2 -o cache_evict_sim /tmp/ce.o /tmp/ce_cache.o -lpthread
|
||
run_sim cache_evict_sim
|
||
|
||
echo "==> build apicache_sim (风控加固 §1 接口级响应缓存；0 真实网络——ncm_http 计数桩)"
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/mbedtls/include \
|
||
-c bench/apicache_sim.c -o /tmp/ac.o
|
||
# 真实 core（api/req/crypto/json/common/apicache）+ 网络层计数桩（apicache_sim 已含 ncm_http_request 桩，
|
||
# 故不链 ncm_http.o）+ jsmn + 宿主 mbedtls；核心对象从 out/core-host/*.o 取（含 ncm_apicache.o）。
|
||
gcc -O2 -o apicache_sim /tmp/ac.o \
|
||
$(ls out/core-host/ncm_api.o out/core-host/ncm_req.o out/core-host/ncm_crypto.o \
|
||
out/core-host/ncm_json.o out/core-host/ncm_common.o out/core-host/ncm_apicache.o) \
|
||
out/core-host/jsmn_impl.o \
|
||
-Lout/mbedtls/host -lmbedtls -lmbedx509 -lmbedcrypto -lpthread -lm
|
||
run_sim apicache_sim
|
||
|
||
echo "==> build cookie_refresh_sim (§NEW 续期端点语义；0 真实网络——ncm_http 计数桩)"
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/mbedtls/include \
|
||
-c bench/cookie_refresh_sim.c -o /tmp/crs.o
|
||
gcc -O2 -o cookie_refresh_sim /tmp/crs.o \
|
||
$(ls out/core-host/ncm_login.o out/core-host/ncm_req.o out/core-host/ncm_crypto.o \
|
||
out/core-host/ncm_json.o out/core-host/ncm_common.o out/core-host/ncm_store.o \
|
||
out/core-host/v_qrcodegen.o) \
|
||
out/core-host/jsmn_impl.o \
|
||
-Lout/mbedtls/host -lmbedtls -lmbedx509 -lmbedcrypto -lpthread -lm
|
||
run_sim cookie_refresh_sim
|
||
|
||
echo "==> build account_cookie_sim (§NEW 临期续期决策；真实 account.c + 外围桩，0 真实网络)"
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Iapp -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/qrcodegen/c -Ivendor/mbedtls/include \
|
||
-c app/logic/account.c -o /tmp/acs_account.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Iapp -Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/jsmn -Ivendor/qrcodegen/c -Ivendor/mbedtls/include \
|
||
-c bench/account_cookie_sim.c -o /tmp/acs.o
|
||
gcc -O2 -o account_cookie_sim /tmp/acs.o /tmp/acs_account.o -lpthread -lm
|
||
run_sim account_cookie_sim
|
||
|
||
echo "==> build http_truncate_sim (ncm_http 截断守卫宿主测试；mock mbedtls 传输层，0 真实网络)"
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -Ivendor/mbedtls/include \
|
||
-c bench/http_truncate_sim.c -o /tmp/t.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -Ivendor/mbedtls/include \
|
||
-ffunction-sections -c core/ncm_http.c -o /tmp/t_http.o
|
||
gcc -O2 -Wall -Wextra -DJSMN_HEADER -I. -Icore -Ivendor/mbedtls/include \
|
||
-ffunction-sections -c core/ncm_common.c -o /tmp/t_common.o
|
||
gcc -Wl,--gc-sections -o http_truncate_sim /tmp/t.o /tmp/t_http.o /tmp/t_common.o
|
||
run_sim http_truncate_sim
|
||
|
||
echo "===== all sims done ====="
|