X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=41c71c81f97880a7f7de80da1b5d1f675a32d47d;hp=b9df43c4c1e53bfc99c1ed79af265c4f22f4f919;hb=990ae69c6d5ff8468541372acc4c6fcb854f64e2;hpb=9e92f9f1e4e601912bd40334c9f89677b9b65f23

diff --git a/UCI2WB.c b/UCI2WB.c
index b9df43c..41c71c8 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -42,14 +42,13 @@
 #define NONE  2
 #define ANALYZE 3
 
-char move[2000][10], iniPos[256], hashOpt[20], pause, suspended, ponder, post, hasHash, c, sc='c', suffix[81], varOpt, searching, *binary;
+char move[2000][10], iniPos[256], hashOpt[20], 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 currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20], varList[8000], anaOpt[20], 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, ponderAlways;
-volatile int logLen, sentLen;
 
 FILE *toE, *fromE, *fromF;
 int pid;
@@ -161,12 +160,11 @@ StartSearch(char *ponder)
 }
 
 void
-StopPonder(int pondering)
+StopSearch(int discard)
 {
-	if(!pondering) return;
-	pause = 1;
+	if(!searching) return;
+	if(discard) searching = 0; // this causes bestmove to be ignored
 	EPRINT((f, "# stop\n")) fflush(toE); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'
-	Sync(PAUSE); // wait for engine to acknowledge 'stop' with 'bestmove'.
 }
 
 void
@@ -199,17 +197,6 @@ 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 == 2);
-    if(len <= 0) return 0;
-    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(moveNr); // (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;
@@ -264,8 +251,8 @@ HandleEngineOutput()
 	DPRINT("# engine said: %s", line), fflush(stdout);
 	if(sscanf(line, "%s", command) != 1) continue;
 	if(!strcmp(command, "bestmove")) {
-	    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
+	    if(searching == 1) { searching = 0; printf("%d 0 0 0 UCI violation! Engine moves during ponder\n", lastDepth+1); return; } // ignore ponder search
+	    else if(searching != 3) { searching = 0; return; } // ponder miss or analysis result; ignore.
 	    // 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; }
@@ -273,7 +260,6 @@ HandleEngineOutput()
 	    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;
@@ -289,8 +275,8 @@ HandleEngineOutput()
 	    Move4GUI(line+9);
 	    printf("move %s\n", line+9); // send move to GUI
             if(move[moveNr][0]) printf("Hint: %s\n", move[moveNr]);
-	    if(pause) { pause = 0; Sync(WAKEUP); } // release commands that came in during think
 	    if(lastScore == 100001 && iniPos[0] != 'f') { printf("%s {mate}\n", stm == BLACK ? "1-0" : "0-1"); computer = NONE; }
+	    return;
 	}
 	else if(!strcmp(command, "info")) {
 	    int d=0, s=0, t=(GetTickCount() - startTime)/10, n=1;
@@ -395,7 +381,7 @@ HandleEngineOutput()
 	    if(sscanf(line, "id name %[^\n]", name) == 1) printf("feature myname=\"%s (U%cI2WB)\"\n", name, sc-32);
 	    if(sscanf(line, "id version %[^\n]", version) == 1 && *name) printf("feature myname=\"%s %s (U%cI2WB)\"\n", name, version, sc-32);
 	}
-	else if(!strcmp(command, "readyok")) { pause = 0; Sync(WAKEUP); } // resume processing of GUI commands
+	else if(!strcmp(command, "readyok")) return; // resume processing of GUI commands
 	else if(sc == 'x'&& !strcmp(command, "ucciok") || sscanf(command, "u%ciok", &c)==1 && c==sc) {
 	    char *p = varList, *q = varList;
 	    while(*q && *q != '\n')  if(!strncmp(q, " var ", 5)) *p++ = ',', q +=5; // replace var keywords by commas
@@ -406,18 +392,11 @@ HandleEngineOutput()
 	    if(*egts) printf("feature egt=\"%s\"\n", egts+1);
 	    printf("feature smp=1 memory=%d done=1\n", hasHash);
 	    if(unit == 2) { unit = 1; EPRINT((f, "# setoption usemillisec true\n")) }
-	    Sync(WAKEUP); // done with options
+	    return; // done with options
 	}
     }
 }
 
-void *
-Engine2GUI()
-{
-    if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
-    HandleEngineOutput();
-}
-
 void
 Move4Engine(char *m)
 {
@@ -438,7 +417,7 @@ Move4Engine(char *m)
 
 int DoCommand ();
 char mySide;
-char queue[10000], *qStart, *qEnd;
+volatile char queue[10000], *qStart, *qEnd;
 
 void
 LaunchSearch()
@@ -457,7 +436,7 @@ LaunchSearch()
 		    for(i=1; i<nr; i++) if(on[i]) EPRINT((f, " %s", moveMap[i]))
 		}
 		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 searching = 3, StartSearch(""); // request suspending of input processing while thinking
 	} else if(ponderAlways && computer == NONE) move[moveNr][0] = 0, StartPonder(moveNr-1);
 }
 
@@ -472,18 +451,20 @@ GUI2Engine()
        for(difficult=0; !difficult; ) { // read and handle commands that can (or must) be handled during thinking
 	fflush(toE); fflush(stdout);
 	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);
