X-Git-Url: http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=7251f5df0aeba7130e4a87d73ce00a02d84c7a9e;hp=ae6cf2c147d0a8176910a5d56eafe768e55d3441;hb=HEAD;hpb=ed12bdda15cb49c351d1358a8d056a1f97c59f85

diff --git a/UCI2WB.c b/UCI2WB.c
index ae6cf2c..5cb07e8 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -9,7 +9,7 @@
 /* of which you should have received a copy together with this file.        */
 /****************************************************************************/
 
-#define VERSION "3.0"
+#define VERSION "4.1"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,21 +18,29 @@
 #  include <io.h>
    HANDLE process;
    DWORD thread_id;
+   void Bury(int s) { if(WaitForSingleObject(process, 1000*s+50) != WAIT_OBJECT_0) TerminateProcess(process, 0); }
 #else
 #  include <pthread.h>
 #  include <signal.h>
+#  include <unistd.h>
 #  define NO_ERROR 0
 #  include <sys/time.h>
+#  include <sys/wait.h>
    int GetTickCount() // with thanks to Tord
    { struct timeval t; gettimeofday(&t, NULL); return t.tv_sec*1000 + t.tv_usec/1000; }
+//#  include <unistd.h>
+   int Sleep(int msec) { return usleep(1000*msec); }
+   int pid; void Bury(int msec) { Sleep(msec+50); if(waitpid(-1, NULL, WNOHANG) <= 0) kill(pid, SIGKILL); }
 #endif
 #include <fcntl.h>
 #include <string.h>
+#include <ctype.h>
 
 // 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,bitbases path,"
+#define XQPOS "position fen rnbakabnr/9/1c5c1/p1p1p1p1p/9/9/P1P1P1P1P/1C5C1/9/RNBAKABNR"
 
 #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,17 +50,15 @@
 #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=' ', sc2, 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";
+int statDepth, statScore, statNodes, statTime, currNr, hsize=9, size=9, 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], 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;
+int unit = 1, drawOffer, scores[99], mpvSP, maxDepth, ponderAlways, newCnt, priority, killDelay;
 
 FILE *toE, *fromE, *fromF;
-int pid;
 
 char *strcasestr (char *p, char *q) { while(*p) { char *r=p++, *s=q; while(tolower(*r++) == tolower(*s) && *s) s++; if(!*s) return p-1; } return NULL; }
 
@@ -86,12 +92,13 @@ Sync (int action)
 	    case PAUSE:  ReadFile(hRd, &c, 1, &d, NULL);
 	}
 #else
-	static int syncPipe[2];	char c;
+	static int syncPipe[2], res;	char c;
 	switch(action) {
-	    case INIT:   pipe(syncPipe); break;
-	    case WAKEUP: write(syncPipe[1], "\n", 1); break;
-	    case PAUSE:  read(syncPipe[0], &c, 1);
+	    case INIT:   res = pipe(syncPipe); break;
+	    case WAKEUP: res = write(syncPipe[1], "\n", 1); break;
+	    case PAUSE:  res = read(syncPipe[0], &c, 1);
 	}
+	if(res < 0) printf("tellusererror UCI2WB: bad sync pipe\n"), exit(0);
 #endif
 }
 
@@ -132,7 +139,7 @@ int
 Play(int nr)
 {
 	int i, last = -1;
-	FromFEN(iniPos + 4); // in XQ iniPos always has just "fen " prefix
+	FromFEN(iniPos + 13); // FEN part
 	for(i=0; i<nr; i++) {
 	    int from=Sqr(move[i], 0), to=Sqr(move[i], 2);
 	    if(board[to] || (board[from]|32)  == 'p' && move[i][1] != move[i][3]) last = i;
@@ -154,19 +161,18 @@ StartSearch(char *ponder)
 	if(sTime > 0) EPRINT((f, " movetime %d", sTime)) else
 	if(mps) EPRINT((f, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2))
 	if(flob || byo >= 0) sprintf(suffix, " byoyomi %d", t); // for engines running purely on byoyomi
-	if(inc && !*suffix) EPRINT((f, " %s %d %s %d", wInc, inc, bInc, inc))
+	if((inc || !mps && !sTime && sc == 'x') && !*suffix) EPRINT((f, " %s %d %s %d", wInc, inc, bInc, inc))
 	if(depth > 0) EPRINT((f, " depth %d", depth))
         if(*suffix) EPRINT((f, suffix, inc))
 	EPRINT((f, "\n")); maxDepth = mpvSP = 0;
 }
 
 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
@@ -176,7 +182,7 @@ LoadPos(int moveNr)
 	if(sc == 'x') { // UCCI: send only reversible moves
 	    lastCapt = Play(moveNr); // find last capture (returns -1 if none!)
 	    Play(++lastCapt);        // reconstruct board after last capture
-	    stm = (!strstr(iniPos+4, " b ") ^ lastCapt & 1 ? 'w' :  'b');
+	    stm = (!strstr(iniPos+13, " b ") ^ lastCapt & 1 ? 'w' :  'b');
 	    sprintf(buf, "position fen %s", ToFEN(stm)); pos = buf; // send it as FEN (with "position" in UCCI!)
 	}
 	EPRINT((f, "# %s moves", pos))
@@ -190,6 +196,7 @@ StartPonder(int moveNr)
 	if(!move[moveNr][0]) return; // no ponder move
 	LoadPos(moveNr+1);
 	searching = 1; lastDepth = 1;
+	DPRINT("# ponder on %s\n", move[moveNr]);
 	StartSearch(" ponder");
 }
 
