Tons of little bug fixes for the new UCI pipelining code, also abolishing

the global %ficsinfo hash.

diff --git a/remoteglot.pl b/remoteglot.pl
index 53c87d39a6473726bc170a38705ebb2eb1188e5c..9d88db75727817d0324f7c315e301e2f5b95fa22 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -46,11 +46,10 @@ select(STDOUT);
 my $pid = IPC::Open2::open2(*UCIREAD, *UCIWRITE, $engine);
 my %uciinfo = ();
 my %uciid = ();
 my $pid = IPC::Open2::open2(*UCIREAD, *UCIWRITE, $engine);
 my %uciinfo = ();
 my %uciid = ();

-my %ficsinfo = ();

 my ($last_move, $last_tell);
 my $last_text = '';
 my $last_told_text = '';
 my ($last_move, $last_tell);
 my $last_text = '';
 my $last_told_text = '';

-my ($board_waiting, $board_calculating);
+my ($pos_waiting, $pos_calculating);

 
 uciprint("uci");
 
 
 uciprint("uci");
 


@@ -104,27 +103,28 @@ while (1) {
                chomp $line;
                $line =~ tr/\r//d;
                if ($line =~ /^<12> /) {
                chomp $line;
                $line =~ tr/\r//d;
                if ($line =~ /^<12> /) {

-                       my $fen = style12_to_fen($line);
+                       my $pos = style12_to_fen($line);

                        
                        # if this is already in the queue, ignore it
                        
                        # if this is already in the queue, ignore it

-                       next if (defined($board_waiting) && $fen eq $board_waiting);
+                       next if (defined($pos_waiting) && $pos->{'fen'} eq $pos_waiting->{'fen'});

 
                        # if we're already chewing on this and there's nothing else in the queue,
                        # also ignore it
 
                        # 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);
+                       next if (!defined($pos_waiting) && defined($pos_calculating) &&
+                                $pos->{'fen'} eq $pos_calculating->{'fen'});

 
                        # if we're already thinking on something, stop and wait for the engine
                        # to approve
 
                        # if we're already thinking on something, stop and wait for the engine
                        # to approve

-                       if (defined($board_calculating)) {
+                       if (defined($pos_calculating)) {

                                uciprint("stop");
                                uciprint("stop");

-                               $board_waiting = $fen;
+                               $pos_waiting = $pos;

                        } 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
                        } 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("position fen " . $pos->{'fen'});

                                uciprint("go infinite");
                                uciprint("go infinite");

+                               $pos_calculating = $pos;

                        }
 
                        %uciinfo = ();
                        }
 
                        %uciinfo = ();


@@ -175,12 +175,12 @@ sub handle_uci {
                parse_ids(@ids);
        }
        if ($line =~ /^bestmove/) {
                parse_ids(@ids);
        }
        if ($line =~ /^bestmove/) {

-               if (defined($board_calculating)) {
-                       uciprint("position fen $board_waiting");
+               if (defined($pos_waiting)) {
+                       uciprint("position fen " . $pos_waiting->{'fen'});

                        uciprint("go infinite");
 
                        uciprint("go infinite");
 

-                       $board_calculating = $board_waiting;
-                       $board_waiting = undef;
+                       $pos_calculating = $pos_waiting;
+                       $pos_waiting = undef;

                }
        }
 }
                }
        }
 }


@@ -258,11 +258,12 @@ sub parse_ids {
 }
 
 sub style12_to_fen {
 }
 
 sub style12_to_fen {

-       my $str = shift; 
+       my $str = shift;
+       my %pos = ();

        my (@x) = split / /, $str;
        
        my (@x) = split / /, $str;
        

-       $ficsinfo{'board'} = [ @x[1..8] ];
-       $ficsinfo{'toplay'} = $x[9];
+       $pos{'board'} = [ @x[1..8] ];
+       $pos{'toplay'} = $x[9];

        
        # the board itself
        my (@board) = @x[1..8];
        
        # the board itself
        my (@board) = @x[1..8];


@@ -296,7 +297,7 @@ sub style12_to_fen {
                } else {
                        $nep .= "6";
                }
                } else {
                        $nep .= "6";
                }

-               
+

                #
                # Showing the en passant square when actually no capture can be made
                # seems to confuse at least Rybka. Thus, check if there's actually
                #
                # Showing the en passant square when actually no capture can be made
                # seems to confuse at least Rybka. Thus, check if there's actually


