fix(server): portable exit-code on subprocess-alive=false path (windows build break)#64
Merged
Merged
Conversation
`tools/server/server-models.cpp:923` used `child_proc->return_status`, which is a POSIX-only field of `subprocess_s` — the Windows variant of the struct has `hProcess` instead, so this fails to compile on every Windows CI runner. Replace the direct field access with a portable `subprocess_join(child_proc.get(), &child_exit)` call (same pattern already used at line 908 of the same file). `subprocess_alive()` has already reaped the zombie on POSIX, so `subprocess_join()` returns immediately with the cached status.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
Every Windows build job on PRs #62 and #63 is failing with:
subprocess_s::return_statusis defined only in the POSIX branch of vendor/sheredom/subprocess.h:402-418. The Windows variant useshProcessinstead, so the direct field access doesn't compile.Fix
Replace the direct field access with
subprocess_join(child_proc.get(), &child_exit)— same pattern already used at line 908 of the same file.subprocess_alive()has already reaped the zombie on POSIX, sosubprocess_join()returns immediately with the cached status (no risk of re-blocking on a stuck child).Impact
subprocess_joinjust returnsprocess->return_status.Verified
cmake -B build -DGGML_CPU=ON -DLLAMA_BUILD_APP=ON && cmake --build build --target llama-serversucceeds locally.