@@ -199,17 +206,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;
@@ -217,7 +213,7 @@ char *Convert(char *pv)
     if(sc != 's') return pv;
     p = pv; q = buf;
     while(c = *p++) {
-        if(c >= '0' && c <= '9' || c >= 'a' && c <= 'z') *q++ = 'a'+'0'+size - c; else *q++ = c;
+        if(c >= '0' && c <= '9' || c >= 'a' && c <= 'z') *q++ = 'a'+'0' + (c >= 'a' ? size : hsize) - c; else *q++ = c;
     }
     *q++ = 0;
     return buf;
@@ -228,12 +224,12 @@ Move4GUI(char *m)
 {
     if(sc == 's') {
       // convert USI move to WB format
-      m[2] = 'a'+'0'+size - m[2];
+      m[2] = 'a'+'0'+hsize - m[2];
       m[3] = 'a'+'0'+size - m[3];
       if(m[1] == '*') { // drop
 	m[1] = '@';
       } else {
-	m[0] = 'a'+'0'+size - m[0];
+	m[0] = 'a'+'0'+hsize - m[0];
 	m[1] = 'a'+'0'+size - m[1];
 	if((stm == WHITE ? (m[1]>'0'+size-size/3 || m[3]>'0'+size-size/3)
                                 : (m[1] <= '0'+size/3 || m[3] <= '0'+size/3)) && m[4] != '+')
@@ -243,10 +239,10 @@ Move4GUI(char *m)
 }
 
 int
-ReadLine (FILE *f, char *line)
+ReadLine (FILE *f, char *line, int len)
 {
     int x, i = 0;
-    while((x = fgetc(f)) != EOF && (line[i] = x) != '\n') i++; line[++i] = 0;
+    while((x = fgetc(f)) != EOF && (line[i] = x) != '\n') i+=(i<len); line[++i] = 0;
     return (x != EOF);
 }
 
@@ -256,16 +252,16 @@ HandleEngineOutput()
     char line[1024], command[256]; static char egts[999];
 
     while(1) {
-	int i=0, x; char *p, dummy, len;
+	int i=0; char *p, *q, dummy;
 
 	fflush(stdout); fflush(toE);
-	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);
+	if(fromF && !ReadLine(fromF, line, 1022))  fromF = 0, printf("# end fake\n");
+	if(!fromF && !ReadLine(fromE, line, 1022)) 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) { 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,24 +269,24 @@ 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
+	    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;
+	    stm = WHITE+BLACK - stm; searching = 0;
 	    // first start a new ponder search, if pondering is on and we have a move to ponder on
 	    if(p = strstr(line+9, "ponder")) {
 	      sscanf(p+7, "%s", move[moveNr]);
-	      if(computer != NONE && ponder) {
-		DPRINT("# ponder on %s\n", move[moveNr]);
-		StartPonder(moveNr);
-	      }
+	      if(computer != NONE && ponder) StartPonder(moveNr);
 	      p[-1] = '\n'; *p = 0; // strip off ponder move
 	    } else move[moveNr][0] = 0;
-	    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((q = strchr(line+9, ','))) { // multi-leg move
+	      *q++ = 0; Move4GUI(line+9);   // split
+	      printf("move %s,\n", line+9); // send first leg
+            } else q = line + 9;
+	    Move4GUI(q);
+	    printf("move %s\n", q); // send move to GUI
+            if(p) Move4GUI(p+7), printf("Hint: %s\n", p+7);
 	    if(lastScore == 100001 && iniPos[0] != 'f') { printf("%s {mate}\n", stm == BLACK ? "1-0" : "0-1"); computer = NONE; }
+	    fflush(stdout); return;
 	}
 	else if(!strcmp(command, "info")) {
 	    int d=0, s=0, t=(GetTickCount() - startTime)/10, n=1;
@@ -308,17 +304,6 @@ HandleEngineOutput()
 		}
 		continue;
 	    }
