mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 06:16:35 -04:00
Alexander J. Semenuk
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)
107 lines
4.5 KiB
C
Vendored
Generated
107 lines
4.5 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_THRDPOOL_H
|
|
#define HEADER_CURL_THRDPOOL_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 "curlx/timediff.h"
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
struct curl_thrdpool;
|
|
struct Curl_easy;
|
|
|
|
/* Invoked under thread pool lock to get an "item" to work on. Must
|
|
* return NULL if there is nothing to do.
|
|
* Caller might return a descriptive string about the "item", where
|
|
* available. The string needs to have the same lifetime as the
|
|
* item itself. */
|
|
typedef void *Curl_thrdpool_take_item_cb(void *user_data,
|
|
const char **pdescription,
|
|
timediff_t *ptimeout_ms);
|
|
|
|
/* Invoked outside thread pool lock to process the item taken. */
|
|
typedef void Curl_thrdpool_process_item_cb(void *item);
|
|
|
|
/* Invoked under thread pool lock to return a processed item back
|
|
* to the producer.
|
|
* If the thread pool has been destroyed, `user_data` will be NULL
|
|
* and the callback is responsible to release all `item` resources. */
|
|
typedef void Curl_thrdpool_return_item_cb(void *item, void *user_data);
|
|
|
|
/* Create a new thread pool.
|
|
* @param name name of pool for tracing purposes
|
|
* @param min_threads minimum number of threads to have always running
|
|
* @param max_threads maximum number of threads running, ever.
|
|
* @param idle_time_ms maximum time a thread should wait for tasks to
|
|
* process before shutting down (unless the pool is
|
|
* already at minimum thread count), use 0 for
|
|
* infinite wait.
|
|
* @param fn_take take the next item to process
|
|
* @param fn_process process the item taken
|
|
* @param fn_return return the processed item
|
|
* @param user_data parameter passed to take/return callbacks
|
|
*/
|
|
CURLcode Curl_thrdpool_create(struct curl_thrdpool **ptpool,
|
|
const char *name,
|
|
uint32_t min_threads,
|
|
uint32_t max_threads,
|
|
uint32_t idle_time_ms,
|
|
Curl_thrdpool_take_item_cb *fn_take,
|
|
Curl_thrdpool_process_item_cb *fn_process,
|
|
Curl_thrdpool_return_item_cb *fn_return,
|
|
void *user_data);
|
|
|
|
/* Destroy the thread pool, release its resources.
|
|
* With `join` being TRUE, the call will wait for all threads to finish
|
|
* processing before returning. On FALSE, it will detach all threads
|
|
* running. Ongoing item processing will continue to run and
|
|
* `fn_return` will be invoked with NULL user_data before the thread exits.
|
|
*/
|
|
void Curl_thrdpool_destroy(struct curl_thrdpool *tpool, bool join);
|
|
|
|
/* Signal the pool to wake up `nthreads` idle worker threads, possible
|
|
* creating new threads up to the max limit. The number should reflect
|
|
* the items that can actually be taken for processing right away, e.g.
|
|
* the producers "queue" length of outstanding items.
|
|
*/
|
|
CURLcode Curl_thrdpool_signal(struct curl_thrdpool *tpool, uint32_t nthreads);
|
|
|
|
CURLcode Curl_thrdpool_await_idle(struct curl_thrdpool *tpool,
|
|
uint32_t timeout_ms);
|
|
|
|
/* Change the properties of a threadpool. */
|
|
CURLcode Curl_thrdpool_set_props(struct curl_thrdpool *tpool,
|
|
uint32_t min_threads,
|
|
uint32_t max_threads,
|
|
uint32_t idle_time_ms);
|
|
|
|
#ifdef CURLVERBOSE
|
|
void Curl_thrdpool_trace(struct curl_thrdpool *tpool,
|
|
struct Curl_easy *data);
|
|
#endif
|
|
|
|
#endif /* USE_THREADS */
|
|
|
|
#endif /* HEADER_CURL_THRDPOOL_H */
|