X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=cbc11f774fa4beb4502b1dfaf975aae678f495ce;hp=c13ea347d0b6640c2b8f284992efd6725fdf2d32;hb=c33a1432ec909fcba0049c492cebbcbda21886c6;hpb=e7c084cff327333c02190799fc3803c1a2b4fe74

diff --git a/UCI2WB.c b/UCI2WB.c
index c13ea34..cbc11f7 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -30,7 +30,7 @@
 #include <string.h>
 
 // Set VARIANTS for in WinBoard variant feature. (With -s option this will always be reset to use "shogi".)
-#define VARIANTS "normal,xiangqi"
+#define VARIANTS ",normal,xiangqi"
 #define STDVARS "chess,chess960,crazyhouse,threecheck,giveaway,atomic,seirawan,shogi,xiangqi"
 
 #define DPRINT if(debug) printf
@@ -41,13 +41,14 @@
 #define NONE  2
 #define ANALYZE 3
 
-char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', suffix[81], *variants, varOpt;
+char move[2000][10], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', suffix[81], varOpt, searching, *binary;
 int mps, tc, inc, sTime, depth, myTime, hisTime, stm, computer = NONE, memory, oldMem=0, cores, moveNr, lastDepth, lastScore, startTime, debug, flob;
 int statDepth, statScore, statNodes, statTime, currNr, size, collect, nr, sm, inex, on[500], frc, byo = -1, namOpt, comp;
-char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20], varList[8000];
+char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20], varList[8000], anaOpt[20], backLog[10000], checkOptions[8192] = "Ponder";
 char board[100];  // XQ board for UCCI
 char *nameWord = "name ", *valueWord = "value ", *wTime = "w", *bTime = "b", *wInc = "winc", *bInc = "binc", newGame; // keywords that differ in UCCI
 int unit = 1, drawOffer;
+volatile int logLen, sentLen;
 
 FILE *toE, *fromE, *fromF;
 int pid;
@@ -191,6 +192,23 @@ StartPonder()
 	StartSearch(" ponder");
 }
 
