mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 20:56:09 -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
5.9 KiB
C
Vendored
Generated
168 lines
5.9 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_CONNCACHE_H
|
|
#define HEADER_CURL_CONNCACHE_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
* Copyright (C) Linus Nielsen Feltzing, <linus@haxx.se>
|
|
*
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
#include "curlx/timeval.h"
|
|
|
|
struct connectdata;
|
|
struct Curl_easy;
|
|
struct curl_pollfds;
|
|
struct Curl_waitfds;
|
|
struct Curl_multi;
|
|
struct Curl_share;
|
|
|
|
/**
|
|
* Terminate the connection, e.g. close and destroy.
|
|
* If the connection is in a cpool, remove it.
|
|
* If a `cshutdn` is available (e.g. data has a multi handle),
|
|
* pass the connection to that for controlled shutdown.
|
|
* Otherwise terminate it right away.
|
|
* Takes ownership of `conn`.
|
|
* `data` should not be attached to a connection.
|
|
*/
|
|
void Curl_conn_terminate(struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
bool aborted);
|
|
|
|
struct cpool {
|
|
/* the pooled connections, bundled per destination */
|
|
struct Curl_hash dest2bundle;
|
|
size_t num_conn;
|
|
curl_off_t next_connection_id;
|
|
curl_off_t next_easy_id;
|
|
struct curltime last_cleanup;
|
|
struct Curl_easy *idata; /* internal handle for maintenance */
|
|
struct Curl_share *share; /* != NULL if pool belongs to share */
|
|
BIT(locked);
|
|
BIT(initialized);
|
|
};
|
|
|
|
/* Init the pool, pass multi only if pool is owned by it.
|
|
* Cannot fail.
|
|
*/
|
|
void Curl_cpool_init(struct cpool *cpool,
|
|
struct Curl_easy *idata,
|
|
struct Curl_share *share,
|
|
size_t size);
|
|
|
|
/* Destroy all connections and free all members */
|
|
void Curl_cpool_destroy(struct cpool *cpool);
|
|
|
|
/* Init the transfer to be used within its connection pool.
|
|
* Assigns `data->id`. */
|
|
void Curl_cpool_xfer_init(struct Curl_easy *data);
|
|
|
|
/* Get the connection with the given id from `data`'s conn pool. */
|
|
struct connectdata *Curl_cpool_get_conn(struct Curl_easy *data,
|
|
curl_off_t conn_id);
|
|
|
|
/* Add the connection to the pool. */
|
|
CURLcode Curl_cpool_add(struct Curl_easy *data,
|
|
struct connectdata *conn) WARN_UNUSED_RESULT;
|
|
|
|
/**
|
|
* Return if the pool has reached its configured limits for adding
|
|
* the given connection. Try to discard the oldest, idle connections
|
|
* to make space.
|
|
*/
|
|
#define CPOOL_LIMIT_OK 0
|
|
#define CPOOL_LIMIT_DEST 1
|
|
#define CPOOL_LIMIT_TOTAL 2
|
|
int Curl_cpool_check_limits(struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
|
|
/* Return of conn is suitable. If so, stops iteration. */
|
|
typedef bool Curl_cpool_conn_match_cb(struct connectdata *conn,
|
|
void *userdata);
|
|
|
|
/* Act on the result of the find, may override it. */
|
|
typedef bool Curl_cpool_done_match_cb(void *userdata);
|
|
|
|
/**
|
|
* Find a connection in the pool matching `destination`.
|
|
* All callbacks are invoked while the pool's lock is held.
|
|
* @param data current transfer
|
|
* @param destination match against `conn->destination` in pool
|
|
* @param conn_cb must be present, called for each connection in the
|
|
* bundle until it returns TRUE
|
|
* @return combined result of last conn_db and result_cb or FALSE if no
|
|
connections were present.
|
|
*/
|
|
bool Curl_cpool_find(struct Curl_easy *data,
|
|
const char *destination,
|
|
Curl_cpool_conn_match_cb *conn_cb,
|
|
Curl_cpool_done_match_cb *done_cb,
|
|
void *userdata);
|
|
|
|
/*
|
|
* A connection (already in the pool) is now idle. Do any
|
|
* cleanups in regard to the pool's limits.
|
|
*
|
|
* Return TRUE if idle connection kept in pool, FALSE if closed.
|
|
*/
|
|
bool Curl_cpool_conn_now_idle(struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
|
|
/**
|
|
* This function scans the data's connection pool for half-open/dead
|
|
* connections, closes and removes them.
|
|
* The cleanup is done at most once per second.
|
|
*
|
|
* When called, this transfer has no connection attached.
|
|
*/
|
|
void Curl_cpool_prune_dead(struct Curl_easy *data);
|
|
|
|
/**
|
|
* Perform upkeep actions on connections in the transfer's pool.
|
|
*/
|
|
CURLcode Curl_cpool_upkeep(struct Curl_easy *data);
|
|
|
|
typedef void Curl_cpool_conn_do_cb(struct connectdata *conn,
|
|
struct Curl_easy *data,
|
|
void *cbdata);
|
|
|
|
/**
|
|
* Invoke the callback on the pool's connection with the
|
|
* given connection id (if it exists).
|
|
*/
|
|
void Curl_cpool_do_by_id(struct Curl_easy *data,
|
|
curl_off_t conn_id,
|
|
Curl_cpool_conn_do_cb *cb, void *cbdata);
|
|
|
|
/**
|
|
* Invoked the callback for the given data + connection under the
|
|
* connection pool's lock.
|
|
* The callback is always invoked, even if the transfer has no connection
|
|
* pool associated.
|
|
*/
|
|
void Curl_cpool_do_locked(struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
Curl_cpool_conn_do_cb *cb, void *cbdata);
|
|
|
|
/* Close all unused connections, prevent reuse of existing ones. */
|
|
void Curl_cpool_nw_changed(struct Curl_easy *data);
|
|
|
|
#endif /* HEADER_CURL_CONNCACHE_H */
|