fix(bt): M49 r1 评审 — 写操作预算压回 1500ms 窗口内 + A2DP 总预算/TTL 缓存 + 测试可重复 + rfkill 顺序；rebase 到 main 保住 M43 time32
rebase 到 main(00e7271，M43 time32 已合入) 时解开 build_netmgrd.sh 冲突：**两者都保留**—— M43 的 `../sdk/meow_time32.c` + `-DMEOW_TIME32_LIBC_OVERRIDES`，以及我的 ROOT/ZIGCC/OUT 环境变量化。编译改在 mktemp 目录里做（产物名仍是字面量 `-o meow_netmgrd`，供 sdk/test_time32_abi.sh 的按名定位），编完再落到 OUT —— 设了 OUT 也不会覆盖/删除仓库里 那份被跟踪的二进制（r1 期间 mv 曾把它删掉过）。门禁自证：`--builds` → build meow_netmgrd src=yes macro=yes；`--no-builds` → 4263=3 4403=0 16B-layout=OK ALL PASS。 P1-1（写操作越过客户端 1500ms 窗口）：预算模型改成**每一层都受限**—— `BT_ACT_TMO_MS 800 / BT_ACT_SHORT_MS 600 / BT_VERIFY_BUDGET_MS 220 / gap 90`， `bt_poll_probe` 把**剩余预算**传给探测函数（`bt_acl_has_tri`/`bt_info_flag` 新增 tmo 形参）， 探测自身那次 run_cmd 也受同一个 deadline 约束；`bt_onoff` 同理（up 失败只在剩余预算内重试 一次）；成功文案不再补设备名（省掉 1-2 次 fork，UI 本来就按 MAC join）。 探测改为三态：命令失败/超时 = -1（**未知**），不再被当成「没有 ACL」——否则 disconnect 会在 查不到的情况下报「已断开」，又是一次假成功。 实测（宿主桩驱动 bt_ctl_execute，命令卡死 5s 的形态）：connect 1042-1047ms、pair 1042-1045ms、 bt on 831ms，全部 < 1450 且有 400ms+ 余量（r1 实测 1528/2424ms）。设备侧实测 fork 成本 ≈25-30ms/次（bt a2dp 50ms、bt status 100ms），余量足够。 P2-1（A2DP 1+N 子进程塞进 status JSON）：`bt_a2dp_query(buf,cap,budget)` 加**总预算**， list-pcms 单命令 ≤400ms、每个 info ≤300ms、剩下端点超预算就不再查；`bt a2dp` 命令用 900ms。 status JSON 不在无连接时查（0 次 fork），有连接时走 10s TTL 缓存 + 500ms 预算； `a2dp_codec`/`a2dp_rate` 字段保留（MeowPanel btCard 依赖，见 docs/plan/FUTURE_MEOWPANEL.md:48）。 实测 4 端点全卡死：911ms（r1 6053ms）；status JSON 首次 350-384ms、缓存命中 31-49ms。 P2-2（test_bt_ctl 不可重复）：开跑先 `rm -rf` 状态目录、退出再清；连跑 3 次 ALL PASS（贴了输出）。 P2-3（bt_onoff 顺序 + 多节点）：开=先 rfkill unblock（**全部**同类型节点）再 hciconfig up， up 未生效时剩余预算内重试一次；关=先 down 再 block。新增 `rfkill_set_block_all()`（旧 `rfkill_set_block` 仍只写首个节点，WiFi 路径行为不变）。桩改成「blocked 时 up 必败」，并加了 反向用例证明桩真的会失败（否则断言空转）。 P3：①info 的 RUNCMD_EMPTY（exit 0 无输出）不再当失败跳过；②`bt_pcm_paths_parse` 的 `/a2dpsrc` 搜索限制在行内 [p,e)（原来会跨 \n 命中下一行）；③`bt_devices_text` 注释写明 「本轮扫描见到过的设备」而非「此刻在场」（[DEL] 不删除、devices 块含 BlueZ 历史缓存）。 附带（塔 11:06 建议，BT 作用域内先落地）：连续 3 次 RUNCMD_TIMEOUT 后熔断 30s，冷却期内 直接回「熔断中」不再 fork（真机 55 个挂死 bluetoothctl 吃光进程槽的事故）；任何非超时返回清零。 单测覆盖：第 4 次调用 0ms 返回。范围只限 BT 写操作，WiFi/DNS 调用点未动。 真机（本轮只读，设备已恢复在线）：新件 md5 e62e7512 上卡只读验收 status/paired/connected/ devices/a2dp 全通；`ps w | grep -c bluetoothctl` 前后均为 2（≤3）；Music du 199164544； 临时目录/独立实例清理干净，/usr/bin 未动。
This commit is contained in:
worker-m49 committed
1 parent
370c290160
commit
239cebae01
4 files changed
+470
-114
No files matched your search
@@ -54,17 +54,23 @@ int main(void)
|
||||
const char *T = Tbuf;
|
||||
char p[256];
|
||||
char cmd[512];
|
||||
/* 可重复运行（r1 评审 P2）：上一轮遗留的 conn_ / paired_ 状态文件会把「无连接」断言推翻。
|
||||
* 每次开跑先整棵删掉重来，退出时也清（见文件末尾）。 */
|
||||
{ char rm[320]; snprintf(rm, sizeof rm, "rm -rf '%s'", Tbuf); (void)!system(rm); }
|
||||
mkdir(Tbuf, 0755);
|
||||
/* 假 /sys/class/bluetooth/hci0（available/powered/address） */
|
||||
{ snprintf(p, sizeof p, "%s/bt", T); mkdir(p, 0755);
|
||||
snprintf(p, sizeof p, "%s/bt/hci0", T); mkdir(p, 0755);
|
||||
snprintf(p, sizeof p, "%s/bt/hci0/address", T); wf(p, "4c:bc:98:b0:98:db\n");
|
||||
snprintf(p, sizeof p, "%s/bt/hci0/power", T); wf(p, "off\n"); }
|
||||
/* 假 rfkill（bt on/off 会写 soft） */
|
||||
/* 假 rfkill：真机有两个 bluetooth 节点（rfkill0/rfkill3），任一仍 block 就等于没开 */
|
||||
{ snprintf(p, sizeof p, "%s/rfkill", T); mkdir(p, 0755);
|
||||
snprintf(p, sizeof p, "%s/rfkill/rfkill1", T); mkdir(p, 0755);
|
||||
snprintf(p, sizeof p, "%s/rfkill/rfkill1/type", T); wf(p, "bluetooth\n");
|
||||
snprintf(p, sizeof p, "%s/rfkill/rfkill1/soft", T); wf(p, "1\n"); }
|
||||
for (int i = 0; i < 2; i++) {
|
||||
char d[300];
|
||||
snprintf(d, sizeof d, "%s/rfkill/rfkill%d", T, i ? 3 : 0); mkdir(d, 0755);
|
||||
snprintf(p, sizeof p, "%s/type", d); wf(p, "bluetooth\n");
|
||||
snprintf(p, sizeof p, "%s/soft", d); wf(p, "1\n");
|
||||
} }
|
||||
/* 有状态桩的状态目录 */
|
||||
snprintf(p, sizeof p, "%s/state", T); mkdir(p, 0755);
|
||||
|
||||
@@ -94,6 +100,7 @@ int main(void)
|
||||
" echo \" Connected: $cv\"\n"
|
||||
" exit 0;;\n"
|
||||
" connect)\n"
|
||||
" case \"$2\" in CC:*) sleep 5;; esac\n"
|
||||
" case \"$2\" in AA:*) echo 'Failed to connect: org.bluez.Error.Failed br-connection-refused'; exit 1;; esac\n"
|
||||
" echo yes > \"$S/conn_$2\"; echo yes > \"$S/paired_$2\"\n"
|
||||
" echo 'Attempting to connect'; echo 'Connection successful'; exit 0;;\n"
|
||||
@@ -102,6 +109,7 @@ int main(void)
|
||||
" case \"$2\" in BB:*) echo 'Successful disconnected'; exit 0;; esac\n"
|
||||
" echo no > \"$S/conn_$2\"; echo 'Successful disconnected'; exit 0;;\n"
|
||||
" pair)\n"
|
||||
" case \"$2\" in CC:*) sleep 5;; esac\n"
|
||||
" case \"$2\" in AA:*) echo 'Failed to pair: org.bluez.Error.AuthenticationFailed'; exit 1;; esac\n"
|
||||
" echo yes > \"$S/paired_$2\"; echo 'Pairing successful'; exit 0;;\n"
|
||||
" remove)\n"
|
||||
@@ -135,8 +143,15 @@ int main(void)
|
||||
snprintf(sh, sizeof sh,
|
||||
"#!/bin/sh\n"
|
||||
"S='%s'\n"
|
||||
"if [ -f \"$S/state/hang_hciconfig\" ]; then sleep 5; fi\n"
|
||||
"blocked() { for t in \"$S\"/rfkill/*; do\n"
|
||||
" [ -f \"$t/type\" ] || continue\n"
|
||||
" v=\"\"; IFS= read -r v < \"$t/type\"; [ \"$v\" = bluetooth ] || continue\n"
|
||||
" b=0; IFS= read -r b < \"$t/soft\"; [ \"$b\" = 1 ] && return 0\n"
|
||||
" done; return 1; }\n"
|
||||
"case \"$2\" in\n"
|
||||
" up) echo on > \"$S/bt/hci0/power\"; echo 'hci0: Type: Primary Bus: UART'; echo ' UP RUNNING';;\n"
|
||||
" up) if blocked; then echo 'hci0: Operation not possible due to RF-kill' >&2; exit 1; fi\n"
|
||||
" echo on > \"$S/bt/hci0/power\"; echo 'hci0: Type: Primary Bus: UART'; echo ' UP RUNNING';;\n"
|
||||
" down) echo off > \"$S/bt/hci0/power\"; echo 'hci0: Type: Primary Bus: UART'; echo ' DOWN';;\n"
|
||||
" *) echo 'hci0: Type: Primary Bus: UART'\n"
|
||||
" v=off; if [ -f \"$S/bt/hci0/power\" ]; then IFS= read -r v < \"$S/bt/hci0/power\"; fi\n"
|
||||
@@ -156,26 +171,34 @@ int main(void)
|
||||
"case \"$1\" in\n"
|
||||
" list-pcms) catf \"$S/pcms.txt\"; exit 0;;\n"
|
||||
" info)\n"
|
||||
" if [ -f \"$S/hang_info\" ]; then sleep 5; fi\n"
|
||||
" path=\"$2\"; found=0\n"
|
||||
" if [ -f \"$S/pcms.txt\" ]; then\n"
|
||||
" while IFS= read -r l || [ -n \"$l\" ]; do\n"
|
||||
" if [ \"$l\" = \"$path\" ]; then found=1; fi\n"
|
||||
" done < \"$S/pcms.txt\"\n"
|
||||
" fi\n"
|
||||
" case \"$path\" in *33_DE_2E_21_AD_30*) ;; *) found=0;; esac\n"
|
||||
" case \"$path\" in *dev_33_DE_2E_21_AD_30*) ;; *) found=0;; esac\n"
|
||||
" if [ \"$found\" != 1 ]; then\n"
|
||||
" echo \"bluealsa-cli: E: CMD \\\"info\\\": Couldn't get BlueALSA PCM: Object path not found: '$path'\" >&2\n"
|
||||
" exit 1\n"
|
||||
" fi\n"
|
||||
" echo \"BlueALSA PCM: $path\"\n"
|
||||
" echo ' Transport: A2DP-source'\n"
|
||||
" echo ' Codec: SBC'\n"
|
||||
" echo ' CodecConfiguration: 0x3f'\n"
|
||||
" echo ' Sampling: 44100 Hz'\n"
|
||||
" echo ' Channels: 2'\n"
|
||||
" echo ' Bits per Sample: 16'\n"
|
||||
" echo ' Running: true'\n"
|
||||
" echo ' State: RUNNING'\n"
|
||||
" case \"$path\" in *dev_33_DE_2E_21_AD_30*) ;; *) exit 1;; esac\n"
|
||||
" if [ -f \"$S/running\" ]; then run=true; else run=false; fi\n"
|
||||
" echo \"Device: /org/bluez/hci0/dev_33_DE_2E_21_AD_30\"\n" /* ← 真机原文（M50 2026-11-11 18:26） */
|
||||
" echo 'Sequence: 0'\n"
|
||||
" echo 'Transport: A2DP-source'\n"
|
||||
" echo 'Mode: sink'\n"
|
||||
" echo \"Running: $run\"\n"
|
||||
" echo 'Format: S16_LE'\n"
|
||||
" echo 'Channels: 2'\n"
|
||||
" echo 'Sampling: 48000 Hz'\n"
|
||||
" echo 'Available codecs: SBC AAC'\n"
|
||||
" echo 'Selected codec: AAC'\n"
|
||||
" echo 'Delay: 15.0 ms'\n"
|
||||
" echo 'SoftVolume: false'\n"
|
||||
" echo 'Volume: L: 127 R: 127'\n"
|
||||
" echo 'Muted: L: false R: false'\n"
|
||||
" exit 0;;\n"
|
||||
"esac\n"
|
||||
"exit 0\n", T);
|
||||
@@ -327,20 +350,59 @@ int main(void)
|
||||
CHECK(bt_path_mac("/org/bluealsa/hci0/dev_33_DE_2E_21_AD_3", mac, sizeof mac) == 0);
|
||||
CHECK(bt_path_mac("/org/bluealsa/hci0/nothing", mac, sizeof mac) == 0);
|
||||
|
||||
/* 真机原文（M50 2026-11-11 18:26 实测，idle 与 running 各一份），逐字照抄 */
|
||||
static const char *REAL_IDLE =
|
||||
"Device: /org/bluez/hci0/dev_33_DE_2E_21_AD_30\n"
|
||||
"Sequence: 0\n"
|
||||
"Transport: A2DP-source\n"
|
||||
"Mode: sink\n"
|
||||
"Running: false\n"
|
||||
"Format: S16_LE\n"
|
||||
"Channels: 2\n"
|
||||
"Sampling: 48000 Hz\n"
|
||||
"Available codecs: SBC AAC\n"
|
||||
"Selected codec: AAC\n"
|
||||
"Delay: 15.0 ms\n"
|
||||
"SoftVolume: false\n"
|
||||
"Volume: L: 127 R: 127\n"
|
||||
"Muted: L: false R: false\n";
|
||||
static const char *REAL_RUNNING =
|
||||
"Device: /org/bluez/hci0/dev_33_DE_2E_21_AD_30\n"
|
||||
"Sequence: 3\n"
|
||||
"Transport: A2DP-source\n"
|
||||
"Mode: sink\n"
|
||||
"Running: true\n"
|
||||
"Format: S16_LE\n"
|
||||
"Channels: 2\n"
|
||||
"Sampling: 48000 Hz\n"
|
||||
"Available codecs: SBC AAC\n"
|
||||
"Selected codec: AAC\n"
|
||||
"Delay: 17.2 ms\n"
|
||||
"SoftVolume: false\n"
|
||||
"Volume: L: 127 R: 127\n"
|
||||
"Muted: L: false R: false\n";
|
||||
bt_pcm_info_t info;
|
||||
bt_pcm_info_parse("BlueALSA PCM: /org/bluealsa/hci0/dev_33_DE_2E_21_AD_30/a2dpsrc\n"
|
||||
" Transport: A2DP-source\n"
|
||||
bt_pcm_info_parse(REAL_IDLE, &info);
|
||||
CHECK(info.has == 1);
|
||||
CHECK(strcmp(info.codec, "AAC") == 0); /* Selected codec，不是 Available 列表 */
|
||||
CHECK(strcmp(info.rate, "48000 Hz") == 0);
|
||||
CHECK(strcmp(info.channels, "2") == 0);
|
||||
CHECK(strcmp(info.bits, "16") == 0); /* 从 Format: S16_LE 推出来 */
|
||||
CHECK(info.running == 0); /* Running: false */
|
||||
bt_pcm_info_parse(REAL_RUNNING, &info);
|
||||
CHECK(info.running == 1); /* Running: true 才代表真在传 */
|
||||
CHECK(strcmp(info.codec, "AAC") == 0);
|
||||
CHECK(strcmp(info.bits, "16") == 0);
|
||||
/* 兼容旧/其它形态（有人给的是 Codec:/Bits per Sample:/State: RUNNING） */
|
||||
bt_pcm_info_parse(" Transport: A2DP-source\n"
|
||||
" Codec: SBC\n"
|
||||
" CodecConfiguration: 0x3f\n"
|
||||
" Sampling: 44100 Hz\n"
|
||||
" Channels: 2\n"
|
||||
" Bits per Sample: 16\n"
|
||||
" Running: true\n"
|
||||
" State: RUNNING\n", &info);
|
||||
CHECK(info.has == 1);
|
||||
CHECK(strcmp(info.codec, "SBC") == 0); /* 不被 CodecConfiguration 抢走 */
|
||||
CHECK(strcmp(info.codec, "SBC") == 0); /* 不被 CodecConfiguration 抢走 */
|
||||
CHECK(strcmp(info.rate, "44100 Hz") == 0);
|
||||
CHECK(strcmp(info.channels, "2") == 0);
|
||||
CHECK(strcmp(info.bits, "16") == 0);
|
||||
CHECK(info.running == 1);
|
||||
/* 只有 Format 一行（属性打包）时的兜底 */
|
||||
@@ -399,13 +461,20 @@ int main(void)
|
||||
bt_ctl_execute("a2dp", NULL, &r);
|
||||
CHECK(r.code == MEOW_OK);
|
||||
CHECK(strstr(r.text, "A2DP 33:DE:2E:21:AD:30") != NULL);
|
||||
CHECK(strstr(r.text, "codec=SBC") != NULL);
|
||||
CHECK(strstr(r.text, "rate=44100 Hz") != NULL);
|
||||
CHECK(strstr(r.text, "codec=AAC") != NULL); /* 真机 Selected codec */
|
||||
CHECK(strstr(r.text, "rate=48000 Hz") != NULL);
|
||||
CHECK(strstr(r.text, "channels=2") != NULL);
|
||||
CHECK(strstr(r.text, "bits=16") != NULL);
|
||||
CHECK(strstr(r.text, "acquired=1") != NULL);
|
||||
CHECK(strstr(r.text, "acquired=0") != NULL); /* Running: false（空闲，端点还在） */
|
||||
CHECK(strstr(r.text, "role=src") != NULL);
|
||||
{ /* Running: true → acquired=1（权威布尔） */
|
||||
snprintf(p, sizeof p, "%s/state/running", T); wf(p, "1\n");
|
||||
bt_ctl_execute("a2dp", NULL, &r);
|
||||
CHECK(strstr(r.text, "acquired=1") != NULL);
|
||||
unlink(p);
|
||||
}
|
||||
/* 列表里有端点但 info 查不到（刚断开）→ 跳过，不编造 */
|
||||
snprintf(p, sizeof p, "%s/state/pcms.txt", T);
|
||||
wf(p, "/org/bluealsa/hci0/dev_00_00_00_00_00_00/a2dpsrc\n");
|
||||
bt_ctl_execute("a2dp", NULL, &r);
|
||||
CHECK(strcmp(r.text, "A2DP none\n") == 0);
|
||||
@@ -413,6 +482,47 @@ int main(void)
|
||||
bt_ctl_execute("a2dp", NULL, &r);
|
||||
CHECK(strcmp(r.text, "A2DP none\n") == 0);
|
||||
|
||||
printf("== A2DP 预算：端点全卡死时不许把守护拖住（r1 评审 P2-1） ==\n");
|
||||
{
|
||||
char pcms[512];
|
||||
snprintf(pcms, sizeof pcms,
|
||||
"/org/bluealsa/hci0/dev_33_DE_2E_21_AD_30/a2dpsrc/sink\n"
|
||||
"/org/bluealsa/hci0/dev_11_22_33_44_55_66/a2dpsrc/sink\n"
|
||||
"/org/bluealsa/hci0/dev_AA_BB_CC_DD_EE_FF/a2dpsrc/sink\n"
|
||||
"/org/bluealsa/hci0/dev_12_34_56_78_9A_BC/a2dpsnk/source\n");
|
||||
snprintf(p, sizeof p, "%s/state/pcms.txt", T); wf(p, pcms);
|
||||
snprintf(p, sizeof p, "%s/state/hang_info", T); wf(p, "1\n");
|
||||
long t0 = mono_ms();
|
||||
bt_ctl_execute("a2dp", NULL, &r);
|
||||
long dt = mono_ms() - t0;
|
||||
printf(" budget-a2dp(4 端点全卡死) = %ld ms\n", dt);
|
||||
CHECK(dt < 1200); /* 旧实现实测 6053ms */
|
||||
CHECK(r.code == MEOW_OK);
|
||||
unlink(p);
|
||||
snprintf(p, sizeof p, "%s/state/pcms.txt", T); wf(p, "");
|
||||
|
||||
/* status JSON 的 a2dp 摘要：无连接→0 次 fork；有连接→TTL 缓存（第二次几乎免费） */
|
||||
snprintf(p, sizeof p, "%s/state/conn_33:DE:2E:21:AD:30", T); wf(p, "yes\n");
|
||||
snprintf(p, sizeof p, "%s/state/pcms.txt", T);
|
||||
wf(p, "/org/bluealsa/hci0/dev_33_DE_2E_21_AD_30/a2dpsrc/sink\n");
|
||||
snprintf(p, sizeof p, "%s/state/hang_info", T); wf(p, "1\n");
|
||||
static char js[8192];
|
||||
g_bt_a2dp_cache_ms = 0;
|
||||
long t1 = mono_ms();
|
||||
build_status_json(js, sizeof js);
|
||||
long d1 = mono_ms() - t1;
|
||||
long t2 = mono_ms();
|
||||
build_status_json(js, sizeof js);
|
||||
long d2 = mono_ms() - t2;
|
||||
printf(" budget-status-json 1st = %ld ms, 2nd(cache) = %ld ms\n", d1, d2);
|
||||
CHECK(d1 < 700); /* 单次刷新受 BT_A2DP_STATUS_BUDGET_MS 约束 */
|
||||
CHECK(d2 < 60); /* 缓存命中：不再 fork */
|
||||
CHECK(strstr(js, "\"a2dp_codec\"") != NULL); /* 字段保留（MeowPanel btCard 依赖） */
|
||||
unlink(p);
|
||||
unlink(snprintf(p, sizeof p, "%s/state/conn_33:DE:2E:21:AD:30", T) ? p : p);
|
||||
snprintf(p, sizeof p, "%s/state/pcms.txt", T); wf(p, "");
|
||||
}
|
||||
|
||||
printf("== 扫描缓存 → bt devices（真机 ANSI 字节 + devices 尾块 + 去重） ==\n");
|
||||
{
|
||||
char cache[4096];
|
||||
@@ -456,27 +566,105 @@ int main(void)
|
||||
}
|
||||
|
||||
/* ================= 7. 写级：on/off + connect/disconnect/pair/unpair ================= */
|
||||
printf("== bt on/off：按 power 真态定稿 ==\n");
|
||||
printf("== bt on/off：按 power 真态定稿 + rfkill 顺序（先 unblock 再 up / 先 down 再 block） ==\n");
|
||||
/* 初始两个 bluetooth rfkill 节点 soft=1（真机形态）。旧实现在这里必败：
|
||||
* 先 hciconfig up 被 rfkill 拦下，再 unblock 也不会重试 → 报「未生效」（假失败）。 */
|
||||
bt_ctl_execute("on", NULL, &r);
|
||||
CHECK(r.code == MEOW_OK);
|
||||
CHECK(strstr(r.text, "已复查") != NULL);
|
||||
CHECK(bt_powered_now() == 1);
|
||||
CHECK(bt_powered_now(1500) == 1);
|
||||
{ /* 两个节点都必须被解 block（只写首个会让另一个仍 block） */
|
||||
int all_unblocked = 1;
|
||||
for (int i = 0; i < 2; i++) {
|
||||
char f[300], v[8] = "1";
|
||||
snprintf(f, sizeof f, "%s/rfkill/rfkill%d/soft", T, i ? 3 : 0);
|
||||
FILE *fp = fopen(f, "r");
|
||||
if (fp) { if (fscanf(fp, "%7s", v) != 1) v[0] = 0; fclose(fp); }
|
||||
if (strcmp(v, "0") != 0) all_unblocked = 0;
|
||||
}
|
||||
CHECK(all_unblocked == 1);
|
||||
}
|
||||
bt_ctl_execute("off", NULL, &r);
|
||||
CHECK(r.code == MEOW_OK);
|
||||
CHECK(bt_powered_now() == 0);
|
||||
CHECK(bt_powered_now(1500) == 0);
|
||||
{ /* 关也要写全部节点 */
|
||||
int all_blocked = 1;
|
||||
for (int i = 0; i < 2; i++) {
|
||||
char f[300], v[8] = "";
|
||||
snprintf(f, sizeof f, "%s/rfkill/rfkill%d/soft", T, i ? 3 : 0);
|
||||
FILE *fp = fopen(f, "r");
|
||||
if (fp) { if (fscanf(fp, "%7s", v) != 1) v[0] = 0; fclose(fp); }
|
||||
if (strcmp(v, "1") != 0) all_blocked = 0;
|
||||
}
|
||||
CHECK(all_blocked == 1);
|
||||
}
|
||||
/* 反向验证：桩确实会在 blocked 时拒绝 up（否则上面的断言是空转） */
|
||||
{ char f[300]; snprintf(f, sizeof f, "%s/rfkill/rfkill0/soft", T); wf(f, "1\n");
|
||||
snprintf(f, sizeof f, "%s/rfkill/rfkill3/soft", T); wf(f, "1\n");
|
||||
char out[128]; snprintf(out, sizeof out, "%s/hciconfig hci0 up 2>&1", sb_hc);
|
||||
runcmd_res_t rr; run_cmd_ex(out, sizeof out, 800, out, &rr);
|
||||
CHECK(rr.status != RUNCMD_OK); }
|
||||
{ char f[300]; snprintf(f, sizeof f, "%s/bt/hci0/power", T); wf(f, "off\n");
|
||||
for (int i = 0; i < 2; i++) { snprintf(f, sizeof f, "%s/rfkill/rfkill%d/soft", T, i ? 3 : 0); wf(f, "0\n"); } }
|
||||
|
||||
printf("== 预算上界：命令卡死时写操作必须落在客户端 1500ms IPC 窗口内（r1 评审 P1） ==\n");
|
||||
{ /* connect：bluetoothctl 卡住 5s（耳机没上电的真实形态）→ 总耗时必须 < 1450ms */
|
||||
long t0 = mono_ms();
|
||||
bt_ctl_execute("connect", "CC:CC:CC:CC:CC:CC", &r);
|
||||
long dt = mono_ms() - t0;
|
||||
printf(" budget-connect = %ld ms (code=%d)\n", dt, r.code);
|
||||
CHECK(dt < 1450);
|
||||
CHECK(r.code == MEOW_ERR_NODEV); /* 未连上就必须报未生效 */
|
||||
CHECK(strstr(r.text, "未生效") != NULL);
|
||||
}
|
||||
{ long t0 = mono_ms();
|
||||
bt_ctl_execute("pair", "CC:CC:CC:CC:CC:CC", &r);
|
||||
long dt = mono_ms() - t0;
|
||||
printf(" budget-pair = %ld ms (code=%d)\n", dt, r.code);
|
||||
CHECK(dt < 1450);
|
||||
CHECK(r.code == MEOW_ERR_NODEV);
|
||||
}
|
||||
{ /* bt on：hciconfig 卡住 5s → 同样必须 < 1450ms（旧实现实测 2424ms） */
|
||||
char f[300]; snprintf(f, sizeof f, "%s/state/hang_hciconfig", T); wf(f, "1\n");
|
||||
long t0 = mono_ms();
|
||||
bt_ctl_execute("on", NULL, &r);
|
||||
long dt = mono_ms() - t0;
|
||||
printf(" budget-bt-on = %ld ms (code=%d)\n", dt, r.code);
|
||||
CHECK(dt < 1450);
|
||||
CHECK(r.code == MEOW_ERR_NODEV); /* 卡住未生效：如实报 */
|
||||
unlink(f);
|
||||
}
|
||||
{ /* 熔断：连续 3 次超时后，第 4 次必须**立刻**拒绝、不再 fork（防 55 个挂死 bluetoothctl
|
||||
* 吃光进程槽的事故）。冷却 30s，测试里手工复位继续后续用例。 */
|
||||
CHECK(g_bt_tmo_streak >= BT_TMO_STREAK_MAX);
|
||||
long t0 = mono_ms();
|
||||
bt_ctl_execute("connect", "CC:CC:CC:CC:CC:CC", &r);
|
||||
long dt = mono_ms() - t0;
|
||||
printf(" circuit-breaker 4th = %ld ms, code=%d\n", dt, r.code);
|
||||
CHECK(dt < 100); /* 没再起子进程 */
|
||||
CHECK(r.code == MEOW_ERR_NODEV);
|
||||
CHECK(strstr(r.text, "熔断中") != NULL);
|
||||
g_bt_tmo_streak = 0; /* 测试专用复位（生产靠 30s 冷却+成功清零） */
|
||||
g_bt_tmo_until = 0;
|
||||
}
|
||||
{ /* 恢复：正常 on，供后面的用例使用；同时验证「非超时返回会清零熔断计数」 */
|
||||
bt_ctl_execute("on", NULL, &r);
|
||||
CHECK(r.code == MEOW_OK);
|
||||
CHECK(g_bt_tmo_streak == 0);
|
||||
}
|
||||
|
||||
printf("== bt connect：成功路径以 hcitool con 复查 ==\n");
|
||||
bt_ctl_execute("connect", "33:DE:2E:21:AD:30", &r);
|
||||
CHECK(r.code == MEOW_OK);
|
||||
CHECK(strstr(r.text, "已连接") != NULL);
|
||||
CHECK(strstr(r.text, "hcitool con") != NULL);
|
||||
CHECK(bt_acl_has("33:DE:2E:21:AD:30") == 1);
|
||||
CHECK(bt_acl_has_tri("33:DE:2E:21:AD:30", 1500) == 1);
|
||||
|
||||
printf("== bt disconnect：成功路径以 hcitool con 复查 ==\n");
|
||||
bt_ctl_execute("disconnect", "33:DE:2E:21:AD:30", &r);
|
||||
CHECK(r.code == MEOW_OK);
|
||||
CHECK(strstr(r.text, "已断开") != NULL);
|
||||
CHECK(bt_acl_has("33:DE:2E:21:AD:30") == 0);
|
||||
CHECK(bt_acl_has_tri("33:DE:2E:21:AD:30", 1500) == 0);
|
||||
|
||||
printf("== bt connect 失败：bluetoothctl 报错 + 无 ACL → ERR_NODEV（旧实现恒报成功） ==\n");
|
||||
bt_ctl_execute("connect", "AA:AA:AA:AA:AA:AA", &r);
|
||||
@@ -501,11 +689,11 @@ int main(void)
|
||||
bt_ctl_execute("pair", "11:22:33:44:55:66", &r);
|
||||
CHECK(r.code == MEOW_OK);
|
||||
CHECK(strstr(r.text, "已配对") != NULL);
|
||||
CHECK(bt_info_flag("11:22:33:44:55:66", "Paired") == 1);
|
||||
CHECK(bt_info_flag("11:22:33:44:55:66", "Paired", 1500) == 1);
|
||||
bt_ctl_execute("unpair", "11:22:33:44:55:66", &r); /* remove → info 查不到也算解除 */
|
||||
CHECK(r.code == MEOW_OK);
|
||||
CHECK(strstr(r.text, "已解除配对") != NULL);
|
||||
CHECK(bt_info_flag("11:22:33:44:55:66", "Paired") == -1);
|
||||
CHECK(bt_info_flag("11:22:33:44:55:66", "Paired", 1500) == -1);
|
||||
bt_ctl_execute("pair", "AA:AA:AA:AA:AA:AA", &r);
|
||||
CHECK(r.code == MEOW_ERR_NODEV);
|
||||
CHECK(strstr(r.text, "未生效") != NULL);
|
||||
@@ -529,6 +717,7 @@ int main(void)
|
||||
CHECK(bt_write_authorize(&other, 1, "status") == MEOW_OK); /* 读级任意 → 放 */
|
||||
|
||||
(void)cmd;
|
||||
{ char rm[320]; snprintf(rm, sizeof rm, "rm -rf '%s'", T); (void)!system(rm); } /* 退出即清，保证可重复 */
|
||||
if (g_fail) { printf("\nBT_CTL TEST: %d FAIL\n", g_fail); return 1; }
|
||||
printf("\nBT_CTL TEST: ALL PASS\n");
|
||||
return 0;
|
||||
|
||||
Reference in new issue
Block a user