X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=8de43f57b2ec25284804c2ba9b211dcf02758a17;hp=ae6cf2c147d0a8176910a5d56eafe768e55d3441;hb=a7d1a64029687fd9ae404f0d7490e3bac8c69fb7;hpb=ed12bdda15cb49c351d1358a8d056a1f97c59f85

diff --git a/UCI2WB.c b/UCI2WB.c
index ae6cf2c..8de43f5 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -411,13 +411,6 @@ HandleEngineOutput()
     }
 }
 
-void *
-Engine2GUI()
-{
-    if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
-    HandleEngineOutput();
-}
-
 void
 Move4Engine(char *m)
 {
@@ -441,12 +434,9 @@ char mySide;
 char queue[10000], *qStart, *qEnd;
 
 void
-GUI2Engine()
+LaunchSearch()
 {
-    char line[256], command[256], *p;
-
-    while(1) {
-	int i, difficult, think=0;
+    int i;
 
 	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
 	    DPRINT("# start search\n");
@@ -460,14 +450,23 @@ GUI2Engine()
 		    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 = think = 2, StartSearch(""); // request suspending of input processing while thinking
+	    } 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);
-      nomove:
+}
+
+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);
 	if(!ReadLine(stdin, line)) 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(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;
@@ -499,7 +498,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
 	}
@@ -516,26 +515,30 @@ GUI2Engine()
 		    char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
 		    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")) {
+	    searching = 0;
 	    if(suspended == 2) StartPonder(moveNr); // 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'
+	    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()) goto nomove;
+	if(DoCommand()) continue;
+      }
+
+	LaunchSearch(); // start a search if we need one
     }
 }
 
@@ -639,6 +642,13 @@ DoCommand ()
     return 0;
 }
 
+void *
+Engine2GUI()
+{
+    if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
+    HandleEngineOutput();
+}
+
 int
 StartEngine(char *cmdLine, char *dir)
 {