+void
+Analyze(char *val)
+{
+    if(*anaOpt) EPRINT((f, "# setoption %s%s %s%s\n", nameWord, anaOpt, valueWord, val));
+}
+
+int
+Release()
+{   // send setoption commands backlogged during thinking to engine, aborting ponder or analysis search if necessary
+    int len = logLen - sentLen, analyse = searching;
+    if(len <= 0) return 0;
+    StopPonder(pondering | searching); pondering = searching = 0; // force new search if settings change during analysis (multi-PV!)
+    fwrite(backLog + sentLen, 1, len, toE); sentLen += len; DPRINT("# release %d\n", len);
+    if(ponder && computer == 1 - stm) StartPonder(); // (re)start ponder search
+    return analyse; // return 1 if analysis search should be restarted
+}
+
 char *Convert(char *pv)
 {   // convert Shogi coordinates to WB
     char *p, *q, c;
@@ -241,12 +259,12 @@ Engine2GUI()
 
     if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
     while(1) {
-	int i=0, x; char *p, dummy;
+	int i=0, x; char *p, dummy, len;
 
 	fflush(stdout); fflush(toE);
 	while((line[i] = x = GetChar()) != EOF && line[i] != '\n') i++;
 	line[++i] = 0;
-	if(x == EOF) exit(0);
+	if(x == EOF) printf("tellusererror UCI2WB: %s died on me\n", binary), exit(0);
 	DPRINT("# engine said: %s", line), fflush(stdout);
 	if(sscanf(line, "%s", command) != 1) continue;
 	if(!strcmp(command, "bestmove")) {
@@ -259,6 +277,7 @@ Engine2GUI()
 	    if(strstr(line+9, "(none)") || strstr(line+9, "null") ||
 	       strstr(line+9, "0000")) { printf("%s\n", lastScore < -99999 ? "resign" : "1/2-1/2 {stalemate}"); computer = NONE; }
 	    sscanf(line, "bestmove %s", move[moveNr++]);
+	    Release(); // send setoption commands that arrived during search
 	    myTime -= (GetTickCount() - startTime)*1.02 + inc; // update own clock, so we can give correct wtime, btime with ponder
 	    if(mps && ((moveNr+1)/2) % mps == 0) myTime += tc; if(sTime) myTime = sTime; // new session or move starts
 	    stm = WHITE+BLACK - stm;
@@ -308,6 +327,7 @@ Engine2GUI()
 		if(p = strstr(line+4, " currmovenumber ")) sscanf(p+16,"%d", &currNr);
 		if(pv = strstr(line+4, " pv ")) // convert PV info to WB thinking output
 		    printf("%3d  %6d %6d %10d %s", lastDepth=d, lastScore=s, t, n, Convert(pv+4));
+		else if(s == -100000) lastScore = s; // when checkmated score is valid even without PV (which might not come)
 	    }
 	}
 	else if(!strcmp(command, "option")) { // USI option: extract data fields
@@ -321,6 +341,7 @@ Engine2GUI()
 	    if(!strcasecmp(name, "UCI_Chess960")) { frc=2; continue; }
 	    if(!strcasecmp(name, "UCI_Variant")) { if(p = strstr(line+6, " var ")) strcpy(varList, p); varOpt = 1; continue; }
 	    if(!strcasecmp(name, "UCI_Opponent")) { namOpt = 1; continue; }
+	    if(!strcasecmp(name+2, "I_AnalyseMode")) { strcpy(anaOpt, name); continue; }
 	    if(frc< 0 && (strstr(name, "960") || strcasestr(name, "frc")) && !strcmp(type, "check")) {
 		EPRINT((f, "# setoption name %s value true\n", name)) strcpy(val, "true"); // set non-standard suspected FRC options
 	    }
@@ -395,10 +416,10 @@ Move4Engine(char *m)
 void
 GUI2Engine()
 {
-    char line[256], command[256], *p, *q, *r, mySide, searching = 0;
+    char line[256], command[256], *p, *q, *r, mySide, type[99];
 
     while(1) {
-	int i, x;
+	int i, x, difficult, think=0;
 
 	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
 	    DPRINT("# start search\n");
@@ -412,27 +433,53 @@ GUI2Engine()
 		    for(i=1; i<nr; i++) if(on[i]) EPRINT((f, " %s", moveMap[i]))
 		}
 		EPRINT((f, "\n")) searching = 1; // suppresses spurious commands during analysis starting new searches
-	    } else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during thinking
+	    } else pause = think = 2, StartSearch(""); // request suspending of input processing while thinking
 	}
       nomove:
