924ac3d428
用户裁定「统一」。口径就是 AGENTS 铁律:字符串字面量必须纯 ASCII (无 BOM 文件里奇数个汉字会吞掉结束引号,偶数才侥幸通过),中文只写注释。 四名队友按目录分四组并行、写范围互斥:net_socket 418 行(6 文件)、 console_log/sys_log_mcu/soe_store/cfg_file_store_mcu 268 行(4 文件)、 11 个存量套件 404 行 + adc_input 89 行、iec104 与 lftpd 与 NET 四套等 356 行 (9 文件)。runner 的 .py 文档串不在口径内(Python 源不经 ARMCC 代码页)。 两套口径必须分清:粗口径(按行切引号)普查 = 34 文件 / 1,552 行;严格口径 (状态机剥掉块/行注释与字符常量后再取字符串字面量)= 30 文件 / 1,535 行。 差值那 4 个文件的命中全在注释里(ns_peers.c、net_socket/stub/ns_rtos.h、 common/ch395f_fake.h、common/fatfs_fake.c)——按口径一处都不该改,改了等于 把中文从注释里搬走、正好违背口径。粗口径绝不能当交付判据,否则要么白改 注释、要么留下「这行为什么没改」的悬案。 Lead 独立终检(不采信自报)五条硬判据,结果 30 文件漂移 0:① 每文件 TC 号 集合与 HEAD 逐字相同 ② 断言宏调用点数不变 ③ 行数与 HEAD 完全相等(专抓 整文件回写把尾部含 main() 吃掉的截断,第 1 轮真发生过两次)④ 剥注释后代码区 非 ASCII 字符 = 0 ⑤ 字节卫生(BOM 与 HEAD 一致、无 CR、无 U+FFFD、单尾换行)。 另用「逐行把字面量整体替换成空串后与 HEAD 必须逐行相等」机械证明只改了字面量; 各套 --module 覆盖率与断言数逐字不变(net_socket 887/889·53/53、console_log 199/200·16/16、sys_log_mcu 324/326·13/13、adc_input 103/103、sys_clock 100/100) → 生产码零改动,基线不需重登。 闸拦下一处真实回归(我的验收器没抓到):ns_s6_edges.c 翻译时把一个上一轮 已整改成平实描述的编号又写回了 CHECK 标签。原因很清楚:「只改字面量」并不 等于「只改无害内容」,标签里完全可以带进未登记族的编号形态;而 Lead 的自动 验收器只比对了 TC 形 id 集合,未覆盖 L/E/N/S/TRAP 等族。教训:批量改标签的 守卫必须加一条「新串不得出现任何已登记前缀族之外的编号形态」,且结构不变式 只覆盖自己想到的维度时不能替代真闸。 Lead 自查另清掉 126 处写坏的反斜杠(JS→Python 转义层数翻倍,把 markdown 反引号写成反斜杠+反引号),恰好发生在记录这条教训的那一节里。 文档:docs/测试说明/主机单测覆盖率口径.md §9 新增「第 2 轮」小节(两套口径对照 表、五条终检判据、六条手法含「转换说明符序列必须逐位相同」取代「禁止裸 %」、 三条协作纪律含先改板再派工与临时文件带组前缀、后续项 3 条)+ 变更记录一行。 后续项(本轮不做):把剥注释词法扫描器收进 scripts 当门禁(需用户点头并先定 test/ 是否纳入 coding-standard);iec104 的简写编号归族(牵 id_registry, 不能顺手做);替换器加「编号形态白名单」校验。 gate: pre-commit run --all-files -> 39 hooks, 37 Passed; failed = mem-numbers + mem-budget(受管快照与本树 .map 的漂移,属第 1 轮生产码改动的遗留,非本批 增量)。本批只碰 test/host/**,不进 Keil 编译面也不进模拟器 CMake,**RAM/Flash 增量 = 0**;实测水位 RW_IRAM1 57.4%、RW_CCM 87.9%,均低于 92% 红线。 id-check 0 台账外新账(可判定 84.63% > 基线 82.6%);test-coverage 33/33 全绿; cppcheck / coding-standard / bsp-err / layer-deps / doc-links 全 Passed。 按仓内分支约定 --no-verify 提交,台账 --write 回填留待主工作树合并后。
335 lines
9.0 KiB
C
335 lines
9.0 KiB
C
/*
|
|
* 模块名称:假内核实现(net_socket 主机侧单测专用)
|
|
* 模块功能:实现 ns_rtos.h 声明的假队列/假通知/假时基。由测试单元 #include 使用。
|
|
* ⚠ 仅供 test/host/net_socket/ 使用,不参与 MCU 构建。
|
|
* 创建日期:2026-10-24
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "ns_rtos.h"
|
|
#include "net_socket.h"
|
|
|
|
int g_ns_task_caller;
|
|
int g_ns_task_net;
|
|
|
|
TaskHandle_t g_ns_cur_task;
|
|
ns_pump_fn g_ns_pump;
|
|
ns_poll_hook_fn g_ns_on_poll;
|
|
int g_ns_pump_calls;
|
|
int g_ns_block_waits;
|
|
int g_ns_notify_calls;
|
|
uint32_t g_ns_notify_last_val;
|
|
TaskHandle_t g_ns_notify_last_to;
|
|
int g_ns_put_calls;
|
|
int g_ns_get_calls;
|
|
int g_ns_crit_enter;
|
|
int g_ns_crit_exit;
|
|
uint32_t g_ns_tick;
|
|
osKernelState_t g_ns_kernel_state = osKernelRunning;
|
|
|
|
/* 通知槽:按句柄区分(只服务上面两个假任务,超出的句柄一律现场分配不了→报错) */
|
|
typedef struct {
|
|
TaskHandle_t h;
|
|
uint32_t val;
|
|
int pending;
|
|
} ns_notify_slot_t;
|
|
|
|
static ns_notify_slot_t s_slot[2];
|
|
|
|
/* 假队列:定长环形,存 net_msg_t 按值拷贝(与真队列语义一致) */
|
|
static net_msg_t s_q[NS_Q_CAP];
|
|
static int s_q_head;
|
|
static int s_q_count;
|
|
|
|
void ns_rtos_reset(void)
|
|
{
|
|
(void)memset(s_slot, 0, sizeof(s_slot));
|
|
s_slot[0].h = (TaskHandle_t)&g_ns_task_caller;
|
|
s_slot[1].h = (TaskHandle_t)&g_ns_task_net;
|
|
(void)memset(s_q, 0, sizeof(s_q));
|
|
s_q_head = 0;
|
|
s_q_count = 0;
|
|
g_ns_cur_task = (TaskHandle_t)&g_ns_task_caller;
|
|
g_ns_pump = NULL;
|
|
g_ns_on_poll = NULL;
|
|
g_ns_pump_calls = 0;
|
|
g_ns_block_waits = 0;
|
|
g_ns_notify_calls = 0;
|
|
g_ns_notify_last_val = 0U;
|
|
g_ns_notify_last_to = NULL;
|
|
g_ns_put_calls = 0;
|
|
g_ns_get_calls = 0;
|
|
g_ns_crit_enter = 0;
|
|
g_ns_crit_exit = 0;
|
|
g_ns_tick = 0U;
|
|
g_ns_kernel_state = osKernelRunning;
|
|
g_ns_int_pin_set = 1;
|
|
g_ns_poll_tick_inc = 1U;
|
|
g_ns_poll_calls = 0U;
|
|
}
|
|
|
|
void ns_rtos_q_flush(void)
|
|
{
|
|
s_q_head = 0;
|
|
s_q_count = 0;
|
|
}
|
|
|
|
int ns_rtos_q_count(void)
|
|
{
|
|
return s_q_count;
|
|
}
|
|
|
|
void ns_rtos_q_fill(int n)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; (i < n) && ((uint32_t)s_q_count < NS_Q_CAP); i++) {
|
|
(void)memset(&s_q[(s_q_head + s_q_count) % (int)NS_Q_CAP], 0, sizeof(net_msg_t));
|
|
s_q_count++;
|
|
}
|
|
}
|
|
|
|
int ns_rtos_q_put_raw(const net_msg_t *msg)
|
|
{
|
|
if (msg == NULL || (uint32_t)s_q_count >= NS_Q_CAP) {
|
|
return -1;
|
|
}
|
|
(void)memcpy(&s_q[(s_q_head + s_q_count) % (int)NS_Q_CAP], msg, sizeof(net_msg_t));
|
|
s_q_count++;
|
|
return 0;
|
|
}
|
|
|
|
/* 假内核里的"另一次通知发出":与 xTaskNotify 共用同一套观测计数,
|
|
* 这样"谁发了几次通知"在测试里只有一个口径(挂起完成/取消走的就是这条) */
|
|
void ns_rtos_post_notify(TaskHandle_t to, uint32_t v)
|
|
{
|
|
int i;
|
|
|
|
g_ns_notify_calls++;
|
|
g_ns_notify_last_val = v;
|
|
g_ns_notify_last_to = to;
|
|
for (i = 0; i < 2; i++) {
|
|
if (s_slot[i].h == to) {
|
|
s_slot[i].val = v;
|
|
s_slot[i].pending = 1;
|
|
return;
|
|
}
|
|
}
|
|
printf("FATAL: ns_rtos_post_notify got an unknown task handle\n");
|
|
exit(2);
|
|
}
|
|
|
|
static ns_notify_slot_t *slot_of(TaskHandle_t h)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
if (s_slot[i].h == h) {
|
|
return &s_slot[i];
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/* —— CMSIS-RTOS2 侧(原型逐字取自真实 cmsis_os2.h:689/697/298/459)—— */
|
|
|
|
osStatus_t osMessageQueuePut(osMessageQueueId_t mq_id, const void *msg_ptr,
|
|
uint8_t msg_prio, uint32_t timeout)
|
|
{
|
|
(void)mq_id;
|
|
(void)msg_prio;
|
|
(void)timeout;
|
|
|
|
g_ns_put_calls++;
|
|
if (msg_ptr == NULL) {
|
|
return osErrorParameter;
|
|
}
|
|
if ((uint32_t)s_q_count >= NS_Q_CAP) {
|
|
return osErrorResource; /* 队列满(真机是 osWaitForever 阻塞,测试里用满队列测 BUSY 分支) */
|
|
}
|
|
(void)memcpy(&s_q[(s_q_head + s_q_count) % (int)NS_Q_CAP], msg_ptr, sizeof(net_msg_t));
|
|
s_q_count++;
|
|
return osOK;
|
|
}
|
|
|
|
osStatus_t osMessageQueueGet(osMessageQueueId_t mq_id, void *msg_ptr,
|
|
uint8_t *msg_prio, uint32_t timeout)
|
|
{
|
|
(void)mq_id;
|
|
(void)msg_prio;
|
|
|
|
g_ns_get_calls++;
|
|
if (s_q_count == 0) {
|
|
(void)timeout;
|
|
return osErrorTimeout;
|
|
}
|
|
if (msg_ptr != NULL) {
|
|
(void)memcpy(msg_ptr, &s_q[s_q_head], sizeof(net_msg_t));
|
|
}
|
|
s_q_head = (s_q_head + 1) % (int)NS_Q_CAP;
|
|
s_q_count--;
|
|
return osOK;
|
|
}
|
|
|
|
osKernelState_t osKernelGetState(void)
|
|
{
|
|
return g_ns_kernel_state;
|
|
}
|
|
|
|
osStatus_t osDelay(uint32_t ticks)
|
|
{
|
|
static int guard;
|
|
|
|
g_ns_tick += ticks;
|
|
if (++guard > 20000) {
|
|
printf("FATAL: osDelay runaway (%d calls) - the wait condition is never met\n", guard);
|
|
exit(2);
|
|
}
|
|
if (guard > 0) {
|
|
/* 每次 osDelay 也让 HAL_GetTick 往前走,600ms 复位上限才量得到 */
|
|
g_ns_tick += 0U;
|
|
}
|
|
return osOK;
|
|
}
|
|
|
|
/* —— FreeRTOS 侧(桩 task.h 声明)—— */
|
|
|
|
TaskHandle_t xTaskGetCurrentTaskHandle(void)
|
|
{
|
|
return g_ns_cur_task;
|
|
}
|
|
|
|
BaseType_t xTaskNotify(TaskHandle_t xTaskToNotify, uint32_t ulValue,
|
|
eNotifyAction eAction)
|
|
{
|
|
ns_notify_slot_t *p = slot_of(xTaskToNotify);
|
|
|
|
(void)eAction; /* 本测试只用 eSetValueWithOverwrite,语义相同 */
|
|
g_ns_notify_calls++;
|
|
g_ns_notify_last_val = ulValue;
|
|
g_ns_notify_last_to = xTaskToNotify;
|
|
if (p == NULL) {
|
|
printf("FATAL: xTaskNotify got an unknown task handle\n");
|
|
exit(2);
|
|
}
|
|
p->val = ulValue;
|
|
p->pending = 1;
|
|
return pdTRUE;
|
|
}
|
|
|
|
BaseType_t xTaskNotifyWait(uint32_t ulBitsToClearOnEntry,
|
|
uint32_t ulBitsToClearOnExit,
|
|
uint32_t *pulNotificationValue,
|
|
TickType_t xTicksToWait)
|
|
{
|
|
ns_notify_slot_t *p = slot_of(g_ns_cur_task);
|
|
|
|
if (p == NULL) {
|
|
printf("FATAL: xTaskNotifyWait current task handle unknown\n");
|
|
exit(2);
|
|
}
|
|
if (pulNotificationValue != NULL) {
|
|
*pulNotificationValue = p->val & (~ulBitsToClearOnEntry);
|
|
}
|
|
if (p->pending != 0) {
|
|
if (pulNotificationValue != NULL) {
|
|
*pulNotificationValue = p->val;
|
|
}
|
|
p->val = p->val & (~ulBitsToClearOnExit);
|
|
p->pending = 0;
|
|
return pdTRUE;
|
|
}
|
|
if (xTicksToWait == 0U) {
|
|
return pdFALSE; /* 零等待拾取:没有就是没有 */
|
|
}
|
|
|
|
/* 阻塞分支:这就是"睡到 netTask 回执"的调度点 → 驱动一轮 netTask 再拾取 */
|
|
g_ns_block_waits++;
|
|
if (g_ns_pump == NULL) {
|
|
printf("FATAL: reached the blocking wait but the test installed no pump hook\n");
|
|
exit(2);
|
|
}
|
|
{
|
|
TaskHandle_t save = g_ns_cur_task;
|
|
int rounds = 0;
|
|
|
|
while (rounds < NS_PUMP_MAX) {
|
|
rounds++;
|
|
g_ns_pump_calls++;
|
|
g_ns_cur_task = (TaskHandle_t)&g_ns_task_net; /* 以 netTask 身份跑 */
|
|
g_ns_pump();
|
|
g_ns_cur_task = save;
|
|
if (p->pending != 0) {
|
|
break;
|
|
}
|
|
}
|
|
if (p->pending == 0) {
|
|
printf("FATAL: blocking wait still got no receipt after %d rounds (a missing notify would hang real hardware)\n", rounds);
|
|
exit(2);
|
|
}
|
|
}
|
|
if (pulNotificationValue != NULL) {
|
|
*pulNotificationValue = p->val;
|
|
}
|
|
p->val = p->val & (~ulBitsToClearOnExit);
|
|
p->pending = 0;
|
|
return pdTRUE;
|
|
}
|
|
|
|
uint32_t xTaskGetTickCount(void)
|
|
{
|
|
return g_ns_tick;
|
|
}
|
|
|
|
int ns_os_crit_depth(void)
|
|
{
|
|
return g_ns_crit_enter - g_ns_crit_exit;
|
|
}
|
|
|
|
void ns_os_enter_critical(void)
|
|
{
|
|
g_ns_crit_enter++;
|
|
}
|
|
|
|
void ns_os_exit_critical(void)
|
|
{
|
|
g_ns_crit_exit++;
|
|
}
|
|
|
|
/* —— main.h 桩:时基 + INT# 引脚 —— */
|
|
|
|
uint32_t HAL_GetTick(void)
|
|
{
|
|
return g_ns_tick;
|
|
}
|
|
|
|
/* INT# 电平可注入:默认 SET(无中断)——net_poll 默认走"引脚高即退出"的短路分支 */
|
|
int g_ns_int_pin_set = 1;
|
|
uint32_t g_ns_poll_tick_inc = 1U;
|
|
uint32_t g_ns_poll_calls;
|
|
|
|
/* 读 INT# 就是"net_poll 又轮了一轮"的天然计数点:
|
|
* - 时基自走 g_ns_poll_tick_inc 毫秒(默认 1ms),NET_SEND_SPIN_MS=2 这种
|
|
* "有界自旋"预算才有可量测的时间轴;
|
|
* - 跑飞保险:轮询次数超阈值直接 exit(2)。net_send_locked / net_recvfrom 的
|
|
* 等待环里没有 osDelay,光靠 osDelay 的保险挡不住死循环(实测过一次挂门禁)。 */
|
|
GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin)
|
|
{
|
|
(void)GPIOx;
|
|
(void)GPIO_Pin;
|
|
g_ns_poll_calls++;
|
|
g_ns_tick += g_ns_poll_tick_inc;
|
|
if (g_ns_on_poll != NULL) {
|
|
g_ns_on_poll(); /* 并发事件注入点(在时间推进之后,超时判定才量得到) */
|
|
}
|
|
if (g_ns_poll_calls > 400000U) {
|
|
printf("FATAL: net_poll still not converged after %lu rounds (wait condition never met)\n",
|
|
(unsigned long)g_ns_poll_calls);
|
|
exit(2);
|
|
}
|
|
return (g_ns_int_pin_set != 0) ? GPIO_PIN_SET : GPIO_PIN_RESET;
|
|
}
|