Hopefully fix the pipelining issues once and for all.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index a58168bb3347d663fb5d0c867aa0bcc4bd6090f5..53c87d39a6473726bc170a38705ebb2eb1188e5c 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -18,7 +18,7 @@ use warnings;
 
 # Configuration
 my $server = "freechess.org";
-my $target = "Sesse";
+my $target = "22";
 # my $engine = "/usr/games/toga2";
 my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 my $telltarget = undef;   # undef to be silent
@@ -50,6 +50,7 @@ my %ficsinfo = ();
 my ($last_move, $last_tell);
 my $last_text = '';
 my $last_told_text = '';
+my ($board_waiting, $board_calculating);
 
 uciprint("uci");
 
@@ -60,6 +61,7 @@ while (<UCIREAD>) {
 }
 
 uciprint("setoption name UCI_AnalyseMode value true");
+uciprint("setoption name Preserve Analysis value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");
 uciprint("setoption name NalimovUsage value Rarely");
 uciprint("setoption name Hash value 1024");
@@ -103,10 +105,29 @@ while (1) {
                $line =~ tr/\r//d;
                if ($line =~ /^<12> /) {
                        my $fen = style12_to_fen($line);
-                       uciprint("stop");
-                       uciprint("position fen $fen");
-                       uciprint("go infinite");
+                       
+                       # if this is already in the queue, ignore it
+                       next if (defined($board_waiting) && $fen eq $board_waiting);
+
+                       # if we're already chewing on this and there's nothing else in the queue,
+                       # also ignore it
+                       next if (!defined($board_waiting) && defined($board_calculating) &&
+                                $fen eq $board_calculating);
+
+                       # if we're already thinking on something, stop and wait for the engine
+                       # to approve
+                       if (defined($board_calculating)) {
+                               uciprint("stop");
+                               $board_waiting = $fen;
+                       } else {
+                               # it's wrong just to give the FEN (the move history is useful,
+                               # and per the UCI spec, we should really have sent "ucinewgame"),
+                               # but it's easier
+                               uciprint("position fen $fen");
+                               uciprint("go infinite");
+                       }
 
+                       %uciinfo = ();
                        $last_move = time;
 
                        # 
@@ -153,6 +174,15 @@ sub handle_uci {
 
                parse_ids(@ids);
        }
+       if ($line =~ /^bestmove/) {
+               if (defined($board_calculating)) {
+                       uciprint("position fen $board_waiting");
+                       uciprint("go infinite");
+
+                       $board_calculating = $board_waiting;
+                       $board_waiting = undef;
+               }
+       }
 }
 
 sub parse_infos {
@@ -478,6 +508,7 @@ sub output_screen {
                }
        };
        if ($@) {
+               %uciinfo = ();
                return;
        }
 
@@ -510,7 +541,7 @@ sub output_screen {
                while (exists($uciinfo{'pv' . $mpv})) {
                        $text .= sprintf "  PV%2u", $mpv;
                        my $score = short_score(\%uciinfo, \%ficsinfo, $mpv);
-                       $text .= "  ($score)" if (!defined($score));
+                       $text .= "  ($score)" if (defined($score));
 
                        if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
                                $text .= sprintf " (%5u kn, %3u kn/s, %2u ply)",