@@ -305,11 +306,11 @@ sub style12_to_fen {
                # "right" thing as per the standard, though.
                #
                if ($x[9] eq 'B') {
                # "right" thing as per the standard, though.
                #
                if ($x[9] eq 'B') {

-                       $ep = $nep if ($col > 0 && substr($board[4], $col-1, 1) eq 'p');
-                       $ep = $nep if ($col < 7 && substr($board[4], $col+1, 1) eq 'p');
+                       $ep = $nep if ($col > 0 && substr($pos{'board'}[4], $col-1, 1) eq 'p');
+                       $ep = $nep if ($col < 7 && substr($pos{'board'}[4], $col+1, 1) eq 'p');

                } else {
                } else {

-                       $ep = $nep if ($col > 0 && substr($board[3], $col-1, 1) eq 'P');
-                       $ep = $nep if ($col < 7 && substr($board[3], $col+1, 1) eq 'P');
+                       $ep = $nep if ($col > 0 && substr($pos{'board'}[3], $col-1, 1) eq 'P');
+                       $ep = $nep if ($col < 7 && substr($pos{'board'}[3], $col+1, 1) eq 'P');

                }
        }
        $fen .= " ";
                }
        }
        $fen .= " ";


@@ -323,7 +324,9 @@ sub style12_to_fen {
        $fen .= " ";
        $fen .= $x[26];
 
        $fen .= " ";
        $fen .= $x[26];
 

-       return $fen;
+       $pos{'fen'} = $fen;
+
+       return \%pos;

 }
 
 sub prettyprint_pv {
 }
 
 sub prettyprint_pv {


@@ -489,6 +492,8 @@ sub prettyprint_pv {
 
 sub output_screen {
        #return;
 
 sub output_screen {
        #return;

+       
+       return if (!defined($pos_calculating));

 
        #
        # Check the PVs first. if they're invalid, just wait, as our data
 
        #
        # Check the PVs first. if they're invalid, just wait, as our data


@@ -498,12 +503,12 @@ sub output_screen {
        eval {
                my $dummy;
                if (exists($uciinfo{'pv'})) {
        eval {
                my $dummy;
                if (exists($uciinfo{'pv'})) {

-                       $dummy = prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}});
+                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}});

                }
        
                my $mpv = 1;
                while (exists($uciinfo{'pv' . $mpv})) {
                }
        
                my $mpv = 1;
                while (exists($uciinfo{'pv' . $mpv})) {

-                       $dummy = prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}});
+                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}});

                        ++$mpv;
                }
        };
                        ++$mpv;
                }
        };


@@ -520,7 +525,7 @@ sub output_screen {
                $text .= "Analysis:\n\n";
        }
 
                $text .= "Analysis:\n\n";
        }
 

-       return unless (exists($ficsinfo{'board'}));
+       return unless (exists($pos_calculating->{'board'}));

                
        #
        # Some programs _always_ report MultiPV, even with only one PV.
                
        #
        # Some programs _always_ report MultiPV, even with only one PV.


