X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=b9df43c4c1e53bfc99c1ed79af265c4f22f4f919;hp=05600eee4f31f51589c585b51c749ae74aa17539;hb=9e92f9f1e4e601912bd40334c9f89677b9b65f23;hpb=4c43c5722cf24b0cd44a9fe1f1eb6ad6c501d345

diff --git a/UCI2WB.c b/UCI2WB.c
index 05600ee..b9df43c 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -32,7 +32,7 @@
 // Set VARIANTS for in WinBoard variant feature. (With -s option this will always be reset to use "shogi".)
 #define VARIANTS ",normal,xiangqi"
 #define STDVARS "chess,chess960,crazyhouse,3check,giveaway,suicide,losers,atomic,seirawan,shogi,xiangqi"
-#define EGT ",gaviotaTbPath,syzygyPath,nalimovPath,robbotripleBaseDirectory,robbototalBaseDirectory,"
+#define EGT ",gaviotaTbPath,syzygyPath,nalimovPath,robbotripleBaseDirectory,robbototalBaseDirectory,bitbases path,"
 
 #define DPRINT if(debug) printf
 #define EPRINT(X) { char f[999]; sprintf X; DPRINT("%s", f); fprintf(toE, "%s", f + 2*(*f == '#')); /* strip optional # prefix */ }
@@ -42,13 +42,13 @@
 #define NONE  2
 #define ANALYZE 3
 
-char move[2000][10], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', suffix[81], varOpt, searching, *binary;
+char move[2000][10], iniPos[256], hashOpt[20], pause, 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], anaOpt[20], backLog[10000], checkOptions[8192] = "Ponder";
 char pvs[99][999], 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, scores[99], mpvSP, maxDepth;
+int unit = 1, drawOffer, scores[99], mpvSP, maxDepth, ponderAlways;
 volatile int logLen, sentLen;
 
 FILE *toE, *fromE, *fromF;
@@ -185,11 +185,11 @@ LoadPos(int moveNr)
 }
 
 void
-StartPonder()
+StartPonder(int moveNr)
 {
 	if(!move[moveNr][0]) return; // no ponder move
 	LoadPos(moveNr+1);
-	pondering = 1; lastDepth = 1;
+	searching = 1; lastDepth = 1;
 	StartSearch(" ponder");
 }
 
@@ -202,11 +202,11 @@ Analyze(char *val)
 int
 Release()
 {   // send setoption commands backlogged during thinking to engine, aborting ponder or analysis search if necessary
-    int len = logLen - sentLen, analyse = searching;
+    int len = logLen - sentLen, analyse = (searching == 2);
     if(len <= 0) return 0;
-    StopPonder(pondering | searching); pondering = searching = 0; // force new search if settings change during analysis (multi-PV!)
+    StopPonder(searching); 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
+    if(ponder && computer == 1 - stm) StartPonder(moveNr); // (re)start ponder search
     return analyse; // return 1 if analysis search should be restarted
 }
 
@@ -243,34 +243,29 @@ Move4GUI(char *m)
 }
 
 int
-GetChar()
+ReadLine (FILE *f, char *line)
 {
-    int c;
-    if(fromF) {
-	if((c = fgetc(fromF)) != EOF) return c;
-	fclose(fromF); fromF = 0; printf("# end fake\n");
-    }
-    return fgetc(fromE);
+    int x, i = 0;
+    while((x = fgetc(f)) != EOF && (line[i] = x) != '\n') i++; line[++i] = 0;
+    return (x != EOF);
 }
 