-	    if(collect && (pv = strstr(line+5, "currmove "))) {
-		if(p = strstr(line+5, "currmovenumber ")) {
-		    n = atoi(p+15);
-		    if(collect == 1 && n != 1) continue; // wait for move 1
-		    if(collect + (n == 1) > 2) { // done collecting
-			if(inex && collect == 2) printf("%d 0 0 0 OK to exclude\n", lastDepth);
-			collect = 3; continue;
-		    }
-		    collect = 2; on[nr=n] = 1; sscanf(pv+9, "%s", moveMap[n]); continue; // store move
-		}
-	    }
 	    if(!post) continue;
 	    if(sscanf(line+5, "string %c", &dummy) == 1) printf("%d 0 0 0 %s", lastDepth, line+12); else {
 		if(p = strstr(line+4, " depth "))      sscanf(p+7, "%d", &d), statDepth = d;
@@ -327,8 +312,6 @@ HandleEngineOutput()
 		if(p = strstr(line+4, " score "))      sscanf(p+7, "%d", &s), statScore = s;
 		if(p = strstr(line+4, " nodes "))      sscanf(p+7, "%d", &n), statNodes = n;
 		if(p = strstr(line+4, " time "))       sscanf(p+6, "%d", &t), t /= 10, statTime = t;
-		if(p = strstr(line+4, " currmove "))   sscanf(p+10,"%s", currMove);
-		if(p = strstr(line+4, " currmovenumber ")) sscanf(p+16,"%d", &currNr);
 		if(pv = strstr(line+4, " pv ")) { // convert PV info to WB thinking output
 		  if(d > maxDepth) maxDepth = d, mpvSP = 0; else if(d < maxDepth) continue; // ignore depth regressions
 		  if(p = strstr(line+4, " upperbound ")) strcat(p, "?\n"); else
@@ -338,6 +321,18 @@ HandleEngineOutput()
 		    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)
 	    }
+	    if(collect && (pv = strstr(line+4, " currmove "))) {
+		sscanf(pv+10,"%s", currMove);
+		if(p = strstr(line+4, " currmovenumber ")) {
+		    n = currNr = atoi(p+16);
+		    if(collect == 1 && n != 1) continue; // wait for move 1
+		    if(collect + (n == 1) > 2) { // done collecting
+			if(inex && collect == 2) printf("%d 0 0 0 OK to exclude\n", lastDepth);
+			collect = 3; continue;
+		    }
+		    collect = 2; on[nr=n] = 1; strcpy(moveMap[n], currMove); continue; // store move
+		}
+	    }
 	}
 	else if(!strcmp(command, "option")) { // USI option: extract data fields
 	    char name[80], type[80], buf[1024], val[256], *q;
@@ -357,7 +352,7 @@ HandleEngineOutput()
 	    if(!strcasecmp(name, "Threads")) { strcpy(threadOpt, name); continue; }
 	    if(!strcasecmp(name, "Ponder") || !strcasecmp(name, "USI_Ponder")) { strcpy(canPonder, name); continue; }
 	    if(!strcasecmp(name, "Hash") || !strcasecmp(name, "USI_Hash") || !strcasecmp(name, "hashsize")) {
-		memory = oldMem = atoi(val); hasHash = 1; 
+		memory = oldMem = atoi(val); hasHash = max; 
 		strcpy(hashOpt, name);
 		continue;
 	    }
@@ -386,6 +381,7 @@ HandleEngineOutput()
 		    sprintf(buf + strlen(buf), "%s%s%s", min++ ? " /// " : " ", strcmp(type, val) ? "" : "*", val);
 		}
 		strcat(q, "\"\n");
+
 	    }
 	    else buf[0] = 0; // ignore unrecognized option types
 	    if(buf[0]) printf("%s", buf);
@@ -395,29 +391,24 @@ 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;
+	    char *p = varList, *q = p;
 	    while(*q && *q != '\n')  if(!strncmp(q, " var ", 5)) *p++ = ',', q +=5; // replace var keywords by commas
 				else if(!strncmp(q-1, " chess ", 7)) strcpy(p, "normal"), p += 6, q += 5; // 'chess' is called 'normal' in CECP
 				else *p++ = *q++; // copy other variant names unmodified
