]> git.sesse.net Git - remoteglot/blobdiff - remoteglot.pl
Revert "Convert TB scores in low depth."
[remoteglot] / remoteglot.pl
index 9a1ee4ca415b941ba926cd7036f49175480bdbae..56554a6d6b5589a65c13764a7d9ab0c5740bf624 100755 (executable)
@@ -67,26 +67,29 @@ select(TBLOG);
 $| = 1;
 
 select(STDOUT);
-umask 0027;  # analysis.json should not be served to users.
+umask 0022;  # analysis.json should not be served to users.
 
 # open the chess engine
 my $engine = open_engine($remoteglotconf::engine_cmdline, 'E1', sub { handle_uci(@_, 1); });
 my $engine2 = open_engine($remoteglotconf::engine2_cmdline, 'E2', sub { handle_uci(@_, 0); });
 my $last_move;
 my $last_text = '';
-my ($pos_waiting, $pos_calculating, $pos_calculating_second_engine);
+my ($pos_calculating, $pos_calculating_second_engine);
 
-uciprint($engine, "setoption name UCI_AnalyseMode value true");
-while (my ($key, $value) = each %remoteglotconf::engine_config) {
-       uciprint($engine, "setoption name $key value $value");
-}
+# If not undef, we've started calculating this position but haven't ever given out
+# any analysis for it, so we're on a forced timer to do so.
+my $pos_calculating_started = undef;
+
+# If not undef, we've output this position, but without a main PV, so we're on
+# _another_ forced timer to do so.
+my $pos_pv_started = undef;
+my $last_output_had_pv = 0;
+
+setoptions($engine, \%remoteglotconf::engine_config);
 uciprint($engine, "ucinewgame");
 
 if (defined($engine2)) {
-       uciprint($engine2, "setoption name UCI_AnalyseMode value true");
-       while (my ($key, $value) = each %remoteglotconf::engine2_config) {
-               uciprint($engine2, "setoption name $key value $value");
-       }
+       setoptions($engine2, \%remoteglotconf::engine2_config);
        uciprint($engine2, "setoption name MultiPV value 500");
        uciprint($engine2, "ucinewgame");
 }
