mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 22:35:07 -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)
228 lines
6.8 KiB
C
Vendored
Generated
228 lines
6.8 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 "bufq.h"
|
|
#include "cfilters.h"
|
|
#include "sendf.h"
|
|
#include "curl_trc.h"
|
|
#include "cw-pause.h"
|
|
|
|
|
|
/* body dynbuf sizes */
|
|
#define CW_PAUSE_BUF_CHUNK (16 * 1024)
|
|
/* when content decoding, write data in chunks */
|
|
#define CW_PAUSE_DEC_WRITE_CHUNK 4096
|
|
|
|
struct cw_pause_buf {
|
|
struct cw_pause_buf *next;
|
|
struct bufq b;
|
|
int type;
|
|
};
|
|
|
|
static struct cw_pause_buf *cw_pause_buf_create(int type, size_t buflen)
|
|
{
|
|
struct cw_pause_buf *cwbuf = curlx_calloc(1, sizeof(*cwbuf));
|
|
if(cwbuf) {
|
|
cwbuf->type = type;
|
|
if(type & CLIENTWRITE_BODY)
|
|
Curl_bufq_init2(&cwbuf->b, CW_PAUSE_BUF_CHUNK, 1,
|
|
(BUFQ_OPT_SOFT_LIMIT | BUFQ_OPT_NO_SPARES));
|
|
else
|
|
Curl_bufq_init(&cwbuf->b, buflen, 1);
|
|
}
|
|
return cwbuf;
|
|
}
|
|
|
|
static void cw_pause_buf_free(struct cw_pause_buf *cwbuf)
|
|
{
|
|
if(cwbuf) {
|
|
Curl_bufq_free(&cwbuf->b);
|
|
curlx_free(cwbuf);
|
|
}
|
|
}
|
|
|
|
struct cw_pause_ctx {
|
|
struct Curl_cwriter super;
|
|
struct cw_pause_buf *buf;
|
|
size_t buf_total;
|
|
};
|
|
|
|
static CURLcode cw_pause_init(struct Curl_easy *data,
|
|
struct Curl_cwriter *writer)
|
|
{
|
|
struct cw_pause_ctx *ctx = writer->ctx;
|
|
(void)data;
|
|
ctx->buf = NULL;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void cw_pause_bufs_free(struct cw_pause_ctx *ctx)
|
|
{
|
|
while(ctx->buf) {
|
|
struct cw_pause_buf *next = ctx->buf->next;
|
|
cw_pause_buf_free(ctx->buf);
|
|
ctx->buf = next;
|
|
}
|
|
}
|
|
|
|
static void cw_pause_close(struct Curl_easy *data, struct Curl_cwriter *writer)
|
|
{
|
|
struct cw_pause_ctx *ctx = writer->ctx;
|
|
|
|
(void)data;
|
|
cw_pause_bufs_free(ctx);
|
|
}
|
|
|
|
static CURLcode cw_pause_flush(struct Curl_easy *data,
|
|
struct Curl_cwriter *cw_pause)
|
|
{
|
|
struct cw_pause_ctx *ctx = (struct cw_pause_ctx *)cw_pause;
|
|
bool decoding = Curl_cwriter_is_content_decoding(data);
|
|
CURLcode result = CURLE_OK;
|
|
|
|
/* write the end of the chain until it blocks or gets empty */
|
|
while(ctx->buf && !Curl_cwriter_is_paused(data)) {
|
|
struct cw_pause_buf **plast = &ctx->buf;
|
|
size_t blen, wlen = 0;
|
|
const unsigned char *buf = NULL;
|
|
|
|
while((*plast)->next) /* got to last in list */
|
|
plast = &(*plast)->next;
|
|
if(Curl_bufq_peek(&(*plast)->b, &buf, &blen)) {
|
|
wlen = (decoding && ((*plast)->type & CLIENTWRITE_BODY)) ?
|
|
CURLMIN(blen, CW_PAUSE_DEC_WRITE_CHUNK) : blen;
|
|
result = Curl_cwriter_write(data, cw_pause->next, (*plast)->type,
|
|
(const char *)buf, wlen);
|
|
CURL_TRC_WRITE(data, "[PAUSE] flushed %zu/%zu bytes, type=%x -> %d",
|
|
wlen, ctx->buf_total, (unsigned int)(*plast)->type,
|
|
(int)result);
|
|
Curl_bufq_skip(&(*plast)->b, wlen);
|
|
DEBUGASSERT(ctx->buf_total >= wlen);
|
|
ctx->buf_total -= wlen;
|
|
if(result)
|
|
return result;
|
|
}
|
|
else if((*plast)->type & CLIENTWRITE_EOS) {
|
|
result = Curl_cwriter_write(data, cw_pause->next, (*plast)->type,
|
|
(const char *)buf, 0);
|
|
CURL_TRC_WRITE(data, "[PAUSE] flushed 0/%zu bytes, type=%x -> %d",
|
|
ctx->buf_total, (unsigned int)(*plast)->type,
|
|
(int)result);
|
|
}
|
|
|
|
if(Curl_bufq_is_empty(&(*plast)->b)) {
|
|
cw_pause_buf_free(*plast);
|
|
*plast = NULL;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static CURLcode cw_pause_write(struct Curl_easy *data,
|
|
struct Curl_cwriter *writer, int type,
|
|
const char *buf, size_t blen)
|
|
{
|
|
struct cw_pause_ctx *ctx = writer->ctx;
|
|
CURLcode result = CURLE_OK;
|
|
size_t wlen = 0;
|
|
bool decoding = Curl_cwriter_is_content_decoding(data);
|
|
|
|
if(ctx->buf && !Curl_cwriter_is_paused(data)) {
|
|
result = cw_pause_flush(data, writer);
|
|
if(result)
|
|
return result;
|
|
}
|
|
|
|
while(!ctx->buf && !Curl_cwriter_is_paused(data)) {
|
|
int wtype = type;
|
|
DEBUGASSERT(!ctx->buf);
|
|
/* content decoding might blow up size considerably, write smaller
|
|
* chunks to make pausing need buffer less. */
|
|
wlen = (decoding && (type & CLIENTWRITE_BODY)) ?
|
|
CURLMIN(blen, CW_PAUSE_DEC_WRITE_CHUNK) : blen;
|
|
if(wlen < blen)
|
|
wtype &= ~CLIENTWRITE_EOS;
|
|
result = Curl_cwriter_write(data, writer->next, wtype, buf, wlen);
|
|
CURL_TRC_WRITE(data, "[PAUSE] writing %zu/%zu bytes of type %x -> %d",
|
|
wlen, blen, (unsigned int)wtype, (int)result);
|
|
if(result)
|
|
return result;
|
|
buf += wlen;
|
|
blen -= wlen;
|
|
if(!blen)
|
|
return result;
|
|
}
|
|
|
|
do {
|
|
size_t nwritten = 0;
|
|
if(ctx->buf && (ctx->buf->type == type) && (type & CLIENTWRITE_BODY)) {
|
|
/* same type and body, append to current buffer which has a soft
|
|
* limit and should take everything up to OOM. */
|
|
result = Curl_bufq_cwrite(&ctx->buf->b, buf, blen, &nwritten);
|
|
}
|
|
else {
|
|
/* Need a new buf, type changed */
|
|
struct cw_pause_buf *cwbuf = cw_pause_buf_create(type, blen);
|
|
if(!cwbuf)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
cwbuf->next = ctx->buf;
|
|
ctx->buf = cwbuf;
|
|
result = Curl_bufq_cwrite(&ctx->buf->b, buf, blen, &nwritten);
|
|
}
|
|
CURL_TRC_WRITE(data, "[PAUSE] buffer %zu more bytes of type %x, "
|
|
"total=%zu -> %d", nwritten, (unsigned int)type,
|
|
ctx->buf_total + wlen, (int)result);
|
|
if(result)
|
|
return result;
|
|
buf += nwritten;
|
|
blen -= nwritten;
|
|
ctx->buf_total += nwritten;
|
|
} while(blen);
|
|
|
|
return result;
|
|
}
|
|
|
|
const struct Curl_cwtype Curl_cwt_pause = {
|
|
"cw-pause",
|
|
NULL,
|
|
cw_pause_init,
|
|
cw_pause_write,
|
|
cw_pause_close,
|
|
sizeof(struct cw_pause_ctx)
|
|
};
|
|
|
|
CURLcode Curl_cw_pause_flush(struct Curl_easy *data)
|
|
{
|
|
struct Curl_cwriter *cw_pause;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
cw_pause = Curl_cwriter_get_by_type(data, &Curl_cwt_pause);
|
|
if(cw_pause)
|
|
result = cw_pause_flush(data, cw_pause);
|
|
|
|
return result;
|
|
}
|