+	    *p = 0;
 	    if(frc) sprintf(p, ",normal,fischerandom"), printf("feature oocastle=%d\n", frc<0); // unannounced FRC uses O-O castling
-	    if(*varList) printf("feature variants=\"%s\"\n", varList+1); // from UCI_Variant combo and/or UCI_Chess960 check options
+	    if(!*varList) strcpy(varList, sc=='s' ? ",shogi,5x5+5_shogi" : VARIANTS); // without clue guess liberally
+	    printf("feature variants=\"%s\"\n", varList+1); // from UCI_Variant combo and/or UCI_Chess960 check options
 	    if(*egts) printf("feature egt=\"%s\"\n", egts+1);
-	    printf("feature smp=1 memory=%d done=1\n", hasHash);
+	    printf("feature smp=1 memory=%d done=1\n", hasHash > 0);
 	    if(unit == 2) { unit = 1; EPRINT((f, "# setoption usemillisec true\n")) }
-	    Sync(WAKEUP); // done with options
+	    fflush(stdout); return; // done with options
 	}
     }
 }
 
-void *
-Engine2GUI()
-{
-    if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
-    HandleEngineOutput();
-}
-
 void
 Move4Engine(char *m)
 {
@@ -426,29 +417,28 @@ Move4Engine(char *m)
       if(m[1] == '@') { // drop
 	m[1] = '*';
       } else {
-	m[0] = 'a'+'0'+size - m[0];
+	m[0] = 'a'+'0'+hsize - m[0];
 	m[1] = 'a'+'0'+size - m[1];
       }
-      m[2] = 'a'+'0'+size - m[2];
+      m[2] = 'a'+'0'+hsize - m[2];
       m[3] = 'a'+'0'+size - m[3];
       if(m[4] == '=') m[4] = 0; // no '=' in USI format!
       else if(m[4]) m[4] = '+'; // cater to WB 4.4 bug :-(
     }
 }
 
-int DoCommand ();
+void DoCommand ();
 char mySide;
-char queue[10000], *qStart, *qEnd;
+volatile char queue[10000], *qStart, *qEnd;
 
 void
-GUI2Engine()
+LaunchSearch()
 {
-    char line[256], command[256], *p;
+    int i;
 
-    while(1) {
-	int i, difficult, think=0;
+    if(suspended || searching) return;
 
-	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
+	if(computer == stm || computer == ANALYZE && sm != 1) {
 	    DPRINT("# start search\n");
 	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
@@ -460,25 +450,45 @@ 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 searching = 3, StartSearch(""); // request suspending of input processing while thinking
 	} else if(ponderAlways && computer == NONE) move[moveNr][0] = 0, StartPonder(moveNr-1);
-      nomove:
+	else if(BLACK+WHITE-stm == computer && ponder && moveNr) StartPonder(moveNr);
+}
+
+void
+GUI2Engine()
+{
+    char line[256], command[256], *p;
+
+    while(1) {
+	int 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(!ReadLine(stdin, line, 254)) printf("# EOF\n"), sprintf(line, "quit -1\n");
+	if(!sscanf(line, "%s", command)) return;
 	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, "draw"))   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 %d %s\n", statTime, statNodes, statDepth, nr-currNr, nr, 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 if(!strcmp(command, "xboard")) ;
+	else if(!strcmp(command, "random")) ;
+	else if(!strcmp(command, "accepted")) ;
+	else if(!strcmp(command, "rejected")) ;
+	else if(!strcmp(command, "book")) ;
+	else if(!strcmp(command, "ics")) ;
+	else if(!strcmp(command, "hint")) ;
+	else if(!strcmp(command, "computer")) comp = 1;
 	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;
@@ -487,19 +497,11 @@ GUI2Engine()
 	    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, "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(!think && Release()) break; // break will restart analysis; pondering is restarted by Release itself
+	    difficult = 1;
 	  }
 	  else difficult = 1; // difficult command; terminate loop for easy ones
 	}
@@ -509,76 +511,94 @@ GUI2Engine()
 	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;
