mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 06:16:35 -04:00
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
168 lines
7.1 KiB
C
Vendored
Generated
168 lines
7.1 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_MULTIIF_H
|
|
#define HEADER_CURL_MULTIIF_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
/*
|
|
* Prototypes for library-wide functions provided by multi.c
|
|
*/
|
|
|
|
void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id);
|
|
void Curl_expire_ex(struct Curl_easy *data,
|
|
timediff_t milli, expire_id id);
|
|
void Curl_expire_clear(struct Curl_easy *data);
|
|
void Curl_expire_done(struct Curl_easy *data, expire_id id);
|
|
CURLMcode Curl_update_timer(struct Curl_multi *multi) WARN_UNUSED_RESULT;
|
|
void Curl_attach_connection(struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
void Curl_detach_connection(struct Curl_easy *data);
|
|
bool Curl_multiplex_wanted(const struct Curl_multi *multi);
|
|
void Curl_set_in_callback(struct Curl_easy *data, bool value);
|
|
bool Curl_is_in_callback(struct Curl_easy *data);
|
|
CURLcode Curl_preconnect(struct Curl_easy *data);
|
|
bool Curl_is_connecting(struct Curl_easy *data);
|
|
|
|
void Curl_multi_connchanged(struct Curl_multi *multi);
|
|
|
|
/* Internal version of curl_multi_init() accepts size parameters for the
|
|
socket, connection and dns hashes */
|
|
struct Curl_multi *Curl_multi_handle(uint32_t xfer_table_size,
|
|
size_t ev_hashsize,
|
|
size_t chashsize,
|
|
size_t dnssize,
|
|
size_t sesssize);
|
|
|
|
/**
|
|
* Let the multi handle know that the socket is about to be closed.
|
|
* The multi will then remove anything it knows about the socket, so
|
|
* when the OS is using this socket (number) again subsequently,
|
|
* the internal book keeping will not get confused.
|
|
*/
|
|
void Curl_multi_will_close(struct Curl_easy *data, curl_socket_t s);
|
|
|
|
/*
|
|
* Add a handle and move it into PERFORM state at once. For pushed streams.
|
|
*/
|
|
CURLMcode Curl_multi_add_perform(struct Curl_multi *multi,
|
|
struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
|
|
/* Return the value of the CURLMOPT_MAX_CONCURRENT_STREAMS option */
|
|
unsigned int Curl_multi_max_concurrent_streams(struct Curl_multi *multi);
|
|
|
|
CURLMcode Curl_multi_pollset(struct Curl_easy *data,
|
|
struct easy_pollset *ps);
|
|
|
|
/**
|
|
* Borrow the transfer buffer from the multi, suitable
|
|
* for the given transfer `data`. The buffer may only be used in one
|
|
* multi processing of the easy handle. It MUST be returned to the
|
|
* multi before it can be borrowed again.
|
|
* Pointers into the buffer remain only valid as long as it is borrowed.
|
|
*
|
|
* @param data the easy handle
|
|
* @param pbuf on return, the buffer to use or NULL on error
|
|
* @param pbuflen on return, the size of *pbuf or 0 on error
|
|
* @return CURLE_OK when buffer is available and is returned.
|
|
* CURLE_OUT_OF_MEMORy on failure to allocate the buffer,
|
|
* CURLE_FAILED_INIT if the easy handle is without multi.
|
|
* CURLE_AGAIN if the buffer is borrowed already.
|
|
*/
|
|
CURLcode Curl_multi_xfer_buf_borrow(struct Curl_easy *data,
|
|
char **pbuf, size_t *pbuflen);
|
|
/**
|
|
* Release the borrowed buffer. All references into the buffer become
|
|
* invalid after this.
|
|
* @param buf the buffer pointer borrowed for coding error checks.
|
|
*/
|
|
void Curl_multi_xfer_buf_release(struct Curl_easy *data, char *buf);
|
|
|
|
/**
|
|
* Borrow the upload buffer from the multi, suitable
|
|
* for the given transfer `data`. The buffer may only be used in one
|
|
* multi processing of the easy handle. It MUST be returned to the
|
|
* multi before it can be borrowed again.
|
|
* Pointers into the buffer remain only valid as long as it is borrowed.
|
|
*
|
|
* @param data the easy handle
|
|
* @param pbuf on return, the buffer to use or NULL on error
|
|
* @param pbuflen on return, the size of *pbuf or 0 on error
|
|
* @return CURLE_OK when buffer is available and is returned.
|
|
* CURLE_OUT_OF_MEMORy on failure to allocate the buffer,
|
|
* CURLE_FAILED_INIT if the easy handle is without multi.
|
|
* CURLE_AGAIN if the buffer is borrowed already.
|
|
*/
|
|
CURLcode Curl_multi_xfer_ulbuf_borrow(struct Curl_easy *data,
|
|
char **pbuf, size_t *pbuflen);
|
|
|
|
/**
|
|
* Release the borrowed upload buffer. All references into the buffer become
|
|
* invalid after this.
|
|
* @param buf the upload buffer pointer borrowed for coding error checks.
|
|
*/
|
|
void Curl_multi_xfer_ulbuf_release(struct Curl_easy *data, char *buf);
|
|
|
|
/**
|
|
* Borrow the socket scratch buffer from the multi, suitable
|
|
* for the given transfer `data`. The buffer may only be used for
|
|
* direct socket I/O operation by one connection at a time and MUST be
|
|
* returned to the multi before the I/O call returns.
|
|
* Pointers into the buffer remain only valid as long as it is borrowed.
|
|
*
|
|
* @param data the easy handle
|
|
* @param blen requested length of the buffer
|
|
* @param pbuf on return, the buffer to use or NULL on error
|
|
* @return CURLE_OK when buffer is available and is returned.
|
|
* CURLE_OUT_OF_MEMORy on failure to allocate the buffer,
|
|
* CURLE_FAILED_INIT if the easy handle is without multi.
|
|
* CURLE_AGAIN if the buffer is borrowed already.
|
|
*/
|
|
CURLcode Curl_multi_xfer_sockbuf_borrow(struct Curl_easy *data,
|
|
size_t blen, char **pbuf);
|
|
/**
|
|
* Release the borrowed buffer. All references into the buffer become
|
|
* invalid after this.
|
|
* @param buf the buffer pointer borrowed for coding error checks.
|
|
*/
|
|
void Curl_multi_xfer_sockbuf_release(struct Curl_easy *data, char *buf);
|
|
|
|
/**
|
|
* Get the easy handle for the given mid.
|
|
* Returns NULL if not found.
|
|
*/
|
|
struct Curl_easy *Curl_multi_get_easy(struct Curl_multi *multi,
|
|
uint32_t mid);
|
|
|
|
/* Get the # of transfers current in process/pending. */
|
|
unsigned int Curl_multi_xfers_running(struct Curl_multi *multi);
|
|
|
|
/* Mark a transfer as dirty, e.g. to be rerun at earliest convenience.
|
|
* A cheap operation, can be done many times repeatedly. */
|
|
void Curl_multi_mark_dirty(struct Curl_easy *data);
|
|
/* Clear transfer from the dirty set. */
|
|
void Curl_multi_clear_dirty(struct Curl_easy *data);
|
|
|
|
void Curl_multi_set_now(struct Curl_multi *multi);
|
|
|
|
#endif /* HEADER_CURL_MULTIIF_H */
|