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)
208 lines
6.0 KiB
C
Vendored
Generated
208 lines
6.0 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 "curl_trc.h"
|
|
#include "multihandle.h"
|
|
#include "multiif.h"
|
|
#include "multi_ntfy.h"
|
|
|
|
|
|
struct mntfy_entry {
|
|
uint32_t mid;
|
|
uint32_t type;
|
|
};
|
|
|
|
#define CURL_MNTFY_CHUNK_SIZE 128
|
|
|
|
struct mntfy_chunk {
|
|
struct mntfy_chunk *next;
|
|
size_t r_offset;
|
|
size_t w_offset;
|
|
struct mntfy_entry entries[CURL_MNTFY_CHUNK_SIZE];
|
|
};
|
|
|
|
static struct mntfy_chunk *mnfty_chunk_create(void)
|
|
{
|
|
return curlx_calloc(1, sizeof(struct mntfy_chunk));
|
|
}
|
|
|
|
static void mnfty_chunk_destroy(struct mntfy_chunk *chunk)
|
|
{
|
|
curlx_free(chunk);
|
|
}
|
|
|
|
static void mnfty_chunk_reset(struct mntfy_chunk *chunk)
|
|
{
|
|
memset(chunk, 0, sizeof(*chunk));
|
|
}
|
|
|
|
static bool mntfy_chunk_append(struct mntfy_chunk *chunk,
|
|
struct Curl_easy *data,
|
|
uint32_t type)
|
|
{
|
|
struct mntfy_entry *e;
|
|
|
|
if(chunk->w_offset >= CURL_MNTFY_CHUNK_SIZE)
|
|
return FALSE;
|
|
e = &chunk->entries[chunk->w_offset++];
|
|
e->mid = data->mid;
|
|
e->type = type;
|
|
return TRUE;
|
|
}
|
|
|
|
static struct mntfy_chunk *mntfy_non_full_tail(struct curl_multi_ntfy *mntfy)
|
|
{
|
|
struct mntfy_chunk *chunk;
|
|
if(!mntfy->tail) {
|
|
chunk = mnfty_chunk_create();
|
|
if(!chunk)
|
|
return NULL;
|
|
DEBUGASSERT(!mntfy->head);
|
|
mntfy->head = mntfy->tail = chunk;
|
|
return chunk;
|
|
}
|
|
else if(mntfy->tail->w_offset < CURL_MNTFY_CHUNK_SIZE)
|
|
return mntfy->tail;
|
|
else { /* tail is full. */
|
|
chunk = mnfty_chunk_create();
|
|
if(!chunk)
|
|
return NULL;
|
|
DEBUGASSERT(mntfy->head);
|
|
mntfy->tail->next = chunk;
|
|
mntfy->tail = chunk;
|
|
return chunk;
|
|
}
|
|
}
|
|
|
|
static void mntfy_chunk_dispatch_all(struct Curl_multi *multi,
|
|
struct mntfy_chunk *chunk)
|
|
{
|
|
struct mntfy_entry *e;
|
|
struct Curl_easy *data;
|
|
|
|
if(multi->ntfy.ntfy_cb) {
|
|
while((chunk->r_offset < chunk->w_offset) && !multi->ntfy.failure) {
|
|
e = &chunk->entries[chunk->r_offset];
|
|
data = e->mid ? Curl_multi_get_easy(multi, e->mid) : multi->admin;
|
|
/* only when notification has not been disabled in the meantime */
|
|
if(data && Curl_uint32_bset_contains(&multi->ntfy.enabled, e->type)) {
|
|
/* this may cause new notifications to be added! */
|
|
CURL_TRC_M(multi->admin, "[NTFY] dispatch %u to xfer %u",
|
|
e->type, e->mid);
|
|
multi->ntfy.ntfy_cb(multi, e->type, data, multi->ntfy.ntfy_cb_data);
|
|
}
|
|
/* once dispatched, safe to increment */
|
|
chunk->r_offset++;
|
|
}
|
|
}
|
|
mnfty_chunk_reset(chunk);
|
|
}
|
|
|
|
void Curl_mntfy_init(struct Curl_multi *multi)
|
|
{
|
|
memset(&multi->ntfy, 0, sizeof(multi->ntfy));
|
|
Curl_uint32_bset_init(&multi->ntfy.enabled);
|
|
}
|
|
|
|
CURLMcode Curl_mntfy_resize(struct Curl_multi *multi)
|
|
{
|
|
if(Curl_uint32_bset_resize(&multi->ntfy.enabled, CURLMNOTIFY_EASY_DONE + 1))
|
|
return CURLM_OUT_OF_MEMORY;
|
|
return CURLM_OK;
|
|
}
|
|
|
|
void Curl_mntfy_cleanup(struct Curl_multi *multi)
|
|
{
|
|
while(multi->ntfy.head) {
|
|
struct mntfy_chunk *chunk = multi->ntfy.head;
|
|
multi->ntfy.head = chunk->next;
|
|
mnfty_chunk_destroy(chunk);
|
|
}
|
|
multi->ntfy.tail = NULL;
|
|
Curl_uint32_bset_destroy(&multi->ntfy.enabled);
|
|
}
|
|
|
|
CURLMcode Curl_mntfy_enable(struct Curl_multi *multi, unsigned int type)
|
|
{
|
|
if(type > CURLMNOTIFY_EASY_DONE)
|
|
return CURLM_UNKNOWN_OPTION;
|
|
Curl_uint32_bset_add(&multi->ntfy.enabled, type);
|
|
return CURLM_OK;
|
|
}
|
|
|
|
CURLMcode Curl_mntfy_disable(struct Curl_multi *multi, unsigned int type)
|
|
{
|
|
if(type > CURLMNOTIFY_EASY_DONE)
|
|
return CURLM_UNKNOWN_OPTION;
|
|
Curl_uint32_bset_remove(&multi->ntfy.enabled, (uint32_t)type);
|
|
return CURLM_OK;
|
|
}
|
|
|
|
void Curl_mntfy_add(struct Curl_easy *data, unsigned int type)
|
|
{
|
|
struct Curl_multi *multi = data ? data->multi : NULL;
|
|
if(multi && multi->ntfy.ntfy_cb && !multi->ntfy.failure &&
|
|
Curl_uint32_bset_contains(&multi->ntfy.enabled, (uint32_t)type)) {
|
|
/* append to list of outstanding notifications */
|
|
struct mntfy_chunk *tail = mntfy_non_full_tail(&multi->ntfy);
|
|
CURL_TRC_M(data, "[NTFY] add %u for xfer %u", type, data->mid);
|
|
if(tail)
|
|
mntfy_chunk_append(tail, data, (uint32_t)type);
|
|
else
|
|
multi->ntfy.failure = CURLM_OUT_OF_MEMORY;
|
|
multi->ntfy.has_entries = TRUE;
|
|
}
|
|
}
|
|
|
|
CURLMcode Curl_mntfy_dispatch_all(struct Curl_multi *multi)
|
|
{
|
|
DEBUGASSERT(!multi->in_ntfy_callback);
|
|
multi->in_ntfy_callback = TRUE;
|
|
while(multi->ntfy.head && !multi->ntfy.failure) {
|
|
struct mntfy_chunk *chunk = multi->ntfy.head;
|
|
/* this may cause new notifications to be added! */
|
|
mntfy_chunk_dispatch_all(multi, chunk);
|
|
DEBUGASSERT(chunk->r_offset == chunk->w_offset);
|
|
|
|
if(chunk == multi->ntfy.tail) /* last one, keep */
|
|
break;
|
|
DEBUGASSERT(chunk->next);
|
|
DEBUGASSERT(multi->ntfy.head != multi->ntfy.tail);
|
|
multi->ntfy.head = chunk->next;
|
|
mnfty_chunk_destroy(chunk);
|
|
}
|
|
multi->in_ntfy_callback = FALSE;
|
|
|
|
if(multi->ntfy.failure) {
|
|
CURLMcode mresult = multi->ntfy.failure;
|
|
multi->ntfy.failure = CURLM_OK; /* reset, once delivered */
|
|
return mresult;
|
|
}
|
|
else
|
|
multi->ntfy.has_entries = FALSE;
|
|
return CURLM_OK;
|
|
}
|