-void *
-Engine2GUI()
+void
+HandleEngineOutput()
 {
     char line[1024], command[256]; static char egts[999];
 
-    if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
     while(1) {
 	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) printf("tellusererror UCI2WB: %s died on me\n", binary), exit(0);
+	if(fromF && !ReadLine(fromF, line))  fromF = 0, printf("# end fake\n");
+	if(!fromF && !ReadLine(fromE, line)) 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")) {
-	    if(pause == 1) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.
-	    else if(pondering) { pondering = 0; printf("%d 0 0 0 UCI violation! Engine moves during ponder\n", lastDepth+1); continue; } // ignore ponder search
+	    if(pause == 1) { searching = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.
+	    else if(searching == 1) { searching = 0; printf("%d 0 0 0 UCI violation! Engine moves during ponder\n", lastDepth+1); continue; } // ignore ponder search
 	    // move was a move to be played
 	    if(p = strstr(line+8, " draw")) *p = 0, printf("offer draw\n"); // UCCI
 	    if(strstr(line+9, "resign")) { printf("resign\n"); computer = NONE; }
@@ -287,7 +282,7 @@ Engine2GUI()
 	      sscanf(p+7, "%s", move[moveNr]);
 	      if(computer != NONE && ponder) {
 		DPRINT("# ponder on %s\n", move[moveNr]);
-		StartPonder();
+		StartPonder(moveNr);
 	      }
 	      p[-1] = '\n'; *p = 0; // strip off ponder move
 	    } else move[moveNr][0] = 0;
@@ -302,7 +297,15 @@ Engine2GUI()
 	    char *pv, varName[80];
 	    if(sscanf(line+5, "string times @ %c", &dummy) == 1) { printf("# %s", line+12); continue; }
 	    if(sscanf(line+5, "string variant %s", varName) == 1) {
-		if(!strstr(STDVARS, varName) && (p = strstr(line+18, " startpos "))) printf("setup (-) 8x8+0_fairy %s", p+10);
+		if(!strstr(STDVARS, varName)) {
+		    int files = 8, ranks = 8, hand = 0; char parent[80];
+		    if(p = strstr(line+18, " files ")) sscanf(p+7, "%d", &files);
+		    if(p = strstr(line+18, " ranks ")) sscanf(p+7, "%d", &ranks);
+		    if(p = strstr(line+18, " pocket ")) sscanf(p+8, "%d", &hand);
+		    if(p = strstr(line+18, " template ")) sscanf(p+10, "%s", parent); else strcpy(parent, "fairy");
+		    if(p = strstr(line+18, " startpos "))
+			printf("setup (-) %dx%d+%d_%s %s", files, ranks, hand, parent, p+10);
+		}
 		continue;
 	    }
 	    if(collect && (pv = strstr(line+5, "currmove "))) {
@@ -361,7 +364,7 @@ Engine2GUI()
 	    if(!strcasecmp(name, "newgame") && !strcmp(type, "button")) { newGame++; continue; }
 	    if(!strcasecmp(name, "usemillisec")) { unit = (!strcmp(val, "false") ? 2 : 1); continue; }
 	    sprintf(buf, ",%s,", name); if(p = strcasestr(EGT, buf)) { // collect EGT formats
-		strcpy(buf, p); for(p=buf; *++p >='a';){} *p = 0; strcat(egts, buf); continue; // clip at first non-lower-case
+		strcpy(buf, p); for(p=buf; *++p >='a';){} if(*p == ' ') strcpy(buf, ",scorpio"); *p = 0; strcat(egts, buf); continue; // clip at first non-lower-case
 	    }
 	    // pass on engine-defined option as WB option feature
 	    if(!strcmp(type, "filename")) type[4] = 0;
@@ -408,6 +411,13 @@ Engine2GUI()
     }
 }
 
+void *
+Engine2GUI()
+{
+    if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
+    HandleEngineOutput();
+}
+
 void
 Move4Engine(char *m)
 {
@@ -426,13 +436,14 @@ Move4Engine(char *m)
     }
 }
 
+int DoCommand ();
+char mySide;
+char queue[10000], *qStart, *qEnd;
+
 void
-GUI2Engine()
+LaunchSearch()
 {
-    char line[256], command[256], *p, *q, *r, mySide, type[99];
-
-    while(1) {
-	int i, x, difficult, think=0;
+    int i;
 
 	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
 	    DPRINT("# start search\n");
@@ -445,16 +456,24 @@ GUI2Engine()
 		    EPRINT((f, " searchmoves"))
 		    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 = think = 2, StartSearch(""); // request suspending of input processing while thinking
-	}
-      nomove:
+		EPRINT((f, "\n")) searching = 2; // suppresses spurious commands during analysis starting new searches
+	    } else pause = 2, searching = 3, StartSearch(""); // request suspending of input processing while thinking
+	} else if(ponderAlways && computer == NONE) move[moveNr][0] = 0, StartPonder(moveNr-1);
+}
+
+void
+GUI2Engine()
+{
+    char line[256], command[256], *p;
+
+    while(1) {
+	int i, difficult;
+
        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"); 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(!ReadLine(stdin, line)) printf("# EOF\n"), sprintf(line, "quit -1\n");
+	if(searching == 3 && !pause) Sync(PAUSE), searching = 0, Release(); // if no longer thinking, take dummy pause
+	sscanf(line, "%s", command); DPRINT("# '%s' searching=%d pause=%d log=%d sent=%d\n", command, searching, 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;
@@ -463,8 +482,8 @@ GUI2Engine()
 	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);
+	    suspended = 1 + (searching == 1); // remember if we were pondering, and stop search ignoring bestmove
+	    StopPonder(searching);
 	}
 	else { //convert easy & hard to "option" after treating their effect on the adapter
 	  if(!strcmp(command, "easy")) {
@@ -477,6 +496,7 @@ GUI2Engine()
 	    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, "ponder always=%d", &ponderAlways) == 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, '=')) {
@@ -485,7 +505,7 @@ GUI2Engine()
 		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
+	    if(searching < 3 && Release()) break; // break will restart analysis; pondering is restarted by Release itself
 	  }
 	  else difficult = 1; // difficult command; terminate loop for easy ones
 	}
