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)
296 lines
8.9 KiB
C
Vendored
Generated
296 lines
8.9 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 "urldata.h"
|
|
#include "ratelimit.h"
|
|
|
|
#define CURL_US_PER_SEC 1000000
|
|
#define CURL_RLIMIT_MIN_RATE (4 * 1024) /* minimum step rate */
|
|
#define CURL_RLIMIT_STEP_MIN_MS 2 /* minimum step duration */
|
|
|
|
static void rlimit_update(struct Curl_rlimit *r,
|
|
const struct curltime *pts)
|
|
{
|
|
timediff_t elapsed_us, elapsed_steps;
|
|
int64_t token_gain;
|
|
|
|
DEBUGASSERT(r->rate_per_step);
|
|
if((r->ts.tv_sec == pts->tv_sec) && (r->ts.tv_usec == pts->tv_usec))
|
|
return;
|
|
|
|
elapsed_us = curlx_ptimediff_us(pts, &r->ts);
|
|
if(elapsed_us < 0) { /* not going back in time */
|
|
DEBUGASSERT(0);
|
|
return;
|
|
}
|
|
|
|
elapsed_us += r->spare_us;
|
|
if(elapsed_us < r->step_us)
|
|
return;
|
|
|
|
/* we do the update */
|
|
r->ts = *pts;
|
|
elapsed_steps = elapsed_us / r->step_us;
|
|
r->spare_us = elapsed_us % r->step_us;
|
|
|
|
/* How many tokens did we gain since the last update? */
|
|
if(r->rate_per_step > (INT64_MAX / elapsed_steps))
|
|
token_gain = INT64_MAX;
|
|
else {
|
|
token_gain = r->rate_per_step * elapsed_steps;
|
|
}
|
|
|
|
if((INT64_MAX - token_gain) > r->tokens)
|
|
r->tokens += token_gain;
|
|
else
|
|
r->tokens = INT64_MAX;
|
|
|
|
/* Limit the token again by the burst rate (if set), so we
|
|
* do not suddenly have a huge number of tokens after inactivity. */
|
|
if(r->burst_per_step && (r->tokens > r->burst_per_step)) {
|
|
r->tokens = r->burst_per_step;
|
|
}
|
|
}
|
|
|
|
static void rlimit_tune_steps(struct Curl_rlimit *r,
|
|
int64_t tokens_total)
|
|
{
|
|
int64_t tokens_last, tokens_main, msteps;
|
|
|
|
/* Tune the ratelimit at the start *if* we know how many tokens
|
|
* are expected to be consumed in total.
|
|
* The reason for tuning is that rlimit provides tokens to be consumed
|
|
* per "step" which starts out to be a second. The tokens may be consumed
|
|
* in full at the beginning of a step. The remainder of the second will
|
|
* have no tokens available, effectively blocking the consumption and
|
|
* so keeping the "step average" in line.
|
|
* This works will up to the last step. When no more tokens are needed,
|
|
* no wait will happen and the last step would be too fast. This is
|
|
* especially noticeable when only a few steps are needed.
|
|
*
|
|
* Example: downloading 1.5kb with a ratelimit of 1k could be done in
|
|
* roughly 1 second (1k in the first second and the 0.5 at the start of
|
|
* the second one).
|
|
*
|
|
* The tuning tries to make the last step small, using only
|
|
* 1 percent of the total tokens (at least 1). The rest of the tokens
|
|
* are to be consumed in the steps before by adjusting the duration of
|
|
* the step and the amount of tokens it provides. */
|
|
if(!r->rate_per_step ||
|
|
(tokens_total <= 1) ||
|
|
(tokens_total > (INT64_MAX / 1000)))
|
|
return;
|
|
|
|
/* Calculate tokens for the last step and the ones before. */
|
|
tokens_last = tokens_total / 100;
|
|
if(!tokens_last) /* less than 100 total, use 1 */
|
|
tokens_last = 1;
|
|
else if(tokens_last > CURL_RLIMIT_MIN_RATE)
|
|
tokens_last = CURL_RLIMIT_MIN_RATE;
|
|
DEBUGASSERT(tokens_last);
|
|
tokens_main = tokens_total - tokens_last;
|
|
DEBUGASSERT(tokens_main);
|
|
|
|
/* how many milli-steps will it take to consume those, give the
|
|
* original rate limit per second? */
|
|
DEBUGASSERT(r->step_us == CURL_US_PER_SEC);
|
|
|
|
msteps = (tokens_main * 1000 / r->rate_per_step);
|
|
if(msteps < CURL_RLIMIT_STEP_MIN_MS) {
|
|
/* Steps this small will not work. Do not tune. */
|
|
return;
|
|
}
|
|
else if(msteps < 1000) {
|
|
/* It needs less than one step to provide the needed tokens.
|
|
* Make it exactly that long and with exactly those tokens. */
|
|
r->step_us = (timediff_t)msteps * 1000;
|
|
r->rate_per_step = tokens_main;
|
|
r->tokens = r->rate_per_step;
|
|
}
|
|
else {
|
|
/* More than 1 step. Spread the remainder milli steps and
|
|
* the tokens they need to provide across all steps. If integer
|
|
* arithmetic can do it. */
|
|
curl_off_t ms_unaccounted = (msteps % 1000);
|
|
curl_off_t mstep_inc = (ms_unaccounted / (msteps / 1000));
|
|
if(mstep_inc) {
|
|
curl_off_t rate_inc = ((r->rate_per_step * mstep_inc) / 1000);
|
|
if(rate_inc) {
|
|
r->step_us = CURL_US_PER_SEC + ((timediff_t)mstep_inc * 1000);
|
|
r->rate_per_step += rate_inc;
|
|
r->tokens = r->rate_per_step;
|
|
if(r->burst_per_step) {
|
|
curl_off_t burst_inc = ((r->burst_per_step * mstep_inc) / 1000);
|
|
if(burst_inc)
|
|
r->burst_per_step += burst_inc;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void Curl_rlimit_init(struct Curl_rlimit *r,
|
|
int64_t rate_per_sec,
|
|
int64_t burst_per_sec,
|
|
const struct curltime *pts)
|
|
{
|
|
DEBUGASSERT(rate_per_sec >= 0);
|
|
DEBUGASSERT(burst_per_sec >= rate_per_sec || !burst_per_sec);
|
|
DEBUGASSERT(pts);
|
|
r->rate_per_step = r->rate_per_sec = rate_per_sec;
|
|
r->burst_per_step = r->burst_per_sec = burst_per_sec;
|
|
r->step_us = CURL_US_PER_SEC;
|
|
r->spare_us = 0;
|
|
r->tokens = r->rate_per_step;
|
|
r->ts = *pts;
|
|
r->blocked = FALSE;
|
|
}
|
|
|
|
void Curl_rlimit_start(struct Curl_rlimit *r, const struct curltime *pts,
|
|
int64_t total_tokens)
|
|
{
|
|
/* A start always resets the values to initial defaults, then
|
|
* fine tunes the intervals for the total_tokens expected. */
|
|
r->rate_per_step = r->rate_per_sec;
|
|
r->burst_per_step = r->burst_per_sec;
|
|
r->step_us = CURL_US_PER_SEC;
|
|
r->spare_us = 0;
|
|
r->tokens = r->rate_per_step;
|
|
r->ts = *pts;
|
|
rlimit_tune_steps(r, total_tokens);
|
|
}
|
|
|
|
int64_t Curl_rlimit_per_step(struct Curl_rlimit *r)
|
|
{
|
|
return r->rate_per_step;
|
|
}
|
|
|
|
bool Curl_rlimit_active(struct Curl_rlimit *r)
|
|
{
|
|
return (r->rate_per_step > 0) || r->blocked;
|
|
}
|
|
|
|
bool Curl_rlimit_is_blocked(struct Curl_rlimit *r)
|
|
{
|
|
return (bool)r->blocked;
|
|
}
|
|
|
|
int64_t Curl_rlimit_avail(struct Curl_rlimit *r,
|
|
const struct curltime *pts)
|
|
{
|
|
if(r->blocked)
|
|
return 0;
|
|
else if(r->rate_per_step) {
|
|
rlimit_update(r, pts);
|
|
return r->tokens;
|
|
}
|
|
else
|
|
return INT64_MAX;
|
|
}
|
|
|
|
void Curl_rlimit_drain(struct Curl_rlimit *r,
|
|
size_t tokens,
|
|
const struct curltime *pts)
|
|
{
|
|
if(r->blocked || !r->rate_per_step)
|
|
return;
|
|
|
|
rlimit_update(r, pts);
|
|
#if 8 <= SIZEOF_SIZE_T
|
|
if(tokens > INT64_MAX) {
|
|
r->tokens = INT64_MAX;
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
int64_t val = (int64_t)tokens;
|
|
if((INT64_MIN + val) < r->tokens)
|
|
r->tokens -= val;
|
|
else
|
|
r->tokens = INT64_MIN;
|
|
}
|
|
}
|
|
|
|
timediff_t Curl_rlimit_wait_ms(struct Curl_rlimit *r,
|
|
const struct curltime *pts)
|
|
{
|
|
timediff_t wait_us, elapsed_us;
|
|
|
|
if(r->blocked || !r->rate_per_step)
|
|
return 0;
|
|
rlimit_update(r, pts);
|
|
if(r->tokens > 0)
|
|
return 0;
|
|
|
|
/* How much time will it take tokens to become positive again?
|
|
* Deduct `spare_us` and check against already elapsed time */
|
|
wait_us = r->step_us - r->spare_us;
|
|
if(r->tokens < 0) {
|
|
curl_off_t debt_pct = ((-r->tokens) * 100 / r->rate_per_step);
|
|
if(debt_pct)
|
|
wait_us += (r->step_us * debt_pct / 100);
|
|
}
|
|
|
|
elapsed_us = curlx_ptimediff_us(pts, &r->ts);
|
|
if(elapsed_us >= wait_us)
|
|
return 0;
|
|
wait_us -= elapsed_us;
|
|
return (wait_us + 999) / 1000; /* in milliseconds */
|
|
}
|
|
|
|
timediff_t Curl_rlimit_next_step_ms(struct Curl_rlimit *r,
|
|
const struct curltime *pts)
|
|
{
|
|
if(!r->blocked && r->rate_per_step) {
|
|
timediff_t elapsed_us, next_us;
|
|
|
|
elapsed_us = curlx_ptimediff_us(pts, &r->ts) + r->spare_us;
|
|
if(r->step_us > elapsed_us) {
|
|
next_us = r->step_us - elapsed_us;
|
|
return (next_us + 999) / 1000; /* in milliseconds */
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void Curl_rlimit_block(struct Curl_rlimit *r,
|
|
bool activate,
|
|
const struct curltime *pts)
|
|
{
|
|
if(!activate == !r->blocked)
|
|
return;
|
|
|
|
r->ts = *pts;
|
|
r->blocked = activate;
|
|
if(!r->blocked) {
|
|
/* Start rate limiting fresh. The amount of time this was blocked
|
|
* does not generate extra tokens. */
|
|
Curl_rlimit_start(r, pts, -1);
|
|
}
|
|
else {
|
|
r->tokens = 0;
|
|
}
|
|
}
|