+       for(difficult=0; !difficult; ) { // read and handle commands that can (or must) be handled during thinking
 	fflush(toE); fflush(stdout);
 	i = 0; while((x = getchar()) != EOF && (line[i] = x) != '\n') i++;
-	line[++i] = 0; if(x == EOF) { printf("# EOF\n"); EPRINT((f, "# quit\n")) exit(-1); }
-	sscanf(line, "%s", command);
-	if(!strcmp(command, "new")) {
-	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
-	    stm = WHITE; strcpy(iniPos, "position startpos"); frc &= ~1;
-	    if(memory != oldMem && hasHash) EPRINT((f, "# setoption %s%s %s%d\n", nameWord, hashOpt, valueWord, memory))
-	    oldMem = memory;
-	    // we can set other options here
-	    if(sc == 'x') { if(newGame) EPRINT((f, "# setoption newgame\n")) } else // optional in UCCI
-	    if(varOpt) EPRINT((f, "# setoption name UCI_Variant value chess\n"))
-	    pause = 1; // wait for option settings to take effect
-	    EPRINT((f, "# isready\n")) fflush(toE);
-	    Sync(PAUSE); // wait for readyok
-	    EPRINT((f, "# u%cinewgame\n", sc)) fflush(toE);
+	line[++i] = 0; if(x == EOF) { printf("# EOF\n"); sprintf(line, "quit -1\n"); }
+	if(think && !pause) Sync(PAUSE), think = 0, Release(); // if no longer thinking, take dummy pause
+	sscanf(line, "%s", command); DPRINT("# '%s' think=%d pause=%d log=%d sent=%d\n", command, think, pause, logLen, sentLen);
+	if(!strcmp(command, "usermove")) { difficult--; break; } // for efficiency during game play, moves, time & otim are tried first
+	else if(!strcmp(command, "time"))   sscanf(line+4, "%d", &myTime),  myTime  = (10*myTime)/unit;
+	else if(!strcmp(command, "otim"))   sscanf(line+4, "%d", &hisTime), hisTime = (10*hisTime)/unit;
+	else if(!strcmp(command, "offer")) drawOffer = 1; // backlogged anyway, so this can be done instantly
+	else if(!strcmp(command, "post"))  post = 1;
+	else if(!strcmp(command, "nopost"))post = 0;
+	else if(!strcmp(command, "pause")) {
+	    if(computer == stm) myTime -= GetTickCount() - startTime;
+	    suspended = 1 + pondering; // remember if we were pondering, and stop search ignoring bestmove
+	    StopPonder(pondering || computer == stm);
 	}
-	else if(!strcmp(command, "usermove")) {
+	else { //convert easy & hard to "option" after treating their effect on the adapter
+	  if(!strcmp(command, "easy")) {
+	    if(*canPonder) ponder = 0, sprintf(command, "option"), sprintf(line, "option %s=0\n", canPonder); else continue;
+	  }
+	  else if(!strcmp(command, "hard")) {
+	    if(*canPonder) ponder = 1, sprintf(command, "option"), sprintf(line, "option %s=1\n", canPonder); else continue;
+	  }
+	  if(!strcmp(command, "option")) {
+	    char *p;
+	    if(logLen == sentLen) logLen = 0, sentLen = 0; // engine is up to date; reset buffer
+	    if(sscanf(line+7, "UCI2WB debug output=%d", &debug) == 1) ; else
+	    if(sscanf(line+7, "Floating Byoyomi=%d", &flob) == 1) ; else
+	    if(sscanf(line+7, "Byoyomi=%d", &byo) == 1) ; else
+	    if(p = strchr(line, '=')) {
+		*p++ = 0;
+		if(strstr(checkOptions, line+7)) sprintf(p, "%s\n", atoi(p) ? "true" : "false");
+		snprintf(backLog+logLen, 9999-logLen, "setoption %s%s %s%s", nameWord, line+7, valueWord, p);
+	    } else snprintf(backLog+logLen, 9999-logLen, "setoption %s%s\n", nameWord, line+7);
+	    DPRINT("# backlog: %s", backLog+logLen); logLen += strlen(backLog+logLen);
+	    if(!think && Release()) break; // break will restart analysis; pondering is restarted by Release itself
+	  }
+	  else difficult = 1; // difficult command; terminate loop for easy ones
+	}
+       } // next command
+
+	// some commands that should never come during thinking can be safely processed here
+	if(difficult < 0) { // used as kludge to signal "usermove" was already matched
 	    sscanf(line, "usermove %s", command); // strips off linefeed
 	    Move4Engine(command);
 	    stm = WHITE+BLACK - stm; collect = (computer == ANALYZE); sm = 0;
@@ -442,12 +489,35 @@ GUI2Engine()
 		    char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
 		    pondering = 0; pause = 2; moveNr++; startTime = GetTickCount(); // clock starts running now
 		    EPRINT((f, "# ponderhit%s\n", draw)) fflush(toE); fflush(stdout);
-		    Sync(PAUSE); // block input during thinking
+		    think = 2; // request blocking input during thinking
 		    goto nomove;
 		}
 		StopPonder(1); searching = 0;
 	    }
 	    strcpy(move[moveNr++], command); // possibly overwrites ponder move
+	    continue;
+	}
+	if(!strcmp(command, "resume")) {
+	    if(suspended == 2) StartPonder(); // restart interrupted ponder search
+	    suspended = think = 0; continue;  // causes thinking to start in normal way if on move or analyzing
+	}
+	if(think) { // command arrived during thinking; order abort for 'instant commands'
+	    if(!strcmp(command, "?") || !strcmp(command, "quit") ||
+	       !strcmp(command, "force") || !strcmp(command, "result")) { EPRINT((f, "# stop\n")); fflush(toE); }
+	    Sync(PAUSE); Release(); // block processing of difficult commands during thinking; send backlog left because of race
+	}
+	if(!strcmp(command, "new")) {
+	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
+	    stm = WHITE; strcpy(iniPos, "position startpos"); frc &= ~1;
+	    if(memory != oldMem && hasHash) EPRINT((f, "# setoption %s%s %s%d\n", nameWord, hashOpt, valueWord, memory))
+	    oldMem = memory;
+	    // we can set other options here
+	    if(sc == 'x') { if(newGame) EPRINT((f, "# setoption newgame\n")) } else // optional in UCCI
+	    if(varOpt) EPRINT((f, "# setoption name UCI_Variant value chess\n"))
+	    pause = 1; // wait for option settings to take effect
+	    EPRINT((f, "# isready\n")) fflush(toE);
+	    Sync(PAUSE); // wait for readyok
+	    EPRINT((f, "# u%cinewgame\n", sc)) fflush(toE);
 	}
 	else if(!strcmp(command, "level")) {
 	    int sec = 0;
@@ -455,21 +525,9 @@ GUI2Engine()
 	    sscanf(line, "level %d %d %d", &mps, &tc, &inc);
 	    tc = (60*tc + sec)*1000; inc *= 1000; sTime = 0; tc /= unit; inc /= unit;
 	}
