Codex 69521e54e0 Add 15 embedded repair tasks and correct grader-read controls
Complete batch 20261016-C-embedded-2: 45 verified GLM/Pi samples, independent regrades and archives; preserve difficulty misses and Salty blockage.
2026-10-16 14:23:48 +08:00

23 lines
19 KiB
JSON
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

{
"kind": "event",
"seed": 4544068,
"context": {
"text.h": "#ifndef ABI_TEXT_H\n#define ABI_TEXT_H\n#include <stddef.h>\n#include <stdint.h>\n#include <stdio.h>\n\nenum { TEXT_LINE = 16384, TEXT_WORDS = 32, TEXT_BYTES = 4096 };\n\ntypedef struct {\n char line[TEXT_LINE];\n char *word[TEXT_WORDS];\n size_t count;\n unsigned long number;\n int failed;\n} text_reader;\n\nvoid text_init(text_reader *reader);\nint text_next(text_reader *reader, FILE *stream);\nint text_count(text_reader *reader, size_t expected);\nint text_u64(const char *word, uint64_t maximum, uint64_t *value);\nint text_i64(const char *word, int64_t minimum, int64_t maximum, int64_t *value);\nint text_unsigned(text_reader *reader, size_t index, unsigned maximum, unsigned *value);\nint text_signed(text_reader *reader, size_t index, int minimum, int maximum, int *value);\nint text_bytes(const char *word, uint8_t *data, size_t capacity, size_t *length);\nvoid text_hex(FILE *stream, const uint8_t *data, size_t length);\nuint32_t text_hash(const uint8_t *data, size_t length);\nvoid text_error(const text_reader *reader, const char *message);\n#endif\n",
"text.c": "#include \"text.h\"\n#include <errno.h>\n#include <inttypes.h>\n#include <limits.h>\n#include <stdlib.h>\n#include <string.h>\n\nstatic int separator(unsigned char ch)\n{\n return ch == ' ' || ch == '\\t' || ch == '\\r' || ch == '\\n';\n}\n\nvoid text_init(text_reader *reader)\n{\n memset(reader, 0, sizeof *reader);\n}\n\nstatic int split_line(text_reader *reader)\n{\n char *cursor = reader->line;\n reader->count = 0;\n while (*cursor != '\\0') {\n while (separator((unsigned char)*cursor))\n ++cursor;\n if (*cursor == '\\0' || *cursor == '#')\n break;\n if (reader->count == TEXT_WORDS)\n return 0;\n reader->word[reader->count++] = cursor;\n while (*cursor != '\\0' && !separator((unsigned char)*cursor))\n ++cursor;\n if (*cursor != '\\0')\n *cursor++ = '\\0';\n }\n return 1;\n}\n\nint text_next(text_reader *reader, FILE *stream)\n{\n while (fgets(reader->line, sizeof reader->line, stream) != NULL) {\n ++reader->number;\n size_t length = strlen(reader->line);\n if (length == sizeof reader->line - 1 && reader->line[length - 1] != '\\n') {\n reader->failed = 1;\n return -1;\n }\n if (!split_line(reader)) {\n reader->failed = 1;\n return -1;\n }\n if (reader->count != 0)\n return 1;\n }\n if (ferror(stream)) {\n reader->failed = 1;\n return -1;\n }\n return 0;\n}\n\nint text_count(text_reader *reader, size_t expected)\n{\n if (reader->count == expected)\n return 1;\n reader->failed = 1;\n return 0;\n}\n\nint text_u64(const char *word, uint64_t maximum, uint64_t *value)\n{\n char *end = NULL;\n unsigned long long parsed;\n if (word == NULL || *word == '\\0' || *word == '-')\n return 0;\n errno = 0;\n parsed = strtoull(word, &end, 10);\n if (errno != 0 || end == word || *end != '\\0' || parsed > maximum)\n return 0;\n *value = (uint64_t)parsed;\n return 1;\n}\n\nint text_i64(const char *word, int64_t minimum, int64_t maximum, int64_t *value)\n{\n char *end = NULL;\n long long parsed;\n if (word == NULL || *word == '\\0')\n return 0;\n errno = 0;\n parsed = strtoll(word, &end, 10);\n if (errno != 0 || end == word || *end != '\\0' || parsed < minimum || parsed > maximum)\n return 0;\n *value = (int64_t)parsed;\n return 1;\n}\n\nint text_unsigned(text_reader *reader, size_t index, unsigned maximum, unsigned *value)\n{\n uint64_t parsed;\n if (index >= reader->count || !text_u64(reader->word[index], maximum, &parsed)) {\n reader->failed = 1;\n return 0;\n }\n *value = (unsigned)parsed;\n return 1;\n}\n\nint text_signed(text_reader *reader, size_t index, int minimum, int maximum, int *value)\n{\n int64_t parsed;\n if (index >= reader->count || !text_i64(reader->word[index], minimum, maximum, &parsed)) {\n reader->failed = 1;\n return 0;\n }\n *value = (int)parsed;\n return 1;\n}\n\nstatic int hex_digit(unsigned char ch)\n{\n if (ch >= '0' && ch <= '9')\n return (int)(ch - '0');\n if (ch >= 'a' && ch <= 'f')\n return (int)(ch - 'a') + 10;\n if (ch >= 'A' && ch <= 'F')\n return (int)(ch - 'A') + 10;\n return -1;\n}\n\nint text_bytes(const char *word, uint8_t *data, size_t capacity, size_t *length)\n{\n size_t count;\n *length = 0;\n if (strcmp(word, \"-\") == 0)\n return 1;\n count = strlen(word);\n if ((count & 1u) != 0 || count / 2 > capacity)\n return 0;\n for (size_t index = 0; index < count / 2; ++index) {\n int high = hex_digit((unsigned char)word[index * 2]);\n int low = hex_digit((unsigned char)word[index * 2 + 1]);\n if (high < 0 || low < 0)\n return 0;\n data[index] = (uint8_t)((unsigned)high * 16u + (unsigned)low);\n }\n *length = count / 2;\n return 1;\n}\n\nvoid text_hex(FILE *stream, const uint8_t *data, size_t length)\n{\n if (length == 0) {\n fputc('-', stream);\n return;\n }\n for (size_t index = 0; index < length; ++index)\n fprintf(stream, \"%02x\", data[index]);\n}\n\nuint32_t text_hash(const uint8_t *data, size_t length)\n{\n uint32_t value = UINT32_C(2166136261);\n for (size_t index = 0; index < length; ++index) {\n value ^= data[index];\n value *= UINT32_C(16777619);\n }\n return value;\n}\n\nvoid text_error(const text_reader *reader, const char *message)\n{\n fprintf(stderr, \"input line %lu: %s\\n\", reader->number, message);\n}\n",
"events.h": "#ifndef ABI_EVENTS_H\n#define ABI_EVENTS_H\n#include <linux/input.h>\n#include <stddef.h>\n#include <stdint.h>\n#include <sys/types.h>\n\ntypedef struct {\n ssize_t (*read_call)(int fd, void *buffer, size_t capacity, void *context);\n int (*snapshot_call)(int fd, uint32_t *keys, void *context);\n void *context;\n} event_ops;\n\ntypedef void (*event_report)(void *context, int recovered, uint32_t keys,\n int64_t dx, int64_t dy, unsigned repeats,\n unsigned long serial);\n\ntypedef struct {\n uint8_t fragment[sizeof(struct input_event)];\n size_t used;\n uint32_t keys;\n uint32_t pending_keys;\n int64_t dx;\n int64_t dy;\n unsigned repeats;\n int dropping;\n unsigned long frames;\n unsigned long lost;\n event_report report;\n void *report_context;\n} event_reader;\n\nvoid event_init(event_reader *reader, event_report report, void *context);\nvoid event_discard(event_reader *reader);\nint event_accept(event_reader *reader, const struct input_event *event,\n int fd, const event_ops *ops);\nint event_pump(event_reader *reader, int fd, const event_ops *ops);\n#endif\n",
"event_console.c": "#include \"events.h\"\n#include \"text.h\"\n#include <errno.h>\n#include <inttypes.h>\n#include <stdio.h>\n#include <string.h>\n\ntypedef struct {\n uint8_t bytes[65536];\n size_t begin;\n size_t end;\n unsigned chunk;\n unsigned read_failures;\n int read_error;\n unsigned snapshot_failures;\n int snapshot_error;\n uint32_t snapshot;\n unsigned snapshots;\n int eof;\n event_reader reader;\n} endpoint;\n\nstatic endpoint banks[2];\n\nstatic ssize_t source_read(int fd, void *buffer, size_t capacity, void *context)\n{\n endpoint *source = context;\n (void)fd;\n if (source->read_failures != 0) {\n --source->read_failures;\n errno = source->read_error;\n return -1;\n }\n if (source->begin == source->end) {\n if (source->eof)\n return 0;\n errno = EAGAIN;\n return -1;\n }\n size_t amount = source->end - source->begin;\n if (amount > capacity)\n amount = capacity;\n if (amount > source->chunk)\n amount = source->chunk;\n memcpy(buffer, source->bytes + source->begin, amount);\n source->begin += amount;\n return (ssize_t)amount;\n}\n\nstatic int source_snapshot(int fd, uint32_t *keys, void *context)\n{\n endpoint *source = context;\n (void)fd;\n ++source->snapshots;\n if (source->snapshot_failures != 0) {\n --source->snapshot_failures;\n errno = source->snapshot_error;\n return -1;\n }\n *keys = source->snapshot;\n return 0;\n}\n\nstatic void report(void *context, int recovered, uint32_t keys, int64_t dx,\n int64_t dy, unsigned repeats, unsigned long serial)\n{\n unsigned id = (unsigned)((endpoint *)context - banks);\n printf(\"D %u %d %\" PRIu32 \" %\" PRId64 \" %\" PRId64 \" %u %lu\\n\",\n id, recovered, keys, dx, dy, repeats, serial);\n}\n\nstatic int append(endpoint *item, const uint8_t *bytes, size_t count)\n{\n if (item->begin != 0) {\n memmove(item->bytes, item->bytes + item->begin, item->end - item->begin);\n item->end -= item->begin;\n item->begin = 0;\n }\n if (count > sizeof item->bytes - item->end)\n return 0;\n memcpy(item->bytes + item->end, bytes, count);\n item->end += count;\n return 1;\n}\n\nstatic void state(const endpoint *item)\n{\n const event_reader *reader = &item->reader;\n printf(\"S %zu %d %\" PRIu32 \" %\" PRIu32 \" %\" PRId64 \" %\" PRId64 \" %u %lu %lu %u %zu\\n\",\n reader->used, reader->dropping, reader->keys, reader->pending_keys,\n reader->dx, reader->dy, reader->repeats, reader->frames, reader->lost,\n item->snapshots, item->end - item->begin);\n}\n\nstatic int event_command(text_reader *reader, endpoint *item)\n{\n unsigned type, code;\n int value;\n if (!text_count(reader, 4) || !text_unsigned(reader, 1, 65535, &type) ||\n !text_unsigned(reader, 2, 65535, &code) ||\n !text_signed(reader, 3, INT32_MIN, INT32_MAX, &value))\n return 0;\n struct input_event event;\n memset(&event, 0, sizeof event);\n event.type = (uint16_t)type;\n event.code = (uint16_t)code;\n event.value = value;\n return append(item, (const uint8_t *)&event, sizeof event);\n}\n\nstatic int fault_command(text_reader *reader, endpoint *item)\n{\n unsigned operation, count;\n int error;\n if (!text_count(reader, 4) || !text_unsigned(reader, 1, 1, &operation) ||\n !text_signed(reader, 2, 1, 255, &error) ||\n !text_unsigned(reader, 3, 10, &count))\n return 0;\n if (operation == 0) {\n item->read_error = error;\n item->read_failures = count;\n } else {\n item->snapshot_error = error;\n item->snapshot_failures = count;\n }\n return 1;\n}\n\nint main(void)\n{\n text_reader reader;\n unsigned selected = 0;\n text_init(&reader);\n for (size_t index = 0; index < 2; ++index) {\n banks[index].chunk = sizeof(struct input_event);\n event_init(&banks[index].reader, report, &banks[index]);\n }\n while (text_next(&reader, stdin) > 0) {\n endpoint *item = &banks[selected];\n const char *command = reader.word[0];\n int okay = 0;\n if (strcmp(command, \"A\") == 0) {\n okay = text_count(&reader, 2) && text_unsigned(&reader, 1, 1, &selected);\n item = &banks[selected];\n } else if (strcmp(command, \"E\") == 0) {\n okay = event_command(&reader, item);\n } else if (strcmp(command, \"Q\") == 0) {\n uint8_t bytes[TEXT_BYTES];\n size_t count;\n okay = text_count(&reader, 2) &&\n text_bytes(reader.word[1], bytes, sizeof bytes, &count) &&\n append(item, bytes, count);\n } else if (strcmp(command, \"C\") == 0) {\n unsigned count;\n okay = text_count(&reader, 2) && text_unsigned(&reader, 1, 128, &count) && count != 0;\n if (okay)\n item->chunk = count;\n } else if (strcmp(command, \"K\") == 0) {\n uint64_t mask;\n okay = text_count(&reader, 2) && text_u64(reader.word[1], UINT32_MAX, &mask);\n if (okay)\n item->snapshot = (uint32_t)mask;\n } else if (strcmp(command, \"F\") == 0) {\n okay = fault_command(&reader, item);\n } else if (strcmp(command, \"P\") == 0) {\n okay = text_count(&reader, 1);\n if (okay) {\n event_ops ops = { source_read, source_snapshot, item };\n printf(\"R %d\\n\", event_pump(&item->reader, (int)selected + 50, &ops));\n }\n } else if (strcmp(command, \"X\") == 0) {\n unsigned eof;\n okay = text_count(&reader, 2) && text_unsigned(&reader, 1, 1, &eof);\n if (okay)\n item->eof = (int)eof;\n } else if (strcmp(command, \"I\") == 0 || strcmp(command, \"N\") == 0) {\n okay = text_count(&reader, 1);\n if (okay)\n event_init(&item->reader, command[0] == 'N' ? NULL : report, item);\n } else if (strcmp(command, \"T\") == 0) {\n okay = text_count(&reader, 1);\n if (okay)\n event_discard(&item->reader);\n }\n if (!okay) {\n text_error(&reader, \"invalid event command\");\n return 2;\n }\n state(item);\n if (fflush(stdout) != 0)\n return 3;\n }\n return reader.failed ? 2 : 0;\n}\n",
"Makefile": "CC = gcc\nCFLAGS = -std=c11 -O2 -Wall -Wextra -pedantic\nall: abi_demo\nabi_demo: event_console.c text.c event_io.c event_state.c events.h text.h\n\t$(CC) $(CFLAGS) event_console.c text.c event_io.c event_state.c -o $@\nclean:\n\trm -f abi_demo\n.PHONY: all clean\n",
"README.md": "# evdev 采集器的分片与丢包恢复\n\n现场采集程序通过转发 fd 接收 Linux input_event 流:有时按键一直“按下”,拥塞恢复时旧移动量又被重放,小块读取后偶尔漏事件。修复当前 C11 工程的事件采集,保留接口与控制台格式。最终只提交并评分 `event_io.c`、`event_state.c`;头文件、控制台和构建脚本是只读上下文,评分从可信版本重建。\n\n## P1:流接口\n\n`events.h` 定义独立 `event_reader`、event_ops 和回调。`event_init` 全部计数、keys/pending_keys、dx/dy/repeats/dropping/used 清零,保留传入 callback/context;callback 可为 NULL,仍正常累计 frames。两实例必须独立。fd 是不透明输入描述符,通过 ops 回调读取;控制台以可注入的伪造 fd 软件源提供真实 Linux ABI 的 `struct input_event` 字节,不需要 evdev 设备。架构为 trace5 Linux x86_64,input_event 为 24 字节(两个原生 long timeval、uint16 type/code、int32 value),时间戳无语义。\n\n`event_pump` 连续读取和处理完整事件,直到 EAGAIN/EWOULDBLOCK 返回 0、无截断 EOF 返回 1、其他错误返回负 errno。read 返回正数可为任意短片段;任何跨 pump 的不完整事件必须保留,下一次从同一字节位置续接,不能把 EAGAIN 当帧结束。EINTR 原参数重试,不丢已读字节。read 的其他错误保留当前半个事件与已处理状态,供下一次重试;在错误前已提交的报告不撤销。若 EOF 时存在半个 input_event,丢弃半个事件和未提交事务(保留 committed keys),返回 `-EPROTO`;再次 EOF 返回 1。每次 read 的 capacity 不超过当前半个事件剩余容量,不能读取超出该事件后的字节。ops 或其两个回调缺失返回 `-EINVAL` 且无读取。所有输入指针有效,合法测试累计相对位移不会溢出 int64。\n\n## P2:事务与恢复\n\nEV_KEY(type=1) 且 code 0..31:value=0 清 pending_keys 对应位,value=1 置位,value=2 仅令当前事务 repeats 加一,**不改变按键位**;其他 value/code 忽略。EV_REL(type=2) code REL_X=0 / REL_Y=1 的 int32 value 累加到当前事务 dx/dy,其他 code 忽略。其他 event type、以及除 SYN_REPORT/SYN_DROPPED 外的 EV_SYN code 都忽略。\n\n正常态的 EV_SYN(type=0)/SYN_REPORT(code=0) 原子提交 pending_keys 至 keys,每次(含空事务)frames 加一,并回调 `report(context,0,keys,dx,dy,repeats,frames)`;随后 dx/dy/repeats 归零、pending_keys=keys。不能把已提交的位移或 repeats 带入下个报告。\n\nEV_SYN/SYN_DROPPED(code=3) 丢弃尚未提交的事务、进入 dropping;从正常态首次进入时 lost 加一,dropping 内重复 DROPPED 不再加。dropping 时忽略所有事件,直到 SYN_REPORT;此时必须通过 ops.snapshot_call 获取当前 32 位按键掩码,EINTR 原参数重试。snapshot 成功后 keys 和 pending_keys 等于该掩码、dx/dy/repeats=0、dropping=0,frames 加一并回调 `report(context,1,keys,0,0,0,frames)`,该报告不再作为普通事务提交。snapshot 的其他错误使 pump 立即返回负 errno,保持 dropping 以及 committed keys,不产生回调;该 SYN_REPORT 已被消费,后续 SYN_REPORT 可重试恢复。普通报告不调用 snapshot。\n\n`event_discard` 仅清半个事件和未提交事务(used=0、pending_keys=keys、dx/dy/repeats=0),保留 callback/context、keys、dropping、frames/lost。不会读 fd。候选不关闭 fd,不改 ops/context 源资产,除 API 正常状态外不输出内容。\n\n## P3:控制台与原始观测\n\n公开 `event_console.c` 只有输入源和打印,无断言。stdin 每行一条命令,整数十进制,空行/#注释忽略。初始两实例为空、每次 read 最多 24 字节、无 EOF。`A 0|1` 选择实例;`E type code value` 在该 fd 队尾追加一个时间戳为零的事件;`Q hex` 追加任意原始字节(`-` 为空);`C count`(1..128)设置每次短读上限;`K mask`(0..2^32-1)设置 snapshot 返回掩码;`F operation errno count` 注入接下来的 count 次回调失败,operation 0=read、1=snapshot,失败无副作用且 count 减一;`X 0|1` 设置队列空时是否 EOF;`P` 调用 pump;`I` 重置 reader、`N` 用 NULL callback 重置 reader(都不清源队列/故障/计数);`T` discard。所有注入由公开源码实现。\n\n回调输出 `D id recovered keys dx dy repeats serial`,P 随后输出 `R result`;每条命令后输出 `S used dropping keys pending_keys dx dy repeats frames lost snapshot_calls queued_bytes`。这些是候选状态和源的原始数值。snapshot_calls 包括失败与 EINTR 调用。输入 byte 缓冲和已读/未读队列不能由候选擅自修改。\n\n## P4:构建与自测\n\n`make`:`gcc -std=c11 -O2 -Wall -Wextra -pedantic event_console.c text.c event_io.c event_state.c -o abi_demo`。正式同参数干净构建,限 20 秒;执行每个有效脚本限 15 秒、退出码 0,stdout 只输出观察格式,stderr 可诊断;非法控制台输入退出 2。自测 `printf 'E 1 3 1\\nP\\nE 0 0 0\\nP\\nE 0 3 0\\nK 1024\\nE 0 0 0\\nP\\n' | ./abi_demo`,检查普通报告和恢复报告。验收含每个 byte 分片位置、跨调用半事件、短读/EINTR/错误后重试、重复键、丢包/失败后恢复、bit31、多个完整事务、EOF、NULL callback 和双实例交错。只验证软件 ABI 流处理,不验证内核输入驱动或真实设备。\n"
},
"candidates": [
"event_io.c",
"event_state.c"
],
"sources": [
"event_console.c",
"text.c",
"event_io.c",
"event_state.c"
]
}