+	sscanf(line, "%s", command);
 	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, ".")) {
+	    printf("stat01: %d %d %d %d 100 %s\n", statTime, statNodes, statDepth, 100-currNr, currMove);
+	}
 	else if(!strcmp(command, "pause")) {
 	    if(computer == stm) myTime -= GetTickCount() - startTime;
 	    suspended = 1 + (searching == 1); // remember if we were pondering, and stop search ignoring bestmove
-	    StopPonder(searching);
+	    StopSearch(1);
 	}
 	else { //convert easy & hard to "option" after treating their effect on the adapter
 	  if(!strcmp(command, "easy")) {
@@ -492,20 +473,12 @@ GUI2Engine()
 	  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
+	  else if(!strcmp(command, "option")) {
 	    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, '=')) {
-		*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(searching < 3 && Release()) break; // break will restart analysis; pondering is restarted by Release itself
+	    difficult = 1;
 	  }
 	  else difficult = 1; // difficult command; terminate loop for easy ones
 	}
@@ -517,35 +490,33 @@ 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(searching) { // move cannot come during think
+	    if(searching) { // move cannot come during think, so we are pondering or analysing
 		if(searching == 1 && !strcmp(command, move[moveNr])) { // ponder hit
 		    char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
-		    searching = 0; pause = 2; moveNr++; startTime = GetTickCount(); // clock starts running now
+		    searching = 3; moveNr++; startTime = GetTickCount(); // clock starts running now
 		    EPRINT((f, "# ponderhit%s\n", draw)) fflush(toE); fflush(stdout);
-		    searching = 3; // request blocking input during thinking
 		    continue;
 		}
-		StopPonder(1); searching = 0;
+		StopSearch(1);
 	    }
 	    strcpy(move[moveNr++], command); // possibly overwrites ponder move
+	    *qEnd++ = '\n'; Sync(WAKEUP);    // make sure engine thread considers starting a search
 	} else
 	if(!strcmp(command, "resume")) {
-	    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
+	    suspended = 0;  *qEnd++ = '\n'; Sync(WAKEUP); // causes search 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
-	}
+	       !strcmp(command, "force") || !strcmp(command, "result")) StopSearch(0);
+	} else StopSearch(1); // always abort pondering or analysis
+
+	// queue command for execution by engine thread
 	if(qStart == qEnd) qStart = qEnd = queue;
 	p = line; while(qEnd < queue+10000 && (*qEnd++ = *p++) != '\n') {}
-	if(DoCommand()) continue;
+	Sync(WAKEUP);
       }
-
-	LaunchSearch(); // start a search if we need one
     }
 }
 
@@ -556,6 +527,7 @@ DoCommand ()
     int i;
 
     p=line; while(qStart < qEnd && (*p++ = *qStart++) != '\n') {} *p = 0;
+    if(line[0] == '\n') return 0;
     sscanf(line, "%s", command);
 
 	if(!strcmp(command, "new")) {
@@ -566,11 +538,18 @@ DoCommand ()
 	    // 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
+	    HandleEngineOutput(); // wait for readyok
 	    EPRINT((f, "# u%cinewgame\n", sc)) fflush(toE);
 	}
+	else if(!strcmp(command, "option")) {
+	    char *p;
+	    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, "level")) {
 	    int sec = 0;
 	    sscanf(line, "level %d %d:%d %d", &mps, &tc, &sec, &inc) == 4 ||
@@ -584,7 +563,7 @@ DoCommand ()
 	    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
+	    HandleEngineOutput(); // wait for uciok
 	}
 	else if(!strcmp(command, "setboard")) {
 		stm = (strstr(line+9, " b ") ? BLACK : WHITE);
@@ -601,7 +580,7 @@ DoCommand ()
 	else if(!strcmp(command, "variant")) {
 		if(varOpt) {
 		    EPRINT((f, "# setoption name UCI_Variant value %sucinewgame\nisready\n", line+8))
-		    fflush(toE); Sync(PAUSE);
+		    fflush(toE); HandleEngineOutput(); // wait for readyok
 		}
 		if(!strcmp(line+8, "shogi\n")) size = 9, strcpy(iniPos, "position startpos");
 		if(!strcmp(line+8, "5x5+5_shogi\n")) size = 5, strcpy(iniPos, "position startpos");
@@ -609,24 +588,18 @@ DoCommand ()
 		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(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);
-	    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)) 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(searching == 1);
+	else if(!strcmp(command, "exit"))   computer = NONE, Analyze("false");
+	else if(!strcmp(command, "force"))  computer = NONE;
 	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);
@@ -649,6 +622,18 @@ DoCommand ()
     return 0;
 }
 
+void *
+Engine2GUI()
+{
+    if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
+    while(1) {
+	if(searching > 1) HandleEngineOutput();  // this could leave us (or fall through) pondering
+	while(qStart == qEnd && searching) HandleEngineOutput(); // relay ponder output until command arrives
+	Sync(PAUSE); // possibly wait for command silently if engine is idle
+	if(!DoCommand()) LaunchSearch();
+    }
+}
+
 int
 StartEngine(char *cmdLine, char *dir)
 {