@@ -540,24 +545,29 @@ sub output_screen {
                my $mpv = 1;
                while (exists($uciinfo{'pv' . $mpv})) {
                        $text .= sprintf "  PV%2u", $mpv;
                my $mpv = 1;
                while (exists($uciinfo{'pv' . $mpv})) {
                        $text .= sprintf "  PV%2u", $mpv;

-                       my $score = short_score(\%uciinfo, \%ficsinfo, $mpv);
+                       my $score = short_score(\%uciinfo, $pos_calculating, $mpv);

                        $text .= "  ($score)" if (defined($score));
 
                        $text .= "  ($score)" if (defined($score));
 

+                       my $tbhits = '';
+                       if (exists($uciinfo{'tbhits' . $mpv})) {
+                               $tbhits = sprintf ", %u tbhits", $uciinfo{'tbhits' . $mpv};
+                       }
+

                        if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
                        if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {

-                               $text .= sprintf " (%5u kn, %3u kn/s, %2u ply)",
+                               $text .= sprintf " (%5u kn, %3u kn/s, %2u ply$tbhits)",

                                        $uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
                        }
 
                        $text .= ":\n";
                                        $uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
                        }
 
                        $text .= ":\n";

-                       $text .= "  " . join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";
+                       $text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";

                        $text .= "\n";
                        ++$mpv;
                }
        } else {
                # single-PV
                        $text .= "\n";
                        ++$mpv;
                }
        } else {
                # single-PV

-               my $score = long_score(\%uciinfo, \%ficsinfo, '');
+               my $score = long_score(\%uciinfo, $pos_calculating, '');

                $text .= "  $score\n" if defined($score);
                $text .= "  $score\n" if defined($score);

-               $text .=  "  PV: " . join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
+               $text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));

                $text .=  "\n";
 
                if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
                $text .=  "\n";
 
                if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {


@@ -595,7 +605,7 @@ sub output_screen {
                my $mpv = 1;
                while (exists($uciinfo{'pv' . $mpv})) {
                        $tell_text .= sprintf "  PV%2u", $mpv;
                my $mpv = 1;
                while (exists($uciinfo{'pv' . $mpv})) {
                        $tell_text .= sprintf "  PV%2u", $mpv;

-                       my $score = short_score(\%uciinfo, \%ficsinfo, $mpv);
+                       my $score = short_score(\%uciinfo, $pos_calculating, $mpv);

                        $tell_text .= "  ($score)" if (defined($score));
 
                        if (exists($uciinfo{'depth' . $mpv})) {
                        $tell_text .= "  ($score)" if (defined($score));
 
                        if (exists($uciinfo{'depth' . $mpv})) {


@@ -603,15 +613,15 @@ sub output_screen {
                        }
 
                        $tell_text .= ": ";
                        }
 
                        $tell_text .= ": ";

-                       $tell_text .= join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}}));
+                       $tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}}));

                        $tell_text .= "\n";
                        ++$mpv;
                }
        } else {
                # single-PV
                        $tell_text .= "\n";
                        ++$mpv;
                }
        } else {
                # single-PV

-               my $score = long_score(\%uciinfo, \%ficsinfo, '');
+               my $score = long_score(\%uciinfo, $pos_calculating, '');

                $tell_text .= "  $score\n" if defined($score);
                $tell_text .= "  $score\n" if defined($score);

-               $tell_text .= "  PV: " . join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
+               $tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));

                if (exists($uciinfo{'depth'})) {
                        $tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
                }
                if (exists($uciinfo{'depth'})) {
                        $tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
                }


@@ -832,14 +842,14 @@ sub uciprint {
 }
 
 sub short_score {
 }
 
 sub short_score {

-       my ($uciinfo, $ficsinfo, $mpv) = @_;
+       my ($uciinfo, $pos, $mpv) = @_;

 
        if (defined($uciinfo{'score_mate' . $mpv})) {
                return sprintf "M%3d", $uciinfo{'score_mate' . $mpv};
        } else {
                if (exists($uciinfo{'score_cp' . $mpv})) {
                        my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
 
        if (defined($uciinfo{'score_mate' . $mpv})) {
                return sprintf "M%3d", $uciinfo{'score_mate' . $mpv};
        } else {
                if (exists($uciinfo{'score_cp' . $mpv})) {
                        my $score = $uciinfo{'score_cp' . $mpv} * 0.01;

-                       if ($ficsinfo{'toplay'} eq 'B') {
+                       if ($pos->{'toplay'} eq 'B') {

                                $score = -$score;
                        }
                        return sprintf "%+5.2f", $score;
                                $score = -$score;
                        }
                        return sprintf "%+5.2f", $score;


@@ -850,11 +860,11 @@ sub short_score {
 }
 
 sub long_score {
 }
 
 sub long_score {

-       my ($uciinfo, $ficsinfo, $mpv) = @_;
+       my ($uciinfo, $pos, $mpv) = @_;

 
        if (defined($uciinfo{'score_mate' . $mpv})) {
                my $mate = $uciinfo{'score_mate' . $mpv};
 
        if (defined($uciinfo{'score_mate' . $mpv})) {
                my $mate = $uciinfo{'score_mate' . $mpv};

-               if ($ficsinfo{'toplay'} eq 'B') {
+               if ($pos->{'toplay'} eq 'B') {

                        $mate = -$mate;
                }
                if ($mate > 0) {
                        $mate = -$mate;
                }
                if ($mate > 0) {


@@ -865,7 +875,7 @@ sub long_score {
        } else {
                if (exists($uciinfo{'score_cp' . $mpv})) {
                        my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
        } else {
                if (exists($uciinfo{'score_cp' . $mpv})) {
                        my $score = $uciinfo{'score_cp' . $mpv} * 0.01;

-                       if ($ficsinfo{'toplay'} eq 'B') {
+                       if ($pos->{'toplay'} eq 'B') {

                                $score = -$score;
                        }
                        return sprintf "Score: %+5.2f", $score;
                                $score = -$score;
                        }
                        return sprintf "Score: %+5.2f", $score;