mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 20:56:09 -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)
240 lines
7.2 KiB
C
Vendored
Generated
240 lines
7.2 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 "unitcheck.h"
|
|
#include "urldata.h"
|
|
#include "bufq.h"
|
|
#include "curl_trc.h"
|
|
|
|
static const char *tail_err(struct bufq *q)
|
|
{
|
|
struct buf_chunk *chunk;
|
|
|
|
if(!q->tail) {
|
|
return q->head ? "tail is NULL, but head is not" : NULL;
|
|
}
|
|
|
|
chunk = q->head;
|
|
while(chunk) {
|
|
if(chunk == q->tail) {
|
|
if(chunk->next) {
|
|
return "tail points to queue, but not at the end";
|
|
}
|
|
return NULL;
|
|
}
|
|
chunk = chunk->next;
|
|
}
|
|
return "tail not part of queue";
|
|
}
|
|
|
|
static void dump_bufq(struct bufq *q, const char *msg)
|
|
{
|
|
struct buf_chunk *chunk;
|
|
const char *terr;
|
|
size_t n;
|
|
|
|
curl_mfprintf(stderr, "bufq[chunk_size=%zu, max_chunks=%zu] %s\n",
|
|
q->chunk_size, q->max_chunks, msg);
|
|
curl_mfprintf(stderr, "- queue[\n");
|
|
chunk = q->head;
|
|
while(chunk) {
|
|
curl_mfprintf(stderr, " chunk[len=%zu, roff=%zu, woff=%zu]\n",
|
|
chunk->dlen, chunk->r_offset, chunk->w_offset);
|
|
chunk = chunk->next;
|
|
}
|
|
curl_mfprintf(stderr, " ]\n");
|
|
terr = tail_err(q);
|
|
curl_mfprintf(stderr, "- tail: %s\n", terr ? terr : "ok");
|
|
n = 0;
|
|
chunk = q->spare;
|
|
while(chunk) {
|
|
++n;
|
|
chunk = chunk->next;
|
|
}
|
|
curl_mfprintf(stderr, "- chunks: %zu\n", q->chunk_count);
|
|
curl_mfprintf(stderr, "- spares: %zu\n", n);
|
|
}
|
|
|
|
static void check_bufq(size_t pool_spares,
|
|
size_t chunk_size, size_t max_chunks,
|
|
size_t wsize, size_t rsize, int opts)
|
|
{
|
|
static unsigned char test_data[32 * 1024];
|
|
|
|
struct bufq q;
|
|
struct bufc_pool pool;
|
|
size_t max_len = chunk_size * max_chunks;
|
|
CURLcode result;
|
|
ssize_t i;
|
|
size_t n2;
|
|
size_t nwritten, nread;
|
|
|
|
if(pool_spares > 0) {
|
|
Curl_bufcp_init(&pool, chunk_size, pool_spares);
|
|
Curl_bufq_initp(&q, &pool, max_chunks, opts);
|
|
}
|
|
else {
|
|
Curl_bufq_init2(&q, chunk_size, max_chunks, opts);
|
|
}
|
|
|
|
fail_unless(q.chunk_size == chunk_size, "chunk_size init wrong");
|
|
fail_unless(q.max_chunks == max_chunks, "max_chunks init wrong");
|
|
fail_unless(!q.head, "init: head not NULL");
|
|
fail_unless(!q.tail, "init: tail not NULL");
|
|
fail_unless(!q.spare, "init: spare not NULL");
|
|
fail_unless(Curl_bufq_len(&q) == 0, "init: bufq length != 0");
|
|
|
|
result = Curl_bufq_write(&q, test_data, wsize, &n2);
|
|
fail_unless(n2 <= wsize, "write: wrong size returned");
|
|
fail_unless(result == CURLE_OK, "write: wrong result returned");
|
|
|
|
/* write empty bufq full */
|
|
nwritten = 0;
|
|
Curl_bufq_reset(&q);
|
|
while(!Curl_bufq_is_full(&q)) {
|
|
result = Curl_bufq_write(&q, test_data, wsize, &n2);
|
|
if(!result) {
|
|
nwritten += n2;
|
|
}
|
|
else if(result != CURLE_AGAIN) {
|
|
fail_unless(result == CURLE_AGAIN, "write-loop: unexpected result");
|
|
break;
|
|
}
|
|
}
|
|
if(nwritten != max_len) {
|
|
curl_mfprintf(stderr, "%zu bytes written, but max_len=%zu\n",
|
|
nwritten, max_len);
|
|
dump_bufq(&q, "after writing full");
|
|
fail_if(TRUE, "write: bufq full but nwritten wrong");
|
|
}
|
|
|
|
/* read full bufq empty */
|
|
nread = 0;
|
|
while(!Curl_bufq_is_empty(&q)) {
|
|
result = Curl_bufq_read(&q, test_data, rsize, &n2);
|
|
if(!result) {
|
|
nread += n2;
|
|
}
|
|
else if(result != CURLE_AGAIN) {
|
|
fail_unless(result == CURLE_AGAIN, "read-loop: unexpected result");
|
|
break;
|
|
}
|
|
}
|
|
if(nread != max_len) {
|
|
curl_mfprintf(stderr, "%zu bytes read, but max_len=%zu\n",
|
|
nwritten, max_len);
|
|
dump_bufq(&q, "after reading empty");
|
|
fail_if(TRUE, "read: bufq empty but nread wrong");
|
|
}
|
|
if(q.tail) {
|
|
dump_bufq(&q, "after reading empty");
|
|
fail_if(TRUE, "read empty, but tail is not NULL");
|
|
}
|
|
|
|
for(i = 0; i < 1000; ++i) {
|
|
result = Curl_bufq_write(&q, test_data, wsize, &n2);
|
|
if(result && result != CURLE_AGAIN) {
|
|
fail_unless(result == CURLE_AGAIN, "rw-loop: unexpected write result");
|
|
break;
|
|
}
|
|
result = Curl_bufq_read(&q, test_data, rsize, &n2);
|
|
if(result && result != CURLE_AGAIN) {
|
|
fail_unless(result == CURLE_AGAIN, "rw-loop: unexpected read result");
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Test SOFT_LIMIT option */
|
|
Curl_bufq_free(&q);
|
|
Curl_bufq_init2(&q, chunk_size, max_chunks, (opts | BUFQ_OPT_SOFT_LIMIT));
|
|
nwritten = 0;
|
|
while(!Curl_bufq_is_full(&q)) {
|
|
result = Curl_bufq_write(&q, test_data, wsize, &n2);
|
|
if(result || n2 != wsize) {
|
|
fail_unless(!result && n2 == wsize, "write should be complete");
|
|
break;
|
|
}
|
|
nwritten += n2;
|
|
}
|
|
if(nwritten < max_len) {
|
|
curl_mfprintf(stderr, "%zu bytes written, but max_len=%zu\n",
|
|
nwritten, max_len);
|
|
dump_bufq(&q, "after writing full");
|
|
fail_if(TRUE, "write: bufq full but nwritten wrong");
|
|
}
|
|
/* do one more write on a full bufq, should work */
|
|
result = Curl_bufq_write(&q, test_data, wsize, &n2);
|
|
fail_unless(!result && n2 == wsize, "write should be complete");
|
|
nwritten += n2;
|
|
/* see that we get all out again */
|
|
nread = 0;
|
|
while(!Curl_bufq_is_empty(&q)) {
|
|
result = Curl_bufq_read(&q, test_data, rsize, &n2);
|
|
if(result) {
|
|
fail_unless(result, "read-loop: unexpected fail");
|
|
break;
|
|
}
|
|
nread += n2;
|
|
}
|
|
fail_unless(nread == nwritten, "did not get the same out as put in");
|
|
|
|
dump_bufq(&q, "at end of test");
|
|
Curl_bufq_free(&q);
|
|
if(pool_spares > 0)
|
|
Curl_bufcp_free(&pool);
|
|
}
|
|
|
|
static CURLcode test_unit2601(const char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
|
|
struct bufq q;
|
|
size_t n;
|
|
CURLcode result;
|
|
unsigned char buf[16 * 1024];
|
|
|
|
Curl_bufq_init(&q, 8 * 1024, 12);
|
|
result = Curl_bufq_read(&q, buf, 128, &n);
|
|
fail_unless(result && result == CURLE_AGAIN, "read empty fail");
|
|
Curl_bufq_free(&q);
|
|
|
|
check_bufq(0, 1024, 4, 128, 128, BUFQ_OPT_NONE);
|
|
check_bufq(0, 1024, 4, 129, 127, BUFQ_OPT_NONE);
|
|
check_bufq(0, 1024, 4, 2000, 16000, BUFQ_OPT_NONE);
|
|
check_bufq(0, 1024, 4, 16000, 3000, BUFQ_OPT_NONE);
|
|
|
|
check_bufq(0, 8000, 10, 1234, 1234, BUFQ_OPT_NONE);
|
|
check_bufq(0, 8000, 10, 8 * 1024, 4 * 1024, BUFQ_OPT_NONE);
|
|
|
|
check_bufq(0, 1024, 4, 128, 128, BUFQ_OPT_NO_SPARES);
|
|
check_bufq(0, 1024, 4, 129, 127, BUFQ_OPT_NO_SPARES);
|
|
check_bufq(0, 1024, 4, 2000, 16000, BUFQ_OPT_NO_SPARES);
|
|
check_bufq(0, 1024, 4, 16000, 3000, BUFQ_OPT_NO_SPARES);
|
|
|
|
check_bufq(8, 1024, 4, 128, 128, BUFQ_OPT_NONE);
|
|
check_bufq(8, 8000, 10, 1234, 1234, BUFQ_OPT_NONE);
|
|
check_bufq(8, 1024, 4, 129, 127, BUFQ_OPT_NO_SPARES);
|
|
|
|
UNITTEST_END_SIMPLE
|
|
}
|