@@ -124,7 +127,7 @@ if (defined($remoteglotconf::server)) {
        );
 }
 if (defined($remoteglotconf::target)) {
-       if ($remoteglotconf::target =~ /^http:/) {
+       if ($remoteglotconf::target =~ /^(?:\/|https?:)/) {
                fetch_pgn($remoteglotconf::target);
        } elsif (defined($t)) {
                $t->cmd("observe $remoteglotconf::target");
@@ -144,6 +147,11 @@ sub handle_uci {
 
        $line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
        print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
+
+       # If we've sent a stop command, gobble up lines until we see bestmove.
+       return if ($engine->{'stopping'} && $line !~ /^bestmove/);
+       $engine->{'stopping'} = 0;
+
        if ($line =~ /^info/) {
                my (@infos) = split / /, $line;
                shift @infos;
@@ -156,24 +164,6 @@ sub handle_uci {
 
                parse_ids($engine, @ids);
        }
-       if ($line =~ /^bestmove/) {
-               if ($primary) {
-                       return if (!$remoteglotconf::uci_assume_full_compliance);
-                       if (defined($pos_waiting)) {
-                               uciprint($engine, "position fen " . $pos_waiting->fen());
-                               uciprint($engine, "go infinite");
-
-                               $pos_calculating = $pos_waiting;
-                               $pos_waiting = undef;
-                       }
-               } else {
-                       $engine2->{'info'} = {};
-                       my $pos = $pos_waiting // $pos_calculating;
-                       uciprint($engine2, "position fen " . $pos->fen());
-                       uciprint($engine2, "go infinite");
-                       $pos_calculating_second_engine = $pos;
-               }
-       }
        output();
 }
 
@@ -189,7 +179,7 @@ sub handle_fics {
                $t->cmd("moves");
        }
        if ($line =~ /^Movelist for game /) {
-               my $pos = $pos_waiting // $pos_calculating;
+               my $pos = $pos_calculating;
                if (defined($pos)) {
                        @uci_movelist = ();
                        @pretty_movelist = ();
@@ -222,10 +212,9 @@ sub handle_fics {
        if ($getting_movelist &&
            $line =~ /^\s+ \{.*\} \s+ (?: \* | 1\/2-1\/2 | 0-1 | 1-0 )/x) {
                # End of movelist.
-               for my $pos ($pos_waiting, $pos_calculating) {
-                       next if (!defined($pos));
-                       if ($pos->fen() eq $pos_for_movelist->fen()) {
-                               $pos->{'history'} = \@pretty_movelist;
+               if (defined($pos_calculating)) {
+                       if ($pos_calculating->fen() eq $pos_for_movelist->fen()) {
+                               $pos_calculating->{'history'} = \@pretty_movelist;
                        }
                }
                $getting_movelist = 0;
@@ -262,9 +251,26 @@ sub handle_fics {
 # Starts periodic fetching of PGNs from the given URL.
 sub fetch_pgn {
        my ($url) = @_;
-       AnyEvent::HTTP::http_get($url, sub {
-               handle_pgn(@_, $url);
-       });
+       if ($url =~ m#^/#) {  # Local file.
+               eval {
+                       local $/ = undef;
+                       open my $fh, "<", $url
+                               or die "$url: $!";
+                       my $pgn = <$fh>;
+                       close $fh;
+                       handle_pgn($pgn, '', $url);
+               };
+               if ($@) {
+                       warn "$url: $@";
+                       $http_timer = AnyEvent->timer(after => 1.0, cb => sub {
+                               fetch_pgn($url);
+                       });
+               }
+       } else {
+               AnyEvent::HTTP::http_get($url, sub {
+                       handle_pgn(@_, $url);
+               });
+       }
 }
 
 my ($last_pgn_white, $last_pgn_black);
@@ -300,7 +306,23 @@ sub handle_pgn {
                        my $black = $pgn->black;
                        $white =~ s/,.*//;  # Remove first name.
                        $black =~ s/,.*//;  # Remove first name.
-                       my $pos = Position->start_pos($white, $black);
+                       my $tags = $pgn->tags();
+                       my $pos;
+                       if (exists($tags->{'FEN'})) {
+                               $pos = Position->from_fen($tags->{'FEN'});
+                               $pos->{'last_move'} = 'none';
+                               $pos->{'player_w'} = $white;
+                               $pos->{'player_b'} = $black;
+                               $pos->{'start_fen'} = $tags->{'FEN'};
+                       } else {
+                               $pos = Position->start_pos($white, $black);
+                       }
+                       if (exists($tags->{'Variant'}) &&
+                           $tags->{'Variant'} =~ /960|fischer/i) {
+                               $pos->{'chess960'} = 1;
+                       } else {
+                               $pos->{'chess960'} = 0;
+                       }
                        my $moves = $pgn->moves;
                        my @uci_moves = ();
                        my @repretty_moves = ();
@@ -356,22 +378,18 @@ sub handle_position {
        my ($pos) = @_;
        find_clock_start($pos, $pos_calculating);
                
-       # if this is already in the queue, ignore it (just update the result)
-       if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen()) {
-               $pos_waiting->{'result'} = $pos->{'result'};
-               return;
-       }
-
-       # if we're already chewing on this and there's nothing else in the queue,
-       # also ignore it
-       if (!defined($pos_waiting) && defined($pos_calculating) &&
-           $pos->fen() eq $pos_calculating->fen()) {
+       # If we're already chewing on this and there's nothing else in the queue,
+       # ignore it.
+       if (defined($pos_calculating) && $pos->fen() eq $pos_calculating->fen()) {
                $pos_calculating->{'result'} = $pos->{'result'};
+               for my $key ('white_clock', 'black_clock', 'white_clock_target', 'black_clock_target') {
+                       $pos_calculating->{$key} //= $pos->{$key};
+               }
                return;
        }
 
-       # 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($pos_calculating)) {
                # Store the final data we have for this position in the history,
                # with the precise clock information we just got from the new
@@ -379,40 +397,55 @@ sub handle_position {
                # the position.)
                #
                # Do not output anything new to the main analysis; that's
-               # going to be obsolete really soon.
+               # going to be obsolete really soon. (Exception: If we've never
+               # output anything for this move, ie., it didn't hit the 200ms
+               # limit, spit it out to the user anyway. It's probably a really
+               # fast blitz game or something, and it's good to show the moves
+               # as they come in even without great analysis.)
                $pos_calculating->{'white_clock'} = $pos->{'white_clock'};
                $pos_calculating->{'black_clock'} = $pos->{'black_clock'};
                delete $pos_calculating->{'white_clock_target'};
                delete $pos_calculating->{'black_clock_target'};
-               output_json(1);
 
-               if (!defined($pos_waiting)) {
-                       uciprint($engine, "stop");
-               }
-               if ($remoteglotconf::uci_assume_full_compliance) {
-                       $pos_waiting = $pos;
+               if (defined($pos_calculating_started)) {
+                       output_json(0);
                } else {
-                       uciprint($engine, "position fen " . $pos->fen());
-                       uciprint($engine, "go infinite");
-                       $pos_calculating = $pos;
+                       output_json(1);
                }
-       } 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($engine, "position fen " . $pos->fen());
-               uciprint($engine, "go infinite");
-               $pos_calculating = $pos;
+               $pos_calculating_started = [Time::HiRes::gettimeofday];
+               $pos_pv_started = undef;
+
+               # Ask the engine to stop; we will throw away its data until it
+               # sends us "bestmove", signaling the end of it.
+               $engine->{'stopping'} = 1;
+               uciprint($engine, "stop");
        }
 
+       # It's wrong to just give the FEN (the move history is useful,
+       # and per the UCI spec, we should really have sent "ucinewgame"),
+       # but it's easier, and it works around a Stockfish repetition issue.
+       if ($engine->{'chess960'} != $pos->{'chess960'}) {
+               uciprint($engine, "setoption name UCI_Chess960 value " . ($pos->{'chess960'} ? 'true' : 'false'));
+               $engine->{'chess960'} = $pos->{'chess960'};
+       }
+       uciprint($engine, "position fen " . $pos->fen());
+       uciprint($engine, "go infinite");
+       $pos_calculating = $pos;
+       $pos_calculating_started = [Time::HiRes::gettimeofday];
+       $pos_pv_started = undef;
+
        if (defined($engine2)) {
                if (defined($pos_calculating_second_engine)) {
+                       $engine2->{'stopping'} = 1;
                        uciprint($engine2, "stop");
-               } else {
-                       uciprint($engine2, "position fen " . $pos->fen());
-                       uciprint($engine2, "go infinite");
-                       $pos_calculating_second_engine = $pos;
                }
+               if ($engine2->{'chess960'} != $pos->{'chess960'}) {
+                       uciprint($engine2, "setoption name UCI_Chess960 value " . ($pos->{'chess960'} ? 'true' : 'false'));
+                       $engine2->{'chess960'} = $pos->{'chess960'};
+               }
+               uciprint($engine2, "position fen " . $pos->fen());
+               uciprint($engine2, "go infinite");
+               $pos_calculating_second_engine = $pos;
                $engine2->{'info'} = {};
        }
 
@@ -447,6 +480,8 @@ sub parse_infos {
                }
        }
 
+       my $prev_depth = $info->{'depth1'} // $info->{'depth'};
+
        while (scalar @x > 0) {
                if ($x[0] eq 'multipv') {
                        # Dealt with above
@@ -473,6 +508,7 @@ sub parse_infos {
 
                        delete $info->{'score_cp' . $mpv};
                        delete $info->{'score_mate' . $mpv};
+                       delete $info->{'splicepos' . $mpv};
 
                        while ($x[0] eq 'cp' || $x[0] eq 'mate') {
                                if ($x[0] eq 'cp') {
@@ -500,6 +536,14 @@ sub parse_infos {
                die "Unknown info '" . join(',', @x) . "'";
 
        }
+
+       my $now_depth = $info->{'depth1'} // $info->{'depth'};
+       if (defined($prev_depth) && POSIX::floor($now_depth / 10) > POSIX::floor($prev_depth / 10)) {
+               my $d = POSIX::floor($now_depth / 10) * 10;  # In case we skipped some.
+               my $cp = $info->{'score_cp1'} // $info->{'score_cp'};
+               my $mate = $info->{'score_mate1'} // $info->{'score_mate'};
+               push @{$info->{'lowdepth'}}, [ $d, $cp, $mate ];
+       }
 }
 
 sub parse_ids {
@@ -524,16 +568,20 @@ sub prettyprint_pv_no_cache {
                return ();
        }
 
-       my $pv = shift @pvs;
-       my ($from_row, $from_col, $to_row, $to_col, $promo) = parse_uci_move($pv);
-       my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
-       return ( $pretty, prettyprint_pv_no_cache($nb, @pvs) );
+       my @ret = ();
+       for my $pv (@pvs) {
+               my ($from_row, $from_col, $to_row, $to_col, $promo) = parse_uci_move($pv);
+               my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
+               push @ret, $pretty;
+               $board = $nb;
+       }
+       return @ret;
 }
 
 sub prettyprint_pv {
        my ($pos, @pvs) = @_;
 
-       my $cachekey = $pos->{'fen'} . join('', @pvs);
+       my $cachekey = join('', @pvs);
        if (exists($pos->{'prettyprint_cache'}{$cachekey})) {
                return @{$pos->{'prettyprint_cache'}{$cachekey}};
        } else {
@@ -564,8 +612,11 @@ sub complete_using_tbprobe {
        my @pv = @{$info->{'pv' . $mpv}};
        my $key = $pos->fen() . " " . join('', @pv);
        my @moves = ();
+       my $splicepos;
        if (exists($tbprobe_cache{$key})) {
-               @moves = @{$tbprobe_cache{$key}};
+               my $c = $tbprobe_cache{$key};
+               @moves = @{$c->{'moves'}};
+               $splicepos = $c->{'splicepos'};
        } else {
                if ($mpv ne '') {
                        # Force doing at least one move of the PV.
@@ -574,29 +625,36 @@ sub complete_using_tbprobe {
                        $pos = $pos->make_move(parse_uci_move($move));
                }
 
-               while ($pos->num_pieces() > 6 && $#pv > -1) {
+               while ($pos->num_pieces() > 7 && $#pv > -1) {
                        my $move = shift @pv;
                        push @moves, $move;
                        $pos = $pos->make_move(parse_uci_move($move));
                }
 
-               return if ($pos->num_pieces() > 6);
+               return if ($pos->num_pieces() > 7);
 
                my $fen = $pos->fen();
-               my $pgn_text = `fathom --path=/srv/syzygy "$fen"`;
+               my $pgn_text = `$remoteglotconf::fathom_cmdline "$fen"`;
                my $pgn = Chess::PGN::Parse->new(undef, $pgn_text);
                return if (!defined($pgn) || !$pgn->read_game() || ($pgn->result ne '0-1' && $pgn->result ne '1-0'));
                $pgn->quick_parse_game;
-               $info->{'pv' . $mpv} = \@moves;
 
                # Splice the PV from the tablebase onto what we have so far.
+               $splicepos = scalar @moves;
                for my $move (@{$pgn->moves}) {
+                       last if $move eq '#';
+                       last if $move eq '1-0';
+                       last if $move eq '0-1';
+                       last if $move eq '1/2-1/2';
                        my $uci_move;
                        ($pos, $uci_move) = $pos->make_pretty_move($move);
                        push @moves, $uci_move;
                }
 
-               $tbprobe_cache{$key} = \@moves;
+               $tbprobe_cache{$key} = {
+                       moves => \@moves,
+                       splicepos => $splicepos
+               };
        }
 
        $info->{'pv' . $mpv} = \@moves;
@@ -607,6 +665,7 @@ sub complete_using_tbprobe {
        } else {
                $info->{'score_mate' . $mpv} = $matelen;
        }
+       $info->{'splicepos' . $mpv} = $splicepos;
 }
 
 sub output {
@@ -614,23 +673,40 @@ sub output {
 
        return if (!defined($pos_calculating));
 
+       my $info = $engine->{'info'};
+
        # Don't update too often.
-       my $age = Time::HiRes::tv_interval($latest_update);
-       if ($age < $remoteglotconf::update_max_interval) {
-               my $wait = $remoteglotconf::update_max_interval + 0.01 - $age;
-               $output_timer = AnyEvent->timer(after => $wait, cb => \&output);
+       my $wait = $remoteglotconf::update_max_interval - Time::HiRes::tv_interval($latest_update);
+       if (defined($pos_calculating_started)) {
+               my $new_pos_wait = $remoteglotconf::update_force_after_move - Time::HiRes::tv_interval($pos_calculating_started);
+               $wait = $new_pos_wait if ($new_pos_wait < $wait);
+       }
+       if (!$last_output_had_pv && has_pv($info)) {
+               if (!defined($pos_pv_started)) {
+                       $pos_pv_started = [Time::HiRes::gettimeofday];
+               }
+               # We just got initial PV, and we're in a hurry since we gave out a blank one earlier,
+               # so give us just 200ms more to increase the quality and then force a display.
+               my $new_pos_wait = $remoteglotconf::update_force_after_move - Time::HiRes::tv_interval($pos_pv_started);
+               $wait = $new_pos_wait if ($new_pos_wait < $wait);
+       }
+       if ($wait > 0.0) {
+               $output_timer = AnyEvent->timer(after => $wait + 0.01, cb => \&output);
                return;
        }
+       $pos_pv_started = undef;
+       
+       # We're outputting something for this position now, so the special handling
+       # for new positions is off.
+       undef $pos_calculating_started;
        
-       my $info = $engine->{'info'};
-
        #
        # If we have tablebase data from a previous lookup, replace the
        # engine data with the data from the tablebase.
        #
        my $fen = $pos_calculating->fen();
        if (exists($tb_cache{$fen})) {
-               for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
+               for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits splicepos)) {
                        delete $info->{$key . '1'};
                        delete $info->{$key};
                }
@@ -670,7 +746,7 @@ sub output {
        # specified.
        #
        if (exists($info->{'pv1'}) && !exists($info->{'pv2'})) {
-               for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
+               for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits splicepos)) {
                        if (exists($info->{$key . '1'})) {
                                $info->{$key} = $info->{$key . '1'};
                        } else {
@@ -715,6 +791,14 @@ sub output {
        output_screen();
        output_json(0);
        $latest_update = [Time::HiRes::gettimeofday];
+       $last_output_had_pv = has_pv($info);
+}
+
+sub has_pv {
+       my $info = shift;
+       return 1 if (exists($info->{'pv'}) && (scalar(@{$info->{'pv'}}) > 0));
+       return 1 if (exists($info->{'pv1'}) && (scalar(@{$info->{'pv1'}}) > 0));
+       return 0;
 }
 
 sub output_screen {
@@ -792,8 +876,6 @@ sub output_screen {
                $text .= "\n\n";
        }
 
-       #$text .= book_info($pos_calculating->fen(), $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
-
        my @refutation_lines = ();
        if (defined($engine2)) {
                for (my $mpv = 1; $mpv < 500; ++$mpv) {
@@ -872,6 +954,13 @@ sub output_json {
        $json->{'tablebase'} = $info->{'tablebase'};
        $json->{'pv'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
 
+       $json->{'lowdepth'} = {};
+       if (exists($info->{'lowdepth'})) {
+               for my $ld (@{$info->{'lowdepth'}}) {
+                       $json->{'lowdepth'}{$ld->[0]} = score_digest_inner($ld->[1], $ld->[2], undef, 0, $pos_calculating);
+               }
+       }
+
        my %refutation_lines = ();
        my @refutation_lines = ();
        if (defined($engine2)) {
@@ -892,6 +981,9 @@ sub output_json {
                                        move => $pretty_move,
                                        pv => \@pretty_pv,
                                };
+                               if (exists($info->{'splicepos' . $mpv})) {
+                                       $refutation_lines{$pretty_move}->{'splicepos'} = $info->{'splicepos' . $mpv};
+                               }
                        };
                }
        }
@@ -901,8 +993,15 @@ sub output_json {
        if (!$historic_json_only && exists($pos_calculating->{'history'})) {
                my %score_history = ();
 
+               local $dbh->{AutoCommit} = 0;
                my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
-               my $pos = Position->start_pos('white', 'black');
+               my $pos;
+               if (exists($pos_calculating->{'start_fen'})) {
+                       $pos = Position->from_fen($pos_calculating->{'start_fen'});
+               } else {
+                       $pos = Position->start_pos('white', 'black');
+               }
+               $pos->{'chess960'} = $pos_calculating->{'chess960'};
                my $halfmove_num = 0;
                for my $move (@{$pos_calculating->{'history'}}) {
                        my $id = id_for_pos($pos, $halfmove_num);
@@ -917,6 +1016,7 @@ sub output_json {
                        ($pos) = $pos->make_pretty_move($move);
                }
                $q->finish;
+               $dbh->commit;
 
                # If at any point we are missing 10 consecutive moves,
                # truncate the history there. This is so we don't get into
@@ -1089,20 +1189,43 @@ sub short_score {
 # (with side-to-play information) score_sort_key.
 sub score_digest {
        my ($info, $pos, $mpv) = @_;
+       return score_digest_inner(
+               $info->{'score_cp' . $mpv},
+               $info->{'score_mate' . $mpv},
+               $info->{'splicepos' . $mpv},
+               $info->{'tablebase'},
+               $pos);
+}
 
-       if (defined($info->{'score_mate' . $mpv})) {
-               my $mate = $info->{'score_mate' . $mpv};
+sub score_digest_inner {
+       my ($score, $mate, $sp, $tablebase, $pos) = @_;
+       if (defined($mate)) {
                if ($pos->{'toplay'} eq 'B') {
                        $mate = -$mate;
                }
-               return ['m', $mate];
+               if (defined($sp)) {
+                       if ($mate > 0) {
+                               return ['T', $sp];
+                       } else {
+                               return ['t', $sp];
+                       }
+               } else {
+                       if ($mate > 0) {
+                               return ['M', $mate];
+                       } elsif ($mate < 0) {
+                               return ['m', -$mate];
+                       } elsif ($pos->{'toplay'} eq 'B') {
+                               return ['M', 0];
+                       } else {
+                               return ['m', 0];
+                       }
+               }
        } else {
-               if (exists($info->{'score_cp' . $mpv})) {
-                       my $score = $info->{'score_cp' . $mpv};
+               if (defined($score)) {
                        if ($pos->{'toplay'} eq 'B') {
                                $score = -$score;
                        }
-                       if ($score == 0 && $info->{'tablebase'}) {
+                       if ($score == 0 && $tablebase) {
                                return ['d', undef];
                        } else {
                                return ['cp', int($score)];
@@ -1121,10 +1244,19 @@ sub long_score {
                if ($pos->{'toplay'} eq 'B') {
                        $mate = -$mate;
                }
-               if ($mate > 0) {
-                       return sprintf "White mates in %u", $mate;
+               if (exists($info->{'splicepos' . $mpv})) {
+                       my $sp = $info->{'splicepos' . $mpv};
+                       if ($mate > 0) {
+                               return sprintf "White wins in %u", int(($sp + 1) * 0.5);
+                       } else {
+                               return sprintf "Black wins in %u", int(($sp + 1) * 0.5);
+                       }
                } else {
-                       return sprintf "Black mates in %u", -$mate;
+                       if ($mate > 0) {
+                               return sprintf "White mates in %u", $mate;
+                       } else {
+                               return sprintf "Black mates in %u", -$mate;
+                       }
                }
        } else {
                if (exists($info->{'score_cp' . $mpv})) {
@@ -1176,58 +1308,6 @@ sub plot_score {
        return undef;
 }
 
-my %book_cache = ();
-sub book_info {
-       my ($fen, $board, $toplay) = @_;
-
-       if (exists($book_cache{$fen})) {
-               return $book_cache{$fen};
-       }
-
-       my $ret = `./booklook $fen`;
-       return "" if ($ret =~ /Not found/ || $ret eq '');
-
-       my @moves = ();
-
-       for my $m (split /\n/, $ret) {
-               my ($move, $annotation, $win, $draw, $lose, $rating, $rating_div) = split /,/, $m;
-
-               my $pmove;
-               if ($move eq '')  {
-                       $pmove = '(current)';
-               } else {
-                       ($pmove) = prettyprint_pv_no_cache($board, $move);
-                       $pmove .= $annotation;
-               }
-
-               my $score;
-               if ($toplay eq 'W') {
-                       $score = 1.0 * $win + 0.5 * $draw + 0.0 * $lose;
-               } else {
-                       $score = 0.0 * $win + 0.5 * $draw + 1.0 * $lose;
-               }
-               my $n = $win + $draw + $lose;
-               
-               my $percent;
-               if ($n == 0) {
-                       $percent = "     ";
-               } else {
-                       $percent = sprintf "%4u%%", int(100.0 * $score / $n + 0.5);
-               }
-
-               push @moves, [ $pmove, $n, $percent, $rating ];
-       }
-
-       @moves[1..$#moves] = sort { $b->[2] cmp $a->[2] } @moves[1..$#moves];
-       
-       my $text = "Book moves:\n\n              Perf.     N     Rating\n\n";
-       for my $m (@moves) {
-               $text .= sprintf "  %-10s %s   %6u    %4s\n", $m->[0], $m->[2], $m->[1], $m->[3]
-       }
-
-       return $text;
-}
-
 sub extract_clock {
        my ($pgn, $pos) = @_;
 
@@ -1296,7 +1376,7 @@ sub find_clock_start {
        }
 
        my $id = id_for_pos($pos);
-       my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=?', undef, $id);
+       my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=? AND COALESCE(white_clock_target, black_clock_target) >= EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - INTERVAL \'1 day\'));', undef, $id);
        if (defined($clock_info)) {
                $pos->{'white_clock'} //= $clock_info->{'white_clock'};
                $pos->{'black_clock'} //= $clock_info->{'black_clock'};
@@ -1348,7 +1428,7 @@ sub find_clock_start {
 
 sub schedule_tb_lookup {
        return if (!defined($remoteglotconf::tb_serial_key));
-       my $pos = $pos_waiting // $pos_calculating;
+       my $pos = $pos_calculating;
        return if (exists($tb_cache{$pos->fen()}));
 
        # If there's more than seven pieces, there's not going to be an answer,
@@ -1360,7 +1440,7 @@ sub schedule_tb_lookup {
        return if ($tb_lookup_running);
 
        $tb_lookup_running = 1;
-       my $url = 'http://158.250.18.203:6904/tasks/addtask?auth.login=' .
+       my $url = 'http://tb7-api.chessok.com:6904/tasks/addtask?auth.login=' .
                $remoteglotconf::tb_serial_key .
                '&auth.password=aquarium&type=0&fen=' . 
                URI::Escape::uri_escape($pos->fen());
@@ -1447,3 +1527,16 @@ sub parse_uci_move {
        my $promo    = substr($move, 4, 1);
        return ($from_row, $from_col, $to_row, $to_col, $promo);
 }
+
+sub setoptions {
+       my ($engine, $config) = @_;
+       uciprint($engine, "setoption name UCI_AnalyseMode value true");
+       uciprint($engine, "setoption name Analysis Contempt value Off");
+       if (exists($config->{'Threads'})) {  # Threads first, because clearing hash can be multithreaded then.
+               uciprint($engine, "setoption name Threads value " . $config->{'Threads'});
+       }
+       while (my ($key, $value) = each %$config) {
+               next if $key eq 'Threads';
+               uciprint($engine, "setoption name $key value $value");
+       }
+}