-	else if(!strcmp(command, "option")) {
-	    char name[80], *p;
-	    if(searching) StopPonder(1), searching = 0; // force new search if settings change during analysis (multi-PV!)
-	    if(sscanf(line+7, "UCI2WB debug output=%d", &debug) == 1) ; else
-	    if(sscanf(line+7, "Floating Byoyomi=%d", &flob) == 1) ; else
-	    if(sscanf(line+7, "Byoyomi=%d", &byo) == 1) ; else
-	    if(p = strchr(line, '=')) {
-		*p++ = 0;
-		if(strstr(checkOptions, line+7)) sprintf(p, "%s\n", atoi(p) ? "true" : "false");
-		EPRINT((f, "# setoption %s%s %s%s", nameWord, line+7, valueWord, p))
-	    } else EPRINT((f, "# setoption %s%s\n", nameWord, line+7))
-	}
 	else if(!strcmp(command, "protover")) {
-	    if(!variants) variants = sc=='s' ? "shogi,5x5+5_shogi" : VARIANTS;
-	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 name=1 reuse=0 exclude=1 pause=1 sigint=0 sigterm=0 done=0\n", variants);
+	    if(!varList[0]) strcpy(varList, sc=='s' ? ",shogi,5x5+5_shogi" : VARIANTS);
+	    printf("feature setboard=1 usermove=1 debug=1 ping=1 name=1 reuse=0 exclude=1 pause=1 sigint=0 sigterm=0 done=0\n");
 	    printf("feature option=\"UCI2WB debug output -check %d\"\n", debug);
 	    if(sc == 's') printf("feature option=\"Floating Byoyomi -check %d\"\nfeature option=\"Byoyomi -spin %d -1 1000\"\n", flob, byo);
 	    EPRINT((f, sc == 'x' ? "# ucci\n" : "u%ci\n", sc)) fflush(toE); // prompt UCI engine for options
@@ -512,36 +570,24 @@ GUI2Engine()
 	    if(!(sm & 2)) goto nomove; // no moves enabled; continue current search
 	    if(computer == ANALYZE) StopPonder(1), searching = 0; // abort old analysis
 	}
-	else if(!strcmp(command, "pause")) {
-	    if(computer == stm) myTime -= GetTickCount() - startTime;
-	    suspended = 1 + pondering; // remember if we were pondering, and stop search ignoring bestmove
-	    StopPonder(pondering || computer == stm);
-	}
-	else if(!strcmp(command, "resume")) {
-	    if(suspended == 2) StartPonder(); // restart interrupted ponder search
-	    suspended = 0; // causes thinking to start in normal way if on move or analyzing
-	}
 	else if(!strcmp(command, "xboard")) ;
-	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0;
-	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1), searching = 0;
+	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0, Analyze("true");
+	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1), searching = 0, Analyze("false");
 	else if(!strcmp(command, "force"))  computer = NONE, StopPonder(pondering);
 	else if(!strcmp(command, "go"))     computer = stm;
