version 1.4w10UCIb17

[polyglot.git] / engine.cpp

diff --git a/engine.cpp b/engine.cpp
index 921683c..a898049 100644 (file)
--- a/engine.cpp
+++ b/engine.cpp
@@ -160,11 +160,24 @@ void engine_open(engine_t * engine) {
       engine->io->out_fd = to_engine[1];\r
       engine->io->name = "Engine";\r
       engine->pid=pid;\r
+      engine->state|=ENGINE_ACTIVE; // can we test if this really true?\r
 \r
       io_init(engine->io);\r
    }\r
 }\r
 \r
+// engine_active\r
+\r
+bool engine_active(engine_t *engine){\r
+    return (engine->state & ENGINE_ACTIVE)!=0;\r
+}\r
+\r
+// engine_eof\r
+\r
+bool engine_eof(engine_t *engine){\r
+    return (engine->state & ENGINE_EOF)!=0;\r
+}\r
+\r
 // engine_set_nice_value()\r
 \r
 void engine_set_nice_value(engine_t * engine, int value){\r
@@ -178,7 +191,13 @@ void engine_close(engine_t * engine) {
 \r
    ASSERT(engine_is_ok(engine));\r
 \r
+   char string[StringSize];\r
    io_close(engine->io);\r
+       // TODO: timeout\r
+   while (!engine_eof(engine)) {\r
+       engine_get(engine,string,StringSize); \r
+   }\r
+\r
 }\r
 \r
 // engine_get()\r
@@ -194,8 +213,7 @@ void engine_get(engine_t * engine, char string[], int size) {
    }\r
 \r
    if (!io_get_line(engine->io,string,size)) { // EOF\r
-       my_log("POLYGLOT *** EOF from Engine ***\n");\r
-      exit(EXIT_SUCCESS);\r
+       engine->state|=ENGINE_EOF;\r
    }\r
 }\r
 \r
@@ -335,45 +353,69 @@ void engine_send(engine_t * engine, const char *szFormat, ...) {
 }\r
 \r
 void engine_close(engine_t * engine){\r
+    char string[StringSize];\r
     (engine->pipeEngine).Close();\r
+        // TODO: Timeout\r
+    while (!engine_eof(Engine)) {\r
+            engine_get(Engine,string,StringSize); \r
+        }\r
+    (engine->pipeEngine).Kill();\r
 }\r
 \r
 \r
 void engine_open(engine_t * engine){\r
    int affinity;\r
     char *my_dir;\r
+    engine->state=0;\r
     if( (my_dir = _getcwd( NULL, 0 )) == NULL )\r
         my_fatal("Can't build path: %s\n",strerror(errno));\r
     SetCurrentDirectory(option_get_string("EngineDir"));\r
     (engine->pipeEngine).Open(option_get_string("EngineCommand"));\r
-        //play with affinity (bad idea) \r
-    affinity=option_get_int("Affinity");\r
-    if(affinity!=-1) set_affinity(engine,affinity); //AAA\r
-        //lets go back\r
-    SetCurrentDirectory(my_dir);\r
-        // set a low priority\r
-    if (option_get_bool("UseNice")){\r
-          my_log("POLYGLOT Adjust Engine Piority\n");\r
-          engine_set_nice_value(engine, option_get_int("NiceValue"));\r
+    if((engine->pipeEngine).Active()){\r
+        engine->state|=ENGINE_ACTIVE;\r
+            //play with affinity (bad idea)\r
+        affinity=option_get_int("Affinity");\r
+        if(affinity!=-1) set_affinity(engine,affinity); //AAA\r
+            //lets go back\r
+        SetCurrentDirectory(my_dir);\r
+            // set a low priority\r
+        if (option_get_bool("UseNice")){\r
+            my_log("POLYGLOT Adjust Engine Piority\n");\r
+            engine_set_nice_value(engine, option_get_int("NiceValue"));\r
+        }\r
     }\r
     \r
 }\r
 \r
+bool engine_active(engine_t *engine){\r
+    return (engine->state & ENGINE_ACTIVE)!=0;\r
+}\r
+\r
+bool engine_eof(engine_t *engine){\r
+    return (engine->state & ENGINE_EOF)!=0;\r
+}\r
+\r
 bool engine_get_non_blocking(engine_t * engine, char *szLineStr, int size){\r
+    if(engine_eof(engine)){ return false;}\r
        if ((engine->pipeEngine).LineInput(szLineStr)) {\r
         my_log("Engine->Adapter: %s\n",szLineStr);\r
         return true;\r
     } else {\r
         szLineStr[0]='\0';\r
+        if(engine->pipeEngine.EOF_()){\r
+            my_log("POLYGLOT EOF received from engine\n");\r
+            engine->state|=ENGINE_EOF;\r
+        }\r
         return false;\r
     }\r
 }\r
 \r
 void engine_get(engine_t * engine, char *szLineStr, int size){\r
     bool data_available;\r
+    if(engine_eof(engine))return;\r
     while(true){\r
         data_available=engine_get_non_blocking(engine,szLineStr,size);\r
-        if(!data_available){\r
+        if(!data_available && !engine_eof(engine)){\r
             Idle();\r
         }else{\r
             break;\r