X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=eecd407ba587cbb156e52c4a704f28d3e1d5adc5;hp=72eb40a51a898a1055e577a8d12e96f2926f9d69;hb=0b634023996101f25655961eb90079a6b6c7d8ad;hpb=762b4cb898d3300233b773eff370a1562a445efe

diff --git a/remoteglot.pl b/remoteglot.pl
index 72eb40a..eecd407 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -15,6 +15,7 @@ use IPC::Open2;
 use Time::HiRes;
 use JSON::XS;
 require 'Position.pm';
+require 'Engine.pm';
 use strict;
 use warnings;
 
@@ -112,84 +113,13 @@ while (1) {
 
 		chomp $line;
 		$line =~ tr/\r//d;
-		if ($line =~ /^<12> /) {
-			my $pos = Position->new($line);
-			
-			# if this is already in the queue, ignore it
-			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
-			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 (defined($pos_calculating)) {
-				if (!defined($pos_waiting)) {
-					uciprint($engine, "stop");
-				}
-				if ($uci_assume_full_compliance) {
-					$pos_waiting = $pos;
-				} else {
-					uciprint($engine, "position fen " . $pos->fen());
-					uciprint($engine, "go infinite");
-					$pos_calculating = $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
-				uciprint($engine, "position fen " . $pos->fen());
-				uciprint($engine, "go infinite");
-				$pos_calculating = $pos;
-			}
-
-			if (defined($engine2)) {
-				if (defined($pos_calculating_second_engine)) {
-					uciprint($engine2, "stop");
-				} else {
-					uciprint($engine2, "position fen " . $pos->fen());
-					uciprint($engine2, "go infinite");
-					$pos_calculating_second_engine = $pos;
-				}
-				$engine2->{'info'} = {};
-			}
-
-			$engine->{'info'} = {};
-			$last_move = time;
-
-			# 
-			# Output a command every move to note that we're
-			# still paying attention -- this is a good tradeoff,
-			# since if no move has happened in the last half
-			# hour, the analysis/relay has most likely stopped
-			# and we should stop hogging server resources.
-			#
-			$t->cmd("date");
-		}
-		if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
-			my ($who, $msg) = ($1, $2);
-
-			next if (grep { $_ eq $who } (@masters) == 0);
-	
-			if ($msg =~ /^fics (.*?)$/) {
-				$t->cmd("tell $who Executing '$1' on FICS.");
-				$t->cmd($1);
-			} elsif ($msg =~ /^uci (.*?)$/) {
-				$t->cmd("tell $who Sending '$1' to the engine.");
-				print { $engine->{'write'} } "$1\n";
-			} else {
-				$t->cmd("tell $who Couldn't understand '$msg', sorry.");
-			}
-		}
-		#print "FICS: [$line]\n";
+		handle_fics($line);
 		$sleep = 0;
 	}
 	
 	# any fun on the UCI channel?
 	if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-		my @lines = read_lines($engine);
