From 520912da2072d9b567c59329a495b5860ba3143b Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Mon, 2 Feb 2026 12:59:32 -0800 Subject: [PATCH] Misc minor pbot-vm updates --- applets/pbot-vm/guest/bin/guest-server | 2 +- applets/pbot-vm/guest/lib/Guest.pm | 4 ++-- applets/pbot-vm/guest/lib/Languages/_default.pm | 2 +- applets/pbot-vm/host/lib/Languages/clang2x.pm | 2 +- lib/PBot/VERSION.pm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applets/pbot-vm/guest/bin/guest-server b/applets/pbot-vm/guest/bin/guest-server index bd28a907..967e2994 100755 --- a/applets/pbot-vm/guest/bin/guest-server +++ b/applets/pbot-vm/guest/bin/guest-server @@ -52,7 +52,7 @@ sub load_modules() { sub vsock_server() { print "Starting VSOCK server on PID $$\n"; - system("socat VSOCK-LISTEN:".VPORT.",reuseaddr,fork EXEC:accept-vsock-client"); + system("socat VSOCK-LISTEN:".VPORT.",reuseaddr,fork,max-children=0 EXEC:accept-vsock-client"); print "VSOCK server shutdown.\n"; exit; # exit child process diff --git a/applets/pbot-vm/guest/lib/Guest.pm b/applets/pbot-vm/guest/lib/Guest.pm index d0a43117..77ac318e 100644 --- a/applets/pbot-vm/guest/lib/Guest.pm +++ b/applets/pbot-vm/guest/lib/Guest.pm @@ -39,7 +39,7 @@ sub info($text, $maxlen = 255) { my ($sec, $usec) = gettimeofday; my $time = strftime "%a %b %e %Y %H:%M:%S", localtime $sec; $time .= sprintf ".%03d", $usec / 1000; - print STDERR "$$ $time :: $text"; + print STDERR "[$$] $time :: $text"; } sub read_input($input, $buffer, $tag) { @@ -78,7 +78,7 @@ sub read_input($input, $buffer, $tag) { my $command = eval { decode_json($line) }; if ($@) { - info("Failed to decode JSON: $@\n", 1024); + info("Failed to decode JSON: $@\n"); return { arguments => '', cmdline => 'sh prog.sh', diff --git a/applets/pbot-vm/guest/lib/Languages/_default.pm b/applets/pbot-vm/guest/lib/Languages/_default.pm index 75d7173e..6153dabf 100755 --- a/applets/pbot-vm/guest/lib/Languages/_default.pm +++ b/applets/pbot-vm/guest/lib/Languages/_default.pm @@ -34,7 +34,7 @@ sub info($text, $maxlen = 255) { my ($sec, $usec) = gettimeofday; my $time = strftime "%a %b %e %Y %H:%M:%S", localtime $sec; $time .= sprintf ".%03d", $usec / 1000; - print STDERR "$$ $time :: $text"; + print STDERR "[$$] $time :: $text"; } sub new { diff --git a/applets/pbot-vm/host/lib/Languages/clang2x.pm b/applets/pbot-vm/host/lib/Languages/clang2x.pm index 7dccfcf0..31baf1aa 100755 --- a/applets/pbot-vm/host/lib/Languages/clang2x.pm +++ b/applets/pbot-vm/host/lib/Languages/clang2x.pm @@ -14,7 +14,7 @@ sub initialize { $self->{sourcefile} = 'prog.c'; $self->{execfile} = 'prog'; - $self->{default_options} = '-Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -pedantic -Wfloat-equal -Wshadow -std=c2x -lm -Wfatal-errors -fsanitize=integer,alignment,undefined -fsanitize-address-use-after-scope -fno-omit-frame-pointer'; + $self->{default_options} = '-Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -pedantic -Wfloat-equal -Wshadow -std=c2x -lm -Wfatal-errors -fsanitize=integer,alignment,undefined -fno-omit-frame-pointer'; $self->{options_paste} = '-fcaret-diagnostics'; $self->{options_nopaste} = '-fno-caret-diagnostics'; $self->{cmdline} = 'clang -gdwarf-2 -g3 $sourcefile $options -o $execfile'; diff --git a/lib/PBot/VERSION.pm b/lib/PBot/VERSION.pm index 19327958..08e5bb82 100644 --- a/lib/PBot/VERSION.pm +++ b/lib/PBot/VERSION.pm @@ -25,7 +25,7 @@ use PBot::Imports; # These are set by the /misc/update_version script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 4932, + BUILD_REVISION => 4933, BUILD_DATE => "2026-02-02", };