@@ -497,28 +517,47 @@ GUI2Engine()
 	    Move4Engine(command);
 	    stm = WHITE+BLACK - stm; collect = (computer == ANALYZE); sm = 0;
 	    // when pondering we either continue the ponder search as normal search, or abort it
-	    if(pondering || computer == ANALYZE) {
-		if(pondering && !strcmp(command, move[moveNr])) { // ponder hit
+	    if(searching) { // move cannot come during think
+		if(searching == 1 && !strcmp(command, move[moveNr])) { // ponder hit
 		    char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
-		    pondering = 0; pause = 2; moveNr++; startTime = GetTickCount(); // clock starts running now
+		    searching = 0; pause = 2; moveNr++; startTime = GetTickCount(); // clock starts running now
 		    EPRINT((f, "# ponderhit%s\n", draw)) fflush(toE); fflush(stdout);
-		    think = 2; // request blocking input during thinking
-		    goto nomove;
+		    searching = 3; // request blocking input during thinking
+		    continue;
 		}
 		StopPonder(1); searching = 0;
 	    }
 	    strcpy(move[moveNr++], command); // possibly overwrites ponder move
-	    continue;
-	}
+	} else
 	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'
+	    searching = 0;
+	    if(suspended == 2) StartPonder(moveNr); // restart interrupted ponder search
+	    suspended = 0;  // causes thinking to start in normal way if on move or analyzing
+	} else
+      {
+	if(searching == 3) { // 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(qStart == qEnd) qStart = qEnd = queue;
+	p = line; while(qEnd < queue+10000 && (*qEnd++ = *p++) != '\n') {}
+	if(DoCommand()) continue;
+      }
+
+	LaunchSearch(); // start a search if we need one
+    }
+}
+
+int
+DoCommand ()
+{
+    char line[1024], command[256], *p, *q, *r, type[99];
+    int i;
+
+    p=line; while(qStart < qEnd && (*p++ = *qStart++) != '\n') {} *p = 0;
+    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;
@@ -542,6 +581,7 @@ GUI2Engine()
 	    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);
+	    printf("feature option=\"ponder always -check %d\"\n", ponderAlways);
 	    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
 	    Sync(PAUSE); // wait for uciok
@@ -569,31 +609,31 @@ GUI2Engine()
 		if(!strcmp(line+8, "fischerandom\n")) { frc |= 1; if(frc > 0) EPRINT((f, "# setoption name UCI_Chess960 value true\n")) }
 	}
 	else if(!strcmp(command, "undo") && (i=1) || !strcmp(command, "remove") && (i=2)) {
-	    if(pondering || computer == ANALYZE) StopPonder(1), searching = 0;
+	    if(searching) StopPonder(1), searching = 0;
 	    moveNr = moveNr > i ? moveNr - i : 0; collect = (computer == ANALYZE); sm = 0;
 	}
 	else if(!strcmp(command, ".")) {
 	    printf("stat01: %d %d %d %d 100 %s\n", statTime, statNodes, statDepth, 100-currNr, currMove);
-	    goto nomove;
+	    return 1;
 	}
 	else if(!strcmp(command+2, "clude") && collect > 2) { // include or exclude
 	    int all = !strcmp(line+8, "all"), in = command[1] == 'n';
 	    inex = 1; line[strlen(line)-1] = sm = 0; // strip LF and clear sm flag
 	    for(i=1; i<nr; i++) { if(!strcmp(line+8, moveMap[i]) || all) on[i] = in; sm |= on[i]+1; } // sm: 2 = enabled, 1 = disabled
-	    if(!(sm & 2)) goto nomove; // no moves enabled; continue current search
+	    if(!(sm & 2)) return 1; // no moves enabled; continue current search
 	    if(computer == ANALYZE) StopPonder(1), searching = 0; // abort old analysis
 	}
 	else if(!strcmp(command, "xboard")) ;
 	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, "force"))  computer = NONE, StopPonder(searching == 1);
 	else if(!strcmp(command, "go"))     computer = stm;
 	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+8, "%s %[^\n]", type, command);
-            if(p = strstr(EGT, type)) strcpy(type, p), p = strchr(type, ','), *p = 0;
+            if(p = strstr(EGT, type)) strcpy(type, p), p = strchr(type, ','), *p = 0; else strcpy(type, "bitbases path");
 	    EPRINT((f, "# setoption name %s value %s\n", type, command));
 	}
 	else if(!strcmp(command, "sd"))     sscanf(line, "sd %d", &depth);
@@ -605,7 +645,8 @@ GUI2Engine()
 	    computer = NONE;
 	}
 	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(atoi(line+4)); }
-    }
+
+    return 0;
 }
 
 int