-	else if(!strcmp(command, "time"))   sscanf(line+4, "%d", &myTime),  myTime  = (10*myTime)/unit;
-	else if(!strcmp(command, "otim"))   sscanf(line+4, "%d", &hisTime), hisTime = (10*hisTime)/unit;
-	else if(!strcmp(command, "post"))   post = 1;
-	else if(!strcmp(command, "nopost")) post = 0;
-	else if(!strcmp(command, "easy") && !!*canPonder) { ponder = 0; StopPonder(pondering); EPRINT((f, "# setoption %s%s %sfalse\n", nameWord, canPonder, valueWord)) }
-	else if(!strcmp(command, "hard") && !!*canPonder) { ponder = 1; EPRINT((f, "# setoption %s%s %strue\n", nameWord, canPonder, valueWord)) StartPonder(); }
 	else if(!strcmp(command, "ping"))   { /* static int done; if(!done) pause = 1, fprintf(toE, "isready\n"), fflush(toE), printf("# send isready\n"), fflush(stdout), Sync(PAUSE); done = 1;*/ printf("po%s", line+2); }
 	else if(!strcmp(command, "memory")) sscanf(line, "memory %d", &memory);
 	else if(!strcmp(command, "cores")&& !!*threadOpt) { sscanf(line, "cores %d", &cores); EPRINT((f, "# setoption %s%s %s%d\n", nameWord, threadOpt, valueWord, cores)) }
+	else if(!strcmp(command, "egtpath")){ sscanf(line, "egtpath %s %[^\n]", type, command); EPRINT((f, "# setoption name %sPath value %s\n", type,command)); }
 	else if(!strcmp(command, "sd"))     sscanf(line, "sd %d", &depth);
 	else if(!strcmp(command, "st"))     sscanf(line, "st %d", &sTime), sTime = 1000*sTime - 30, inc = 0, sTime /= unit;
 	else if(!strcmp(command, "name"))   { if(namOpt) EPRINT((f, "# setoption name UCI_Opponent value none none %s %s", comp ? "computer" : "human", line+5)) }
 	else if(!strcmp(command, "computer")) comp = 1;
-	else if(!strcmp(command, "offer"))  drawOffer = 1;
-	else if(!strcmp(command, "result")) { if(sc == 's') EPRINT((f, "# gameover %s\n", line[8] == '/' ? "draw" : (line[7] == '0') == mySide ? "win" : "lose")) }
-	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(0); }
+	else if(!strcmp(command, "result")) {
+	    if(sc == 's') EPRINT((f, "# gameover %s\n", line[8] == '/' ? "draw" : (line[7] == '0') == mySide ? "win" : "lose"))
+	    computer = NONE;
+	}
+	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(atoi(line+4)); }
     }
 }
 
@@ -636,7 +682,7 @@ main(int argc, char **argv)
 
 	if(argc == 2 && !strcmp(argv[1], "-v")) { printf("UCI2WB " VERSION " by H.G.Muller\n"); exit(0); }
 	if(argc > 1 && !strcmp(argv[1], "debug")) { debug = 1; argc--; argv++; }
-	if(argc > 1 && !strcmp(argv[1], "-var")) { variants = argv[2]; argc-=2; argv+=2; }
+	if(argc > 1 && !strcmp(argv[1], "-var")) { strcpy(varList+1, argv[2]); *varList = ','; argc-=2; argv+=2; }
 	if(argc > 1 && argv[1][0] == '-') { sc = argv[1][1]; argc--; argv++; }
 	if(argc < 2) { printf("usage is: U%cI2WB [debug] [-s] <engine.exe> [<engine directory>]\n", sc-32); exit(-1); }
 	if(argc > 2) dir = argv[2];
@@ -647,7 +693,7 @@ main(int argc, char **argv)
 	else if(sc == 'n') sc = 'c'; // UCI for normal Chess
 
 	// spawn engine proc
-	if(StartEngine(argv[1], dir) != NO_ERROR) { perror(argv[1]), exit(-1); }
+	if(StartEngine(binary = argv[1], dir) != NO_ERROR) { perror(argv[1]), exit(-1); }
 
 	Sync(INIT);