+	    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 == 1 && !strcmp(command, move[moveNr])) { // ponder hit
-		    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;
-		}
-		StopPonder(1); searching = 0;
+	    if(searching == 1 && !strcmp(command, move[moveNr])) { // ponder hit
+	    	char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
+		stm = WHITE+BLACK - stm;         // for acceptance of ponder move (can be safely done out of sync)
+		searching = 3; moveNr++; startTime = GetTickCount(); // clock starts running now
+		EPRINT((f, "# ponderhit%s\n", draw)) fflush(toE); fflush(stdout);
+	    } else {
+		if(searching) StopSearch(1);     // ponder miss or analysis, as moves won't arrive during thinking
+		p = command; *qEnd++ = 'e'; *qEnd++ = ' '; while(qEnd < queue+10000 && (*qEnd++ = *p++)) {} *qEnd++ = '\n';
+		Sync(WAKEUP);                    // queue move for adding it to game (and toggle stm)
 	    }
-	    strcpy(move[moveNr++], command); // possibly overwrites ponder move
-	    continue;
-	}
+	} else
 	if(!strcmp(command, "resume")) {
 	    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;  *qEnd++ = '\n'; Sync(WAKEUP); // causes search to start in normal way if on move or analyzing
+	} else
+      {
+	DPRINT("# queue '%s', searching=%d\n", command, searching);
+	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()) goto nomove;
+	Sync(WAKEUP);
+	// when 'stop' doesn't catch engine's attention in reasonable time, so the GUI might kill us:
+	if(!strcmp(command, "quit")) { Bury(killDelay); exit(0); } // kill the engine and exit
+      }
     }
 }
 
-int
+void
+IsReady ()
+{
+    EPRINT((f, "# isready\n")) fflush(toE);
+    HandleEngineOutput(); // wait for readyok
+}
+
+void
 DoCommand ()
 {
-    char line[1024], command[256], *p, *q, *r, type[99];
+    char line[1024], command[256], *p, *q, *r, type[99], c;
     int i;
 
     p=line; while(qStart < qEnd && (*p++ = *qStart++) != '\n') {} *p = 0;
-    sscanf(line, "%s", command);
+    sscanf(line, "%s %s", command, type); DPRINT("# command %s\n", command), fflush(stdout);
 
 	if(!strcmp(command, "new")) {
 	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
 	    stm = WHITE; strcpy(iniPos, "position startpos"); frc &= ~1;
+	    if(newCnt++) return; // prevent a 2nd 'isready' due to reuse=0-violating 'new' preceding 'quit'
 	    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(varOpt && strstr(varList, ",normal")) EPRINT((f, "# setoption name UCI_Variant value chess\n"))
+	    IsReady();
 	    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);
+		{ EPRINT((f, "# u%cinewgame\n", sc)) fflush(toE); if(sc != 's') IsReady(); } // avoid isready in USI
+	}
+        else if(!strcmp(command, "e")) { strcpy(move[moveNr++], type); stm ^= WHITE|BLACK; return; }
+	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 ||
-	    sscanf(line, "level %d %d %d", &mps, &tc, &inc);
+	    if(sscanf(line, "level %d %d:%d %d", &mps, &tc, &sec, &inc) != 4)
+		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, "protover")) {
-	    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
+	    HandleEngineOutput(); // wait for uciok
 	}
 	else if(!strcmp(command, "setboard")) {
 		stm = (strstr(line+9, " b ") ? BLACK : WHITE);
-                if((p = strchr(line+9, '[')) && !varOpt) { char c;
+                if((p = strchr(line+9, '[')) && !varOpt) {
                     *p++ = 0; q = strchr(p, ']'); *q = 0; r = q + 4; 
 		    if(sc == 's') q[2] = 'w' + 'b' - q[2], strcpy(r=q+3, " 1\n"); // Shogi: reverse color
 		    else r = strchr(strchr(q+4, ' ') + 1, ' '); // skip to second space (after e.p. square)
@@ -591,35 +611,27 @@ 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");
-		if(!strcmp(line+8, "xiangqi\n")) strcpy(iniPos, "fen rnbakabnr/9/1c5c1/p1p1p1p1p/9/9/P1P1P1P1P/1C5C1/9/RNBAKABNR r");
+		c = 0; if(sscanf(line+8, "%dx%d+%d_shogi%c", &hsize, &size, &i, &c) && c == '\n') strcpy(iniPos, "position startpos");
+		if(!strcmp(line+8, "shogi\n")) hsize = size = 9, strcpy(iniPos, "position startpos");
+		if(!strcmp(line+8, "xiangqi\n")) sprintf(iniPos, "%s %c", XQPOS+9*(sc2 == 'c'), sc2 == 'c' ? 'r' : 'w'); // with -c use Cyclone dialect
 		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);
+	else if(!strcmp(command, "memory")) { sscanf(line, "memory %d", &memory); if(memory > hasHash) memory = hasHash; }
 	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);
@@ -629,14 +641,26 @@ DoCommand ()
 	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, "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)); }
+	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE); }
+	else printf("Error (unknown command): %s\n", command);
 