+		my @lines = $engine->read_lines();
 		for my $line (@lines) {
 			next if $line =~ /(upper|lower)bound/;
 			handle_uci($engine, $line, 1);
@@ -199,7 +129,7 @@ while (1) {
 		output();
 	}
 	if (defined($engine2) && $nfound > 0 && vec($rout, fileno($engine2->{'read'}), 1) == 1) {
-		my @lines = read_lines($engine2);
+		my @lines = $engine2->read_lines();
 		for my $line (@lines) {
 			next if $line =~ /(upper|lower)bound/;
 			handle_uci($engine2, $line, 0);
@@ -251,6 +181,82 @@ sub handle_uci {
 	}
 }
 
+sub handle_fics {
+	my $line = shift;
+	if ($line =~ /^<12> /) {
+		my $pos = Position->new($line);
+		
+		# if this is already in the queue, ignore it
+		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
+		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 (defined($pos_calculating)) {
+			if (!defined($pos_waiting)) {
+				uciprint($engine, "stop");
+			}
+			if ($uci_assume_full_compliance) {
+				$pos_waiting = $pos;
+			} else {
+				uciprint($engine, "position fen " . $pos->fen());
+				uciprint($engine, "go infinite");
+				$pos_calculating = $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
+			uciprint($engine, "position fen " . $pos->fen());
+			uciprint($engine, "go infinite");
+			$pos_calculating = $pos;
+		}
+
+		if (defined($engine2)) {
+			if (defined($pos_calculating_second_engine)) {
+				uciprint($engine2, "stop");
+			} else {
+				uciprint($engine2, "position fen " . $pos->fen());
+				uciprint($engine2, "go infinite");
+				$pos_calculating_second_engine = $pos;
+			}
+			$engine2->{'info'} = {};
+		}
+
+		$engine->{'info'} = {};
+		$last_move = time;
+
+		# 
+		# Output a command every move to note that we're
+		# still paying attention -- this is a good tradeoff,
+		# since if no move has happened in the last half
+		# hour, the analysis/relay has most likely stopped
+		# and we should stop hogging server resources.
+		#
+		$t->cmd("date");
+	}
+	if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
+		my ($who, $msg) = ($1, $2);
+
+		next if (grep { $_ eq $who } (@masters) == 0);
+
+		if ($msg =~ /^fics (.*?)$/) {
+			$t->cmd("tell $who Executing '$1' on FICS.");
+			$t->cmd($1);
+		} elsif ($msg =~ /^uci (.*?)$/) {
+			$t->cmd("tell $who Sending '$1' to the engine.");
+			print { $engine->{'write'} } "$1\n";
+		} else {
+			$t->cmd("tell $who Couldn't understand '$msg', sorry.");
+		}
+	}
+	#print "FICS: [$line]\n";
+}
+
 sub parse_infos {
 	my ($engine, @x) = @_;
 	my $mpv = '';
@@ -342,12 +348,7 @@ sub prettyprint_pv {
 	}
 
 	my $pv = shift @pvs;
-	my $from_col = col_letter_to_num(substr($pv, 0, 1));
-	my $from_row = row_letter_to_num(substr($pv, 1, 1));
-	my $to_col   = col_letter_to_num(substr($pv, 2, 1));
-	my $to_row   = row_letter_to_num(substr($pv, 3, 1));
-	my $promo    = substr($pv, 4, 1);
-
+	my ($from_col, $from_row, $to_col, $to_row, $promo) = parse_uci_move($pv);
 	my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
 	return ($pretty, prettyprint_pv($nb, @pvs));
 }
@@ -577,7 +578,7 @@ sub output_json {
 
 sub uciprint {
 	my ($engine, $msg) = @_;
-	print { $engine->{'write'} } "$msg\n";
+	$engine->print($msg);
 	print UCILOG localtime() . " $engine->{'tag'} => $msg\n";
 }
 
@@ -716,65 +717,25 @@ sub book_info {
 
 sub open_engine {
 	my ($cmdline, $tag) = @_;
-
 	return undef if (!defined($cmdline));
-
-	my ($uciread, $uciwrite);
-	my $pid = IPC::Open2::open2($uciread, $uciwrite, $cmdline);
-
-	my $engine = {
-		pid => $pid,
-		read => $uciread,
-		readbuf => '',
-		write => $uciwrite,
-		info => {},
-		ids => {},
-		tag => $tag,
-	};
+	my $engine = Engine->open($cmdline, $tag);
 
 	uciprint($engine, "uci");
 
 	# gobble the options
-	while (<$uciread>) {
-		/uciok/ && last;
-		handle_uci($engine, $_);
+	my $seen_uciok = 0;
+	while (!$seen_uciok) {
+		for my $line ($engine->read_lines()) {
+			if ($line =~ /uciok/) {
+				$seen_uciok = 1;
+			}
+			handle_uci($engine, $line);
+		}
 	}
 	
 	return $engine;
 }
 
-sub read_lines {
-	my $engine = shift;
-
-	# 
-	# Read until we've got a full line -- if the engine sends part of
-	# a line and then stops we're pretty much hosed, but that should
-	# never happen.
-	#
-	while ($engine->{'readbuf'} !~ /\n/) {
-		my $tmp;
-		my $ret = sysread $engine->{'read'}, $tmp, 4096;
-
-		if (!defined($ret)) {
-			next if ($!{EINTR});
-			die "error in reading from the UCI engine: $!";
-		} elsif ($ret == 0) {
-			die "EOF from UCI engine";
-		}
-
-		$engine->{'readbuf'} .= $tmp;
-	}
-
-	# Blah.
-	my @lines = ();
-	while ($engine->{'readbuf'} =~ s/^([^\n]*)\n//) {
-		my $line = $1;
-		$line =~ tr/\r\n//d;
-		push @lines, $line;
-	}
-	return @lines;
-}
-
 sub col_letter_to_num {
 	return ord(shift) - ord('a');
 }
@@ -783,3 +744,12 @@ sub row_letter_to_num {
 	return 7 - (ord(shift) - ord('1'));
 }
 
+sub parse_uci_move {
+	my $move = shift;
+	my $from_col = col_letter_to_num(substr($move, 0, 1));
+	my $from_row = row_letter_to_num(substr($move, 1, 1));
+	my $to_col   = col_letter_to_num(substr($move, 2, 1));
+	my $to_row   = row_letter_to_num(substr($move, 3, 1));
+	my $promo    = substr($move, 4, 1);
+	return ($from_col, $from_row, $to_col, $to_row, $promo);
+}