mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -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)
267 lines
8.0 KiB
C
Vendored
Generated
267 lines
8.0 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
#include "first.h"
|
|
|
|
#include "testtrace.h"
|
|
|
|
static int tse_found_tls_session = FALSE;
|
|
|
|
static size_t write_tse_cb(char *ptr, size_t size, size_t nmemb, void *opaque)
|
|
{
|
|
CURL *curl = opaque;
|
|
(void)ptr;
|
|
if(!tse_found_tls_session) {
|
|
struct curl_tlssessioninfo *tlssession;
|
|
CURLcode result;
|
|
|
|
result = curl_easy_getinfo(curl, CURLINFO_TLS_SSL_PTR, &tlssession);
|
|
if(result) {
|
|
curl_mfprintf(stderr, "curl_easy_getinfo(CURLINFO_TLS_SSL_PTR) "
|
|
"failed: %s\n", curl_easy_strerror(result));
|
|
return result;
|
|
}
|
|
if(tlssession->backend == CURLSSLBACKEND_NONE) {
|
|
curl_mfprintf(stderr, "curl_easy_getinfo(CURLINFO_TLS_SSL_PTR) "
|
|
"gave no backend\n");
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
if(!tlssession->internals) {
|
|
curl_mfprintf(stderr, "curl_easy_getinfo(CURLINFO_TLS_SSL_PTR) "
|
|
"missing\n");
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
tse_found_tls_session = TRUE;
|
|
}
|
|
return size * nmemb;
|
|
}
|
|
|
|
static CURL *tse_add_transfer(CURLM *multi, CURLSH *share,
|
|
struct curl_slist *resolve,
|
|
const char *url, long http_version)
|
|
{
|
|
CURL *curl;
|
|
CURLMcode mresult;
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init failed\n");
|
|
return NULL;
|
|
}
|
|
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, cli_debug_cb);
|
|
curl_easy_setopt(curl, CURLOPT_URL, url);
|
|
curl_easy_setopt(curl, CURLOPT_SHARE, share);
|
|
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_AUTOREFERER, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, http_version);
|
|
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_tse_cb);
|
|
curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl);
|
|
curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
|
|
if(resolve)
|
|
curl_easy_setopt(curl, CURLOPT_RESOLVE, resolve);
|
|
|
|
mresult = curl_multi_add_handle(multi, curl);
|
|
if(mresult != CURLM_OK) {
|
|
curl_mfprintf(stderr, "curl_multi_add_handle: %s\n",
|
|
curl_multi_strerror(mresult));
|
|
curl_easy_cleanup(curl);
|
|
return NULL;
|
|
}
|
|
return curl;
|
|
}
|
|
|
|
static CURLcode test_cli_tls_session_reuse(const char *URL)
|
|
{
|
|
CURLM *multi = NULL;
|
|
CURLMcode mresult;
|
|
int running_handles = 0, numfds;
|
|
CURLMsg *msg;
|
|
CURLSH *share = NULL;
|
|
CURLU *cu;
|
|
struct curl_slist *resolve = NULL;
|
|
char resolve_buf[1024];
|
|
int msgs_in_queue;
|
|
int add_more, waits, ongoing = 0;
|
|
char *host = NULL, *port = NULL;
|
|
long http_version = CURL_HTTP_VERSION_1_1;
|
|
CURLcode result = (CURLcode)1;
|
|
|
|
if(!URL || !libtest_arg2) {
|
|
curl_mfprintf(stderr, "need args: URL proto\n");
|
|
return (CURLcode)2;
|
|
}
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
return (CURLcode)3;
|
|
}
|
|
|
|
if(!strcmp("h2", libtest_arg2))
|
|
http_version = CURL_HTTP_VERSION_2;
|
|
else if(!strcmp("h3", libtest_arg2))
|
|
http_version = CURL_HTTP_VERSION_3ONLY;
|
|
|
|
cu = curl_url();
|
|
if(!cu) {
|
|
curl_mfprintf(stderr, "out of memory\n");
|
|
result = (CURLcode)1;
|
|
goto cleanup;
|
|
}
|
|
if(curl_url_set(cu, CURLUPART_URL, URL, 0)) {
|
|
curl_mfprintf(stderr, "not a URL: '%s'\n", URL);
|
|
goto cleanup;
|
|
}
|
|
if(curl_url_get(cu, CURLUPART_HOST, &host, 0)) {
|
|
curl_mfprintf(stderr, "could not get host of '%s'\n", URL);
|
|
goto cleanup;
|
|
}
|
|
if(curl_url_get(cu, CURLUPART_PORT, &port, 0)) {
|
|
curl_mfprintf(stderr, "could not get port of '%s'\n", URL);
|
|
goto cleanup;
|
|
}
|
|
|
|
curl_msnprintf(resolve_buf, sizeof(resolve_buf) - 1, "%s:%s:127.0.0.1",
|
|
host, port);
|
|
resolve = curl_slist_append(resolve, resolve_buf);
|
|
|
|
multi = curl_multi_init();
|
|
if(!multi) {
|
|
curl_mfprintf(stderr, "curl_multi_init failed\n");
|
|
goto cleanup;
|
|
}
|
|
|
|
share = curl_share_init();
|
|
if(!share) {
|
|
curl_mfprintf(stderr, "curl_share_init failed\n");
|
|
goto cleanup;
|
|
}
|
|
curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
|
|
|
|
if(!tse_add_transfer(multi, share, resolve, URL, http_version))
|
|
goto cleanup;
|
|
++ongoing;
|
|
add_more = 6;
|
|
waits = 3;
|
|
do {
|
|
mresult = curl_multi_perform(multi, &running_handles);
|
|
if(mresult != CURLM_OK) {
|
|
curl_mfprintf(stderr, "curl_multi_perform: %s\n",
|
|
curl_multi_strerror(mresult));
|
|
goto cleanup;
|
|
}
|
|
|
|
if(running_handles) {
|
|
mresult = curl_multi_poll(multi, NULL, 0, 1000000, &numfds);
|
|
if(mresult != CURLM_OK) {
|
|
curl_mfprintf(stderr, "curl_multi_poll: %s\n",
|
|
curl_multi_strerror(mresult));
|
|
goto cleanup;
|
|
}
|
|
}
|
|
|
|
if(waits) {
|
|
--waits;
|
|
}
|
|
else {
|
|
while(add_more) {
|
|
if(!tse_add_transfer(multi, share, resolve, URL, http_version))
|
|
goto cleanup;
|
|
++ongoing;
|
|
--add_more;
|
|
}
|
|
}
|
|
|
|
/* Check for finished handles and remove. */
|
|
/* !checksrc! disable EQUALSNULL 1 */
|
|
while((msg = curl_multi_info_read(multi, &msgs_in_queue)) != NULL) {
|
|
if(msg->msg == CURLMSG_DONE) {
|
|
long status = 0;
|
|
curl_off_t xfer_id;
|
|
curl_easy_getinfo(msg->easy_handle, CURLINFO_XFER_ID, &xfer_id);
|
|
curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &status);
|
|
if(msg->data.result == CURLE_SEND_ERROR ||
|
|
msg->data.result == CURLE_RECV_ERROR) {
|
|
/* We get these if the server had a GOAWAY in transit on
|
|
* reusing a connection */
|
|
}
|
|
else if(msg->data.result) {
|
|
curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T
|
|
": failed with %d\n", xfer_id, (int)msg->data.result);
|
|
goto cleanup;
|
|
}
|
|
else if(status != 200) {
|
|
curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T
|
|
": wrong http status %ld (expected 200)\n", xfer_id,
|
|
status);
|
|
goto cleanup;
|
|
}
|
|
curl_multi_remove_handle(multi, msg->easy_handle);
|
|
curl_easy_cleanup(msg->easy_handle);
|
|
--ongoing;
|
|
curl_mfprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T " retiring "
|
|
"(%d now running)\n", xfer_id, running_handles);
|
|
}
|
|
}
|
|
|
|
curl_mfprintf(stderr, "running_handles=%d, yet_to_start=%d\n",
|
|
running_handles, add_more);
|
|
|
|
} while(ongoing || add_more);
|
|
|
|
if(!tse_found_tls_session) {
|
|
curl_mfprintf(stderr, "CURLINFO_TLS_SSL_PTR not found during run\n");
|
|
result = CURLE_FAILED_INIT;
|
|
goto cleanup;
|
|
}
|
|
|
|
curl_mfprintf(stderr, "exiting\n");
|
|
result = CURLE_OK;
|
|
|
|
cleanup:
|
|
|
|
if(multi) {
|
|
CURL **list = curl_multi_get_handles(multi);
|
|
if(list) {
|
|
int i;
|
|
for(i = 0; list[i]; i++) {
|
|
curl_multi_remove_handle(multi, list[i]);
|
|
curl_easy_cleanup(list[i]);
|
|
}
|
|
curl_free(list);
|
|
}
|
|
curl_multi_cleanup(multi);
|
|
}
|
|
curl_share_cleanup(share);
|
|
curl_slist_free_all(resolve);
|
|
curl_free(host);
|
|
curl_free(port);
|
|
if(cu)
|
|
curl_url_cleanup(cu);
|
|
curl_global_cleanup();
|
|
|
|
return result;
|
|
}
|