-    return 0;
+	fflush(stdout);
+}
+
+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
+	DoCommand(); LaunchSearch();
+    }
 }
 
 int
@@ -683,9 +707,9 @@ StartEngine(char *cmdLine, char *dir)
 
   if (! fSuccess) return GetLastError();
 
-//  if (0) { // in the future we could trigger this by an argument
-//    SetPriorityClass(piProcInfo.hProcess, GetWin32Priority(appData.niceEngines));
-//  }
+  if (priority > 0) { // for now only implement all lowered priorityies the same way
+    SetPriorityClass(piProcInfo.hProcess, BELOW_NORMAL_PRIORITY_CLASS);
+  }
 
   /* Close the handles we don't need in the parent */
   CloseHandle(piProcInfo.hThread);
@@ -693,7 +717,6 @@ StartEngine(char *cmdLine, char *dir)
   CloseHandle(hChildStdoutWr);
 
   process = piProcInfo.hProcess;
-  pid = piProcInfo.dwProcessId;
   fromE = (FILE*) _fdopen( _open_osfhandle((long)hChildStdoutRd, _O_TEXT|_O_RDONLY), "r");
   toE   = (FILE*) _fdopen( _open_osfhandle((long)hChildStdinWr, _O_WRONLY), "w");
 #else
@@ -701,7 +724,8 @@ StartEngine(char *cmdLine, char *dir)
     int i, toEngine[2], fromEngine[2];
 
     if (dir && dir[0] && chdir(dir)) { perror(dir); exit(1); }
-    pipe(toEngine); pipe(fromEngine); // create two pipes
+    i = pipe(toEngine) + pipe(fromEngine); // create two pipes
+    if(i < 0) printf("tellusererror UCI2WB: no engine pipe\n"), exit(0);
 
     if ((pid = fork()) == 0) { // Child
 	dup2(toEngine[0], 0);   close(toEngine[0]);   close(toEngine[1]);   // stdin from toE pipe
@@ -711,6 +735,7 @@ StartEngine(char *cmdLine, char *dir)
 	strcpy(buf, cmdLine); p = buf;
 	for (i=0;;) { argv[i++] = p; p = strchr(p, ' '); if (p == NULL) break; *p++ = 0; }
 	argv[i] = NULL;
+        if(priority) i = nice(priority);
         execvp(argv[0], argv); // startup engine
 	
 	perror(argv[0]); exit(1); // could not start engine; quit.
@@ -724,22 +749,25 @@ StartEngine(char *cmdLine, char *dir)
   return NO_ERROR;
 }
 
+int
 main(int argc, char **argv)
 {
-	char *dir = NULL, *p, *q; int e;
+	char *dir = NULL;
 
 
 	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")) { strcpy(varList+1, argv[2]); *varList = ','; argc-=2; argv+=2; }
+	if(argc > 2 && !strcmp(argv[1], "-nice")) { sscanf(argv[2], "%d", &priority); argc-=2; argv+=2; }
+	if(argc > 2 && !strcmp(argv[1], "-kill")) { sscanf(argv[2], "%d", &killDelay); 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) { printf("usage is: %s [debug] [-s|-x|-c|-f] <engine.exe> [<engine directory>]\n", argv[0]); exit(-1); }
 	if(argc > 2) dir = argv[2];
         if(argc > 3) strncpy(suffix, argv[3], 80);
 
         if(sc == 'x') nameWord = valueWord = bTime = "", wTime = "opp", bInc = "increment", wInc = "oppincrement", unit = 1000; // switch to UCCI keywords
 	else if(sc == 'f' ) frc = -1, sc = 'c';   // UCI for unannounced Chess960
-	else if(sc == 'n') sc = 'c'; // UCI for normal Chess
+	else if(sc != 's') sc2 = sc, sc = 'c';    // UCI for normal Chess
 
 	// spawn engine proc
 	if(StartEngine(binary = argv[1], dir) != NO_ERROR) { perror(argv[1]), exit(-1); }
@@ -755,4 +783,5 @@ main(int argc, char **argv)
 
 	// handle GUI->engine traffic in original thread
 	GUI2Engine();
+	return 0;
 }