mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -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)
145 lines
5.5 KiB
C
Vendored
Generated
145 lines
5.5 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_CONNECT_H
|
|
#define HEADER_CURL_CONNECT_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 "hostip.h"
|
|
#include "curlx/timeval.h"
|
|
|
|
struct Curl_peer;
|
|
struct Curl_str;
|
|
|
|
enum alpnid Curl_alpn2alpnid(const unsigned char *name, size_t len);
|
|
enum alpnid Curl_str2alpnid(const struct Curl_str *cstr);
|
|
|
|
/* generic function that returns how much time there is left to run, according
|
|
to the timeouts set */
|
|
timediff_t Curl_timeleft_ms(struct Curl_easy *data);
|
|
|
|
#define DEFAULT_CONNECT_TIMEOUT 300000 /* milliseconds == five minutes */
|
|
|
|
#define DEFAULT_SHUTDOWN_TIMEOUT_MS (2 * 1000)
|
|
|
|
void Curl_shutdown_start(struct Curl_easy *data, int sockindex,
|
|
int timeout_ms);
|
|
|
|
/* return how much time there is left to shutdown the connection at
|
|
* sockindex. Returns 0 if there is no limit or shutdown has not started. */
|
|
timediff_t Curl_shutdown_timeleft(struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
int sockindex);
|
|
|
|
/* return how much time there is left to shutdown the connection.
|
|
* Returns 0 if there is no limit or shutdown has not started. */
|
|
timediff_t Curl_conn_shutdown_timeleft(struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
|
|
void Curl_shutdown_clear(struct Curl_easy *data, int sockindex);
|
|
|
|
/* TRUE iff shutdown has been started */
|
|
bool Curl_shutdown_started(struct Curl_easy *data, int sockindex);
|
|
|
|
/*
|
|
* Used to extract socket and connectdata struct for the most recent
|
|
* transfer on the given Curl_easy.
|
|
*
|
|
* The returned socket will be CURL_SOCKET_BAD in case of failure!
|
|
*/
|
|
curl_socket_t Curl_getconnectinfo(struct Curl_easy *data,
|
|
struct connectdata **connp);
|
|
|
|
/*
|
|
* Curl_conncontrol() marks the end of a connection/stream. The 'ctrl'
|
|
* argument specifies if it is the end of a connection or a stream.
|
|
*
|
|
* For stream-based protocols (such as HTTP/2), a stream close will not cause
|
|
* a connection close. Other protocols will close the connection for both
|
|
* cases.
|
|
*
|
|
* It sets the bit.close bit to TRUE (with an explanation for debug builds),
|
|
* when the connection will close.
|
|
*/
|
|
|
|
#define CONNCTRL_KEEP 0 /* undo a marked closure */
|
|
#define CONNCTRL_CONNECTION 1
|
|
#define CONNCTRL_STREAM 2
|
|
|
|
void Curl_conncontrol(struct connectdata *conn,
|
|
int ctrl
|
|
#if defined(DEBUGBUILD) && defined(CURLVERBOSE)
|
|
, const char *reason
|
|
#endif
|
|
);
|
|
|
|
#if defined(DEBUGBUILD) && defined(CURLVERBOSE)
|
|
#define streamclose(x, y) Curl_conncontrol(x, CONNCTRL_STREAM, y)
|
|
#define connclose(x, y) Curl_conncontrol(x, CONNCTRL_CONNECTION, y)
|
|
#define connkeep(x, y) Curl_conncontrol(x, CONNCTRL_KEEP, y)
|
|
#else /* !DEBUGBUILD || !CURLVERBOSE */
|
|
#define streamclose(x, y) Curl_conncontrol(x, CONNCTRL_STREAM)
|
|
#define connclose(x, y) Curl_conncontrol(x, CONNCTRL_CONNECTION)
|
|
#define connkeep(x, y) Curl_conncontrol(x, CONNCTRL_KEEP)
|
|
#endif
|
|
|
|
/**
|
|
* Setup the cfilters at `sockindex` in connection `conn`.
|
|
* If no filter chain is installed yet, inspects the configuration
|
|
* in `data` and `conn` to install a suitable filter chain.
|
|
*/
|
|
CURLcode Curl_conn_setup(struct Curl_easy *data,
|
|
struct connectdata *conn,
|
|
int sockindex,
|
|
int ssl_mode);
|
|
|
|
/**
|
|
* Bring the filter chain at `sockindex` for connection `data->conn` into
|
|
* connected state. Which will set `*done` to TRUE.
|
|
* This can be called on an already connected chain with no side effects.
|
|
* When not `blocking`, calls may return without error and `*done != TRUE`,
|
|
* while the individual filters negotiated the connection.
|
|
*/
|
|
CURLcode Curl_conn_connect(struct Curl_easy *data, int sockindex,
|
|
bool blocking, bool *done);
|
|
|
|
/* Set conn to allow multiplexing. */
|
|
void Curl_conn_set_multiplex(struct connectdata *conn);
|
|
|
|
/* Get the origin peer at sockindex. */
|
|
struct Curl_peer *Curl_conn_get_origin(struct connectdata *conn,
|
|
int sockindex);
|
|
|
|
/* Get the peer the connection actually connects to at sockindex.
|
|
* Often the same as "origin", but can be redirected via "connect-to"
|
|
* or "alt-svc". May tunnel through proxies. */
|
|
struct Curl_peer *Curl_conn_get_destination(struct connectdata *conn,
|
|
int sockindex);
|
|
|
|
/* Get the peer curl connects its socket to.
|
|
* Can be origin, "connect-to" or the first proxy. */
|
|
struct Curl_peer *Curl_conn_get_first_peer(struct connectdata *conn,
|
|
int sockindex);
|
|
|
|
#endif /* HEADER_CURL_CONNECT_H */
|