fix(mcp): resolve poll/getline FILE* buffering mismatch causing tools/list hang

This commit is contained in:
Shane McCarron committed 2026-03-21 12:00:41 -05:00
1 parent 2704fdf734
commit b8b2dd356b
1 file changed
+41 -6
+41 -6
View File
@@ -2375,8 +2375,19 @@ int cbm_mcp_server_run(cbm_mcp_server_t *srv, FILE *in, FILE *out) {
for (;;) {
/* Poll with idle timeout so we can evict unused stores between requests.
* MCP is request-response (one line at a time), so mixing poll() on the
* raw fd with getline() on the buffered FILE* is safe in practice. */
*
* IMPORTANT: poll() operates on the raw fd, but getline() reads from a
* buffered FILE*. When a client sends multiple messages in rapid
* succession, the first getline() call may drain ALL kernel data into
* libc's internal FILE* buffer. Subsequent poll() calls then see an
* empty kernel fd and block for STORE_IDLE_TIMEOUT_S seconds even
* though the next messages are already in the FILE* buffer.
*
* Fix (Unix): use a two-phase approach —
* Phase 1: non-blocking poll (timeout=0) to check the kernel fd.
* Phase 2: if Phase 1 returns 0, peek the FILE* buffer via fgetc/
* ungetc to detect data buffered by a prior getline() call.
* Phase 3: only if both phases confirm no data, do blocking poll. */
#ifdef _WIN32
/* Windows: WaitForSingleObject on stdin handle */
HANDLE hStdin = (HANDLE)_get_osfhandle(fd);
@@ -2389,16 +2400,40 @@ int cbm_mcp_server_run(cbm_mcp_server_t *srv, FILE *in, FILE *out) {
continue;
}
#else
/* Phase 1: non-blocking poll — catches data already in the kernel fd
* AND handles the case where a prior getline() drained the kernel fd
* into libc's FILE* buffer (raw fd appears empty but data is buffered).
* We always try a zero-timeout poll first; if it misses buffered data,
* phase 2 below catches it via an explicit FILE* peek. */
struct pollfd pfd = {.fd = fd, .events = POLLIN};
int pr = poll(&pfd, 1, STORE_IDLE_TIMEOUT_S * 1000);
int pr = poll(&pfd, 1, 0); /* non-blocking */
if (pr < 0) {
break; /* error or signal */
}
if (pr == 0) {
/* Timeout — evict idle store to free resources */
cbm_mcp_server_evict_idle(srv, STORE_IDLE_TIMEOUT_S);
continue;
/* Raw fd appears empty. Check whether libc has already buffered
* data from a previous over-read by peeking one byte via fgetc.
* If successful, push it back and proceed to getline without
* blocking. If not (EOF or EAGAIN), do the blocking poll. */
int c = fgetc(in);
if (c == EOF) {
if (feof(in)) {
break; /* true EOF */
}
/* No buffered data and fd is empty — do blocking poll */
pr = poll(&pfd, 1, STORE_IDLE_TIMEOUT_S * 1000);
if (pr < 0) {
break;
}
if (pr == 0) {
cbm_mcp_server_evict_idle(srv, STORE_IDLE_TIMEOUT_S);
continue;
}
} else {
/* Buffered data found — push back and fall through to getline */
(void)ungetc(c, in);
}
}
#endif