mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 12:55:22 -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)
307 lines
8.1 KiB
C
Vendored
Generated
307 lines
8.1 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"
|
|
|
|
#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
|
|
|
|
#include "urldata.h"
|
|
#include "cfilters.h"
|
|
#include "curl_trc.h"
|
|
#include "bufq.h"
|
|
#include "select.h"
|
|
#include "vquic/capsule.h"
|
|
#include "vquic/cf-capsule.h"
|
|
|
|
/* send/recv buffer: 4 chunks of 16KB = 64KB, enough for large datagrams */
|
|
#define CAPSULE_RECV_CHUNKS 4
|
|
#define CAPSULE_SEND_CHUNKS 4
|
|
#define CAPSULE_CHUNK_SIZE (16 * 1024)
|
|
|
|
struct cf_capsule_ctx {
|
|
struct bufq recvbuf;
|
|
struct bufq sendbuf;
|
|
};
|
|
|
|
static void cf_capsule_destroy(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data)
|
|
{
|
|
struct cf_capsule_ctx *ctx = cf->ctx;
|
|
(void)data;
|
|
if(ctx) {
|
|
Curl_bufq_free(&ctx->recvbuf);
|
|
Curl_bufq_free(&ctx->sendbuf);
|
|
curlx_safefree(ctx);
|
|
}
|
|
}
|
|
|
|
static CURLcode cf_capsule_connect(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
bool *done)
|
|
{
|
|
if(cf->connected) {
|
|
*done = TRUE;
|
|
return CURLE_OK;
|
|
}
|
|
if(cf->next) {
|
|
CURLcode result = cf->next->cft->do_connect(cf->next, data, done);
|
|
if(!result && *done)
|
|
cf->connected = TRUE;
|
|
return result;
|
|
}
|
|
*done = FALSE;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode cf_capsule_flush(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data)
|
|
{
|
|
struct cf_capsule_ctx *ctx = cf->ctx;
|
|
CURLcode result = CURLE_OK;
|
|
size_t nwritten;
|
|
|
|
if(Curl_bufq_is_empty(&ctx->sendbuf))
|
|
return CURLE_OK;
|
|
|
|
result = Curl_cf_send_bufq(cf->next, data, &ctx->sendbuf, NULL, 0,
|
|
&nwritten);
|
|
if(result) {
|
|
if(result == CURLE_AGAIN) {
|
|
CURL_TRC_CF(data, cf, "flush send buffer(%zu) -> EAGAIN",
|
|
Curl_bufq_len(&ctx->sendbuf));
|
|
}
|
|
return result;
|
|
}
|
|
return Curl_bufq_is_empty(&ctx->sendbuf) ? CURLE_OK : CURLE_AGAIN;
|
|
}
|
|
|
|
static CURLcode cf_capsule_send(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
const uint8_t *buf, size_t len,
|
|
bool eos, size_t *pnwritten)
|
|
{
|
|
struct cf_capsule_ctx *ctx = cf->ctx;
|
|
CURLcode result;
|
|
|
|
(void)eos;
|
|
*pnwritten = 0;
|
|
|
|
if(Curl_bufq_is_full(&ctx->sendbuf)) {
|
|
result = cf_capsule_flush(cf, data);
|
|
if(result)
|
|
return result;
|
|
}
|
|
|
|
/* encapsulate new payload into a capsule */
|
|
result = Curl_capsule_encap_udp_datagram(&ctx->sendbuf, buf, len);
|
|
if(result)
|
|
return result;
|
|
|
|
result = cf_capsule_flush(cf, data);
|
|
if(result == CURLE_AGAIN) {
|
|
/* Could not send it (or all), report success nevertheless as we
|
|
* have the payload buffered now and will flush it later. */
|
|
result = CURLE_OK;
|
|
}
|
|
|
|
if(!result)
|
|
*pnwritten = len;
|
|
return result;
|
|
}
|
|
|
|
static CURLcode cf_capsule_recv(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
char *buf, size_t len,
|
|
size_t *pnread)
|
|
{
|
|
struct cf_capsule_ctx *ctx = cf->ctx;
|
|
CURLcode result;
|
|
size_t nread;
|
|
|
|
*pnread = 0;
|
|
|
|
/* fill our receive buffer from the filter below */
|
|
while(!Curl_bufq_is_full(&ctx->recvbuf)) {
|
|
result = Curl_cf_recv_bufq(cf->next, data, &ctx->recvbuf, 0, &nread);
|
|
if(result == CURLE_AGAIN)
|
|
break;
|
|
if(result)
|
|
return result;
|
|
if(!nread)
|
|
break;
|
|
}
|
|
|
|
/* try to extract a complete capsule datagram */
|
|
*pnread = Curl_capsule_process_udp_raw(cf, data, &ctx->recvbuf,
|
|
(unsigned char *)buf, len,
|
|
&result);
|
|
return result;
|
|
}
|
|
|
|
static bool cf_capsule_data_pending(struct Curl_cfilter *cf,
|
|
const struct Curl_easy *data)
|
|
{
|
|
struct cf_capsule_ctx *ctx = cf->ctx;
|
|
|
|
if(ctx && !Curl_bufq_is_empty(&ctx->recvbuf))
|
|
return TRUE;
|
|
return cf->next ? cf->next->cft->has_data_pending(cf->next, data) : FALSE;
|
|
}
|
|
|
|
static CURLcode cf_capsule_cntrl(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
int event, int arg1, void *arg2)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
|
|
(void)arg1;
|
|
(void)arg2;
|
|
switch(event) {
|
|
case CF_CTRL_FLUSH:
|
|
result = cf_capsule_flush(cf, data);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static CURLcode cf_capsule_query(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
int query, int *pres1, void *pres2)
|
|
{
|
|
struct cf_capsule_ctx *ctx = cf->ctx;
|
|
|
|
(void)pres2;
|
|
switch(query) {
|
|
case CF_QUERY_NEED_FLUSH: {
|
|
if(!Curl_bufq_is_empty(&ctx->sendbuf)) {
|
|
*pres1 = TRUE;
|
|
return CURLE_OK;
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
return cf->next ?
|
|
cf->next->cft->query(cf->next, data, query, pres1, pres2) :
|
|
CURLE_UNKNOWN_OPTION;
|
|
}
|
|
|
|
static CURLcode cf_capsule_adjust_pollset(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
struct easy_pollset *ps)
|
|
{
|
|
struct cf_capsule_ctx *ctx = cf->ctx;
|
|
|
|
if(!Curl_bufq_is_empty(&ctx->sendbuf)) {
|
|
curl_socket_t sock = Curl_conn_cf_get_socket(cf, data);
|
|
if(sock != CURL_SOCKET_BAD)
|
|
return Curl_pollset_add_out(data, ps, sock);
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode cf_capsule_shutdown(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data, bool *done)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
|
|
if(!cf->connected || cf->shutdown) {
|
|
*done = TRUE;
|
|
}
|
|
else {
|
|
result = cf_capsule_flush(cf, data);
|
|
*done = !result;
|
|
if(result == CURLE_AGAIN)
|
|
result = CURLE_OK;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
struct Curl_cftype Curl_cft_capsule = {
|
|
"CAPSULE",
|
|
0,
|
|
0,
|
|
cf_capsule_destroy,
|
|
cf_capsule_connect,
|
|
cf_capsule_shutdown,
|
|
cf_capsule_adjust_pollset,
|
|
cf_capsule_data_pending,
|
|
cf_capsule_send,
|
|
cf_capsule_recv,
|
|
cf_capsule_cntrl,
|
|
Curl_cf_def_conn_is_alive,
|
|
Curl_cf_def_conn_keep_alive,
|
|
cf_capsule_query,
|
|
};
|
|
|
|
static CURLcode cf_capsule_create(struct Curl_cfilter **pcf,
|
|
struct Curl_easy *data,
|
|
struct connectdata *conn)
|
|
{
|
|
struct Curl_cfilter *cf = NULL;
|
|
struct cf_capsule_ctx *ctx;
|
|
CURLcode result;
|
|
|
|
(void)data;
|
|
(void)conn;
|
|
*pcf = NULL;
|
|
ctx = curlx_calloc(1, sizeof(*ctx));
|
|
if(!ctx) {
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
goto out;
|
|
}
|
|
|
|
Curl_bufq_init2(&ctx->recvbuf, CAPSULE_CHUNK_SIZE, CAPSULE_RECV_CHUNKS,
|
|
BUFQ_OPT_SOFT_LIMIT);
|
|
Curl_bufq_init2(&ctx->sendbuf, CAPSULE_CHUNK_SIZE, CAPSULE_SEND_CHUNKS,
|
|
BUFQ_OPT_SOFT_LIMIT);
|
|
|
|
result = Curl_cf_create(&cf, &Curl_cft_capsule, ctx);
|
|
|
|
out:
|
|
*pcf = (!result) ? cf : NULL;
|
|
if(result && ctx) {
|
|
Curl_bufq_free(&ctx->recvbuf);
|
|
Curl_bufq_free(&ctx->sendbuf);
|
|
curlx_free(ctx);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
CURLcode Curl_cf_capsule_insert_after(struct Curl_cfilter *cf_at,
|
|
struct Curl_easy *data)
|
|
{
|
|
struct Curl_cfilter *cf;
|
|
CURLcode result;
|
|
|
|
result = cf_capsule_create(&cf, data, cf_at->conn);
|
|
if(!result)
|
|
Curl_conn_cf_insert_after(cf_at, cf);
|
|
return result;
|
|
}
|
|
|
|
#endif /* !CURL_DISABLE_PROXY && !CURL_DISABLE_HTTP */
|