mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 18:03:30 -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)
495 lines
15 KiB
Perl
Vendored
Generated
495 lines
15 KiB
Perl
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
|
|
#
|
|
###########################################################################
|
|
|
|
package processhelp;
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use Time::HiRes;
|
|
|
|
use pathhelp qw(
|
|
os_is_win
|
|
);
|
|
|
|
my $has_win32_process;
|
|
|
|
BEGIN {
|
|
use base qw(Exporter);
|
|
|
|
our @EXPORT = qw(
|
|
pidfromfile
|
|
pidexists
|
|
pidwait
|
|
processexists
|
|
killpid
|
|
killsockfilters
|
|
killallsockfilters
|
|
set_advisor_read_lock
|
|
clear_advisor_read_lock
|
|
);
|
|
|
|
if(os_is_win() && $^O ne 'MSWin32') {
|
|
$has_win32_process = eval {
|
|
no warnings "all";
|
|
# https://metacpan.org/pod/Win32::Process
|
|
require Win32::Process;
|
|
# https://metacpan.org/pod/Win32::Process::List
|
|
require Win32::Process::List;
|
|
};
|
|
} else {
|
|
$has_win32_process = 0;
|
|
}
|
|
}
|
|
|
|
use serverhelp qw(
|
|
servername_id
|
|
mainsockf_pidfilename
|
|
datasockf_pidfilename
|
|
);
|
|
|
|
use globalconfig qw(
|
|
$dev_null
|
|
);
|
|
|
|
#######################################################################
|
|
# pidfromfile returns the pid stored in the given pidfile. The value
|
|
# of the returned pid is never a negative value. It is zero on any file
|
|
# related error or if a pid can not be extracted from the given file.
|
|
#
|
|
sub pidfromfile {
|
|
my $pidfile = $_[0];
|
|
my $timeout_sec = $_[1];
|
|
my $pid = 0;
|
|
my $waits = 0;
|
|
# wait at max 15 seconds for the file to exist and have valid content
|
|
while(!$pid && ($waits <= ($timeout_sec * 10))) {
|
|
if(-f $pidfile && -s $pidfile && open(my $pidfh, "<", $pidfile)) {
|
|
$pid = 0 + <$pidfh>;
|
|
close($pidfh);
|
|
$pid = 0 if($pid < 0);
|
|
}
|
|
Time::HiRes::sleep(0.1) unless $pid || !$timeout_sec;
|
|
++$waits;
|
|
}
|
|
return $pid;
|
|
}
|
|
|
|
#######################################################################
|
|
# return Cygwin pid from virtual pid
|
|
#
|
|
sub winpid_to_pid {
|
|
my $vpid = $_[0];
|
|
if(($^O eq 'cygwin' || $^O eq 'msys') && $vpid > 4194304) {
|
|
my $pid = Cygwin::winpid_to_pid($vpid - 4194304);
|
|
if($pid) {
|
|
return $pid;
|
|
} else {
|
|
return $vpid
|
|
}
|
|
}
|
|
return $vpid;
|
|
}
|
|
|
|
#######################################################################
|
|
# pidexists checks if a process with a given pid exists and is alive.
|
|
# This returns the positive pid if the process exists and is alive.
|
|
# This returns the negative pid if the process exists differently.
|
|
# This returns 0 if the process could not be found.
|
|
#
|
|
sub pidexists {
|
|
my $pid = $_[0];
|
|
|
|
if($pid > 0) {
|
|
# verify if currently existing Windows process
|
|
$pid = winpid_to_pid($pid);
|
|
if($pid > 4194304 && os_is_win()) {
|
|
$pid -= 4194304;
|
|
if($^O ne 'MSWin32') {
|
|
if($has_win32_process) {
|
|
my %processes = Win32::Process::List->new()->GetProcesses();
|
|
if(exists $processes{$pid}) {
|
|
return -$pid;
|
|
}
|
|
} else {
|
|
my $filter = "PID eq $pid";
|
|
# https://ss64.com/nt/tasklist.html
|
|
my $result = qx(tasklist -fi \"$filter\" 2>$dev_null);
|
|
if(index($result, $pid) != -1) {
|
|
return -$pid;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
# verify if currently existing and alive
|
|
if(kill(0, $pid)) {
|
|
return $pid;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#######################################################################
|
|
# pidterm asks the process with a given pid to terminate gracefully.
|
|
#
|
|
sub pidterm {
|
|
my $pid = $_[0];
|
|
|
|
if($pid > 0) {
|
|
# request the process to quit
|
|
$pid = winpid_to_pid($pid);
|
|
if($pid > 4194304 && os_is_win()) {
|
|
$pid -= 4194304;
|
|
if($^O ne 'MSWin32') {
|
|
if($has_win32_process) {
|
|
Win32::Process::KillProcess($pid, 0);
|
|
} else {
|
|
# https://ss64.com/nt/tasklist.html
|
|
my $result = qx(tasklist -v -fo list -fi "PID eq $pid" 2>&1);
|
|
$result =~ s/\r//g;
|
|
$result =~ s/\n/ | /g;
|
|
print "Task info for $pid before taskkill: '$result'\n";
|
|
|
|
$result = qx(powershell -Command "Get-CimInstance -ClassName Win32_Process -Filter 'ParentProcessId=$pid' | Select ProcessId,ParentProcessId,Name,CommandLine");
|
|
$result =~ s/\r//g;
|
|
print "Task child processes for $pid before taskkill:\n";
|
|
print "$result\n";
|
|
|
|
if(!$ENV{'CURL_TEST_NO_TASKKILL'}) {
|
|
# https://ss64.com/nt/taskkill.html
|
|
my $cmd;
|
|
if($ENV{'CURL_TEST_NO_TASKKILL_TREE'}) {
|
|
$cmd = "taskkill -f -pid $pid >$dev_null 2>&1";
|
|
}
|
|
else {
|
|
$cmd = "taskkill -f -t -pid $pid >$dev_null 2>&1";
|
|
}
|
|
print "Executing: '$cmd'\n";
|
|
system($cmd);
|
|
}
|
|
else {
|
|
print "taskkill disabled via CURL_TEST_NO_TASKKILL.\n";
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
|
|
# signal the process to terminate
|
|
kill("TERM", $pid);
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# pidkill kills the process with a given pid mercilessly and forcefully.
|
|
#
|
|
sub pidkill {
|
|
my $pid = $_[0];
|
|
|
|
if($pid > 0) {
|
|
# request the process to quit
|
|
$pid = winpid_to_pid($pid);
|
|
if($pid > 4194304 && os_is_win()) {
|
|
$pid -= 4194304;
|
|
if($^O ne 'MSWin32') {
|
|
if($has_win32_process) {
|
|
Win32::Process::KillProcess($pid, 0);
|
|
} else {
|
|
# https://ss64.com/nt/tasklist.html
|
|
my $result = qx(tasklist -v -fo list -fi "PID eq $pid" 2>&1);
|
|
$result =~ s/\r//g;
|
|
$result =~ s/\n/ | /g;
|
|
print "Task info for $pid before taskkill: '$result'\n";
|
|
|
|
$result = qx(powershell -Command "Get-CimInstance -ClassName Win32_Process -Filter 'ParentProcessId=$pid' | Select ProcessId,ParentProcessId,Name,CommandLine");
|
|
$result =~ s/\r//g;
|
|
print "Task child processes for $pid before taskkill:\n";
|
|
print "$result\n";
|
|
|
|
if(!$ENV{'CURL_TEST_NO_TASKKILL'}) {
|
|
# https://ss64.com/nt/taskkill.html
|
|
my $cmd;
|
|
if($ENV{'CURL_TEST_NO_TASKKILL_TREE'}) {
|
|
$cmd = "taskkill -f -pid $pid >$dev_null 2>&1";
|
|
}
|
|
else {
|
|
$cmd = "taskkill -f -t -pid $pid >$dev_null 2>&1";
|
|
}
|
|
print "Executing: '$cmd'\n";
|
|
system($cmd);
|
|
}
|
|
else {
|
|
print "taskkill disabled via CURL_TEST_NO_TASKKILL.\n";
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
|
|
# signal the process to terminate
|
|
kill("KILL", $pid);
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# pidwait waits for the process with a given pid to be terminated.
|
|
#
|
|
sub pidwait {
|
|
my $pid = $_[0];
|
|
my $flags = $_[1];
|
|
|
|
$pid = winpid_to_pid($pid);
|
|
# check if the process exists
|
|
if($pid > 4194304 && os_is_win()) {
|
|
if($flags == &WNOHANG) {
|
|
return pidexists($pid)?0:$pid;
|
|
}
|
|
my $start = time;
|
|
my $warn_at = 5;
|
|
while(pidexists($pid)) {
|
|
if(time - $start > $warn_at) {
|
|
print "pidwait: still waiting for PID ", $pid, "\n";
|
|
$warn_at += 5;
|
|
if($warn_at > 20) {
|
|
print "pidwait: giving up waiting for PID ", $pid, "\n";
|
|
last;
|
|
}
|
|
}
|
|
Time::HiRes::sleep(0.2);
|
|
}
|
|
return $pid;
|
|
}
|
|
|
|
# wait on the process to terminate
|
|
return waitpid($pid, $flags);
|
|
}
|
|
|
|
#######################################################################
|
|
# processexists checks if a process with the pid stored in the given
|
|
# pidfile exists and is alive. This returns 0 on any file related
|
|
# error or if a pid can not be extracted from the given file. When a
|
|
# process with the same pid as the one extracted from the given file
|
|
# is currently alive this returns that positive pid. Otherwise, when
|
|
# the process is not alive, it returns the negative value of the pid.
|
|
#
|
|
sub processexists {
|
|
use POSIX ":sys_wait_h";
|
|
my $pidfile = $_[0];
|
|
|
|
# fetch pid from pidfile
|
|
my $pid = pidfromfile($pidfile, 0);
|
|
|
|
if($pid > 0) {
|
|
# verify if currently alive
|
|
if(pidexists($pid)) {
|
|
return $pid;
|
|
}
|
|
else {
|
|
# get rid of the certainly invalid pidfile
|
|
unlink($pidfile) if($pid == pidfromfile($pidfile, 0));
|
|
# reap its dead children, if not done yet
|
|
pidwait($pid, &WNOHANG);
|
|
# negative return value means dead process
|
|
return -$pid;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#######################################################################
|
|
# killpid attempts to gracefully stop processes in the given pid list
|
|
# with a SIGTERM signal and SIGKILLs those which have not died on time.
|
|
#
|
|
sub killpid {
|
|
my ($verbose, $pidlist) = @_;
|
|
use POSIX ":sys_wait_h";
|
|
my @requested;
|
|
my @signalled;
|
|
my @reapchild;
|
|
|
|
# The 'pidlist' argument is a string of whitespace separated pids.
|
|
return if(not defined($pidlist));
|
|
|
|
# Make 'requested' hold the non-duplicate pids from 'pidlist'.
|
|
@requested = split(' ', $pidlist);
|
|
return if(not @requested);
|
|
if(scalar(@requested) > 2) {
|
|
@requested = sort({$a <=> $b} @requested);
|
|
}
|
|
for(my $i = scalar(@requested) - 2; $i >= 0; $i--) {
|
|
if($requested[$i] == $requested[$i + 1]) {
|
|
splice @requested, $i + 1, 1;
|
|
}
|
|
}
|
|
|
|
# Send a SIGTERM to processes which are alive to gracefully stop them.
|
|
foreach my $tmp (@requested) {
|
|
chomp $tmp;
|
|
if($tmp =~ /^(\d+)$/) {
|
|
my $pid = $1;
|
|
if($pid > 0) {
|
|
if(pidexists($pid)) {
|
|
print("RUN: Process with pid $pid signalled to die\n")
|
|
if($verbose);
|
|
pidterm($pid);
|
|
push @signalled, $pid;
|
|
}
|
|
else {
|
|
print("RUN: Process with pid $pid already dead\n")
|
|
if($verbose);
|
|
# if possible reap its dead children
|
|
pidwait($pid, &WNOHANG);
|
|
push @reapchild, $pid;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
# Allow all signalled processes five seconds to gracefully die.
|
|
if(@signalled) {
|
|
my $twentieths = 5 * 20;
|
|
while($twentieths--) {
|
|
for(my $i = scalar(@signalled) - 1; $i >= 0; $i--) {
|
|
my $pid = $signalled[$i];
|
|
if(!pidexists($pid)) {
|
|
print("RUN: Process with pid $pid gracefully died\n")
|
|
if($verbose);
|
|
splice @signalled, $i, 1;
|
|
# if possible reap its dead children
|
|
pidwait($pid, &WNOHANG);
|
|
push @reapchild, $pid;
|
|
}
|
|
}
|
|
last if(not scalar(@signalled));
|
|
# give any zombies of us a chance to move on to the afterlife
|
|
pidwait(0, &WNOHANG);
|
|
Time::HiRes::sleep(0.05);
|
|
}
|
|
}
|
|
|
|
# Mercilessly SIGKILL processes still alive.
|
|
if(@signalled) {
|
|
foreach my $pid (@signalled) {
|
|
if($pid > 0) {
|
|
print("RUN: Process with pid $pid forced to die with SIGKILL\n")
|
|
if($verbose);
|
|
pidkill($pid);
|
|
# if possible reap its dead children
|
|
pidwait($pid, &WNOHANG);
|
|
push @reapchild, $pid;
|
|
}
|
|
}
|
|
}
|
|
|
|
# Reap processes dead children for sure.
|
|
if(@reapchild) {
|
|
foreach my $pid (@reapchild) {
|
|
if($pid > 0) {
|
|
pidwait($pid, 0);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# killsockfilters kills sockfilter processes for a given server.
|
|
#
|
|
sub killsockfilters {
|
|
my ($piddir, $proto, $ipvnum, $idnum, $verbose, $which) = @_;
|
|
my $server;
|
|
my $pidfile;
|
|
my $pid;
|
|
|
|
return if($proto !~ /^(ftp|imap|pop3|smtp)$/);
|
|
|
|
die "unsupported sockfilter: $which"
|
|
if($which && ($which !~ /^(main|data)$/));
|
|
|
|
$server = servername_id($proto, $ipvnum, $idnum) if($verbose);
|
|
|
|
if(!$which || ($which eq 'main')) {
|
|
$pidfile = mainsockf_pidfilename($piddir, $proto, $ipvnum, $idnum);
|
|
$pid = processexists($pidfile);
|
|
if($pid > 0) {
|
|
printf("* kill pid for %s-%s => %d\n", $server,
|
|
($proto eq 'ftp')?'ctrl':'filt', $pid) if($verbose);
|
|
pidkill($pid);
|
|
pidwait($pid, 0);
|
|
}
|
|
unlink($pidfile) if(-f $pidfile);
|
|
}
|
|
|
|
return if($proto ne 'ftp');
|
|
|
|
if(!$which || ($which eq 'data')) {
|
|
$pidfile = datasockf_pidfilename($piddir, $proto, $ipvnum, $idnum);
|
|
$pid = processexists($pidfile);
|
|
if($pid > 0) {
|
|
printf("* kill pid for %s-data => %d\n", $server,
|
|
$pid) if($verbose);
|
|
pidkill($pid);
|
|
pidwait($pid, 0);
|
|
}
|
|
unlink($pidfile) if(-f $pidfile);
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# killallsockfilters kills sockfilter processes for all servers.
|
|
#
|
|
sub killallsockfilters {
|
|
my ($piddir, $verbose) = @_;
|
|
|
|
for my $proto (('ftp', 'imap', 'pop3', 'smtp')) {
|
|
for my $ipvnum (('4', '6')) {
|
|
for my $idnum (('1', '2')) {
|
|
killsockfilters($piddir, $proto, $ipvnum, $idnum, $verbose);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
sub set_advisor_read_lock {
|
|
my ($filename) = @_;
|
|
|
|
my $fileh;
|
|
if(open($fileh, ">", $filename) && close($fileh)) {
|
|
return;
|
|
}
|
|
printf "Error creating lock file $filename error: $!\n";
|
|
}
|
|
|
|
sub clear_advisor_read_lock {
|
|
my ($filename) = @_;
|
|
|
|
if(-f $filename) {
|
|
unlink($filename);
|
|
}
|
|
}
|
|
|
|
1;
|