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)
292 lines
7.7 KiB
C
Vendored
Generated
292 lines
7.7 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 "curl_setup.h"
|
|
|
|
#include "splay.h"
|
|
|
|
/*
|
|
* This macro compares two node keys i and j and returns:
|
|
*
|
|
* negative value: when i is smaller than j
|
|
* zero : when i is equal to j
|
|
* positive when : when i is larger than j
|
|
*/
|
|
#define splay_compare(i, j) curlx_ptimediff_us(i, j)
|
|
|
|
/*
|
|
* Splay using the key i (which may or may not be in the tree.) The starting
|
|
* root is t.
|
|
*/
|
|
struct Curl_tree *Curl_splay(const struct curltime *pkey,
|
|
struct Curl_tree *t)
|
|
{
|
|
struct Curl_tree N, *l, *r, *y;
|
|
|
|
if(!t)
|
|
return NULL;
|
|
N.smaller = N.larger = NULL;
|
|
l = r = &N;
|
|
|
|
for(;;) {
|
|
timediff_t comp = splay_compare(pkey, &t->key);
|
|
if(comp < 0) {
|
|
if(!t->smaller)
|
|
break;
|
|
if(splay_compare(pkey, &t->smaller->key) < 0) {
|
|
y = t->smaller; /* rotate smaller */
|
|
t->smaller = y->larger;
|
|
y->larger = t;
|
|
t = y;
|
|
if(!t->smaller)
|
|
break;
|
|
}
|
|
r->smaller = t; /* link smaller */
|
|
r = t;
|
|
t = t->smaller;
|
|
}
|
|
else if(comp > 0) {
|
|
if(!t->larger)
|
|
break;
|
|
if(splay_compare(pkey, &t->larger->key) > 0) {
|
|
y = t->larger; /* rotate larger */
|
|
t->larger = y->smaller;
|
|
y->smaller = t;
|
|
t = y;
|
|
if(!t->larger)
|
|
break;
|
|
}
|
|
l->larger = t; /* link larger */
|
|
l = t;
|
|
t = t->larger;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
|
|
l->larger = t->smaller; /* assemble */
|
|
r->smaller = t->larger;
|
|
t->smaller = N.larger;
|
|
t->larger = N.smaller;
|
|
|
|
return t;
|
|
}
|
|
|
|
static const struct curltime SPLAY_SUBNODE = {
|
|
~0, -1
|
|
};
|
|
|
|
/* Insert key i into the tree t. Return a pointer to the resulting tree or
|
|
* NULL if something went wrong.
|
|
*
|
|
* @unittest: 1309
|
|
*/
|
|
struct Curl_tree *Curl_splayinsert(const struct curltime *pkey,
|
|
struct Curl_tree *t,
|
|
struct Curl_tree *node)
|
|
{
|
|
DEBUGASSERT(node);
|
|
|
|
if(t) {
|
|
t = Curl_splay(pkey, t);
|
|
DEBUGASSERT(t);
|
|
if(splay_compare(pkey, &t->key) == 0) {
|
|
/* There already exists a node in the tree with the same key. Build a
|
|
doubly-linked circular list of nodes. We add the new 'node' struct to
|
|
the end of this list. */
|
|
|
|
node->key = SPLAY_SUBNODE; /* identify this node as a subnode */
|
|
node->samen = t;
|
|
node->samep = t->samep;
|
|
t->samep->samen = node;
|
|
t->samep = node;
|
|
|
|
return t; /* the root node always stays the same */
|
|
}
|
|
}
|
|
|
|
if(!t) {
|
|
node->smaller = node->larger = NULL;
|
|
}
|
|
else if(splay_compare(pkey, &t->key) < 0) {
|
|
node->smaller = t->smaller;
|
|
node->larger = t;
|
|
t->smaller = NULL;
|
|
}
|
|
else {
|
|
node->larger = t->larger;
|
|
node->smaller = t;
|
|
t->larger = NULL;
|
|
}
|
|
node->key = *pkey;
|
|
|
|
/* no identical nodes (yet), we are the only one in the list of nodes */
|
|
node->samen = node;
|
|
node->samep = node;
|
|
return node;
|
|
}
|
|
|
|
/* Finds and deletes the best-fit node from the tree. Return a pointer to the
|
|
resulting tree. best-fit means the smallest node if it is not larger than
|
|
the key */
|
|
struct Curl_tree *Curl_splaygetbest(const struct curltime *pkey,
|
|
struct Curl_tree *t,
|
|
struct Curl_tree **removed)
|
|
{
|
|
static const struct curltime tv_zero = { 0, 0 };
|
|
struct Curl_tree *x;
|
|
|
|
if(!t) {
|
|
*removed = NULL; /* none removed since there was no root */
|
|
return NULL;
|
|
}
|
|
|
|
/* find smallest */
|
|
t = Curl_splay(&tv_zero, t);
|
|
DEBUGASSERT(t);
|
|
if(splay_compare(pkey, &t->key) < 0) {
|
|
/* even the smallest is too big */
|
|
*removed = NULL;
|
|
return t;
|
|
}
|
|
|
|
/* FIRST! Check if there is a list with identical keys */
|
|
x = t->samen;
|
|
if(x != t) {
|
|
/* there is, pick one from the list */
|
|
|
|
/* 'x' is the new root node */
|
|
|
|
x->key = t->key;
|
|
x->larger = t->larger;
|
|
x->smaller = t->smaller;
|
|
x->samep = t->samep;
|
|
t->samep->samen = x;
|
|
|
|
*removed = t;
|
|
return x; /* new root */
|
|
}
|
|
|
|
/* we splayed the tree to the smallest element, there is no smaller */
|
|
x = t->larger;
|
|
*removed = t;
|
|
|
|
return x;
|
|
}
|
|
|
|
/* Deletes the node we point out from the tree if it is there. Stores a
|
|
* pointer to the new resulting tree in 'newroot'.
|
|
*
|
|
* Returns zero on success and non-zero on errors!
|
|
* When returning error, it does not touch the 'newroot' pointer.
|
|
*
|
|
* NOTE: when the last node of the tree is removed, there is no tree left so
|
|
* 'newroot' will be made to point to NULL.
|
|
*
|
|
* @unittest: 1309
|
|
*/
|
|
int Curl_splayremove(struct Curl_tree *t,
|
|
struct Curl_tree *removenode,
|
|
struct Curl_tree **newroot)
|
|
{
|
|
struct Curl_tree *x;
|
|
|
|
if(!t)
|
|
return 1;
|
|
|
|
DEBUGASSERT(removenode);
|
|
|
|
if(splay_compare(&SPLAY_SUBNODE, &removenode->key) == 0) {
|
|
/* It is a subnode within a 'same' linked list and thus we can unlink it
|
|
easily. */
|
|
DEBUGASSERT(removenode->samen != removenode);
|
|
if(removenode->samen == removenode)
|
|
/* A non-subnode should never be set to SPLAY_SUBNODE */
|
|
return 3;
|
|
|
|
removenode->samep->samen = removenode->samen;
|
|
removenode->samen->samep = removenode->samep;
|
|
|
|
/* Ensures that double-remove gets caught. */
|
|
removenode->samen = removenode;
|
|
|
|
*newroot = t; /* return the same root */
|
|
return 0;
|
|
}
|
|
|
|
t = Curl_splay(&removenode->key, t);
|
|
DEBUGASSERT(t);
|
|
|
|
/* First make sure that we got the same root node as the one we want
|
|
to remove, as otherwise we might be trying to remove a node that
|
|
is not actually in the tree.
|
|
|
|
We cannot compare the keys here as a double remove in quick
|
|
succession of a node with key != SPLAY_SUBNODE && same != NULL
|
|
could return the same key but a different node. */
|
|
DEBUGASSERT(t == removenode);
|
|
if(t != removenode)
|
|
return 2;
|
|
|
|
/* Check if there is a list with identical sizes, as then we are trying to
|
|
remove the root node of a list of nodes with identical keys. */
|
|
x = t->samen;
|
|
if(x != t) {
|
|
/* 'x' is the new root node, we make it use the root node's
|
|
smaller/larger links */
|
|
|
|
x->key = t->key;
|
|
x->larger = t->larger;
|
|
x->smaller = t->smaller;
|
|
x->samep = t->samep;
|
|
t->samep->samen = x;
|
|
}
|
|
else {
|
|
/* Remove the root node */
|
|
if(!t->smaller)
|
|
x = t->larger;
|
|
else {
|
|
x = Curl_splay(&removenode->key, t->smaller);
|
|
DEBUGASSERT(x);
|
|
x->larger = t->larger;
|
|
}
|
|
}
|
|
|
|
*newroot = x; /* store new root pointer */
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* set and get the custom payload for this tree node */
|
|
void Curl_splayset(struct Curl_tree *node, void *payload)
|
|
{
|
|
DEBUGASSERT(node);
|
|
node->ptr = payload;
|
|
}
|
|
|
|
void *Curl_splayget(struct Curl_tree *node)
|
|
{
|
|
DEBUGASSERT(node);
|
|
return node->ptr;
|
|
}
|