version 1.4.58b

[polyglot.git] / engine.c

diff --git a/engine.c b/engine.c
index bf7bd49..af6555a 100644 (file)
--- a/engine.c
+++ b/engine.c
@@ -7,21 +7,15 @@
 #include <string.h>\r
 #include <errno.h>\r
 \r
-\r
 #include "engine.h"\r
 #include "option.h"\r
 #include "pipex.h"\r
 #include "util.h"\r
 \r
-// defines\r
-\r
-#define StringSize 4096\r
-\r
 // variables\r
 \r
-static int write_index = 0;\r
-static char write_buffer[StringSize];\r
 engine_t Engine[1];\r
+#define StringSize ((int)4096)\r
 \r
 // functions\r
 \r
@@ -40,68 +34,61 @@ void engine_set_nice_value(engine_t *engine, int value){
 // engine_send_queue()\r
 \r
 void engine_send_queue(engine_t * engine, const char *format, ...) {\r
-    va_list arg_list;\r
-    if(write_index>=StringSize){\r
-        my_fatal("engine_send_queue(): write_buffer overflow\n");\r
-    }\r
-    va_start(arg_list,format);\r
-    write_index += vsnprintf(write_buffer + write_index,\r
-                             StringSize-write_index,\r
-                             format,\r
-                             arg_list);\r
-    va_end(arg_list);\r
+    char buf[FormatBufferSize];\r
+    CONSTRUCT_ARG_STRING(format,buf);\r
+    pipex_write(engine->pipex,buf);\r
 }\r
 \r
 // engine_send()\r
 \r
 void engine_send(engine_t * engine, const char *format, ...) {\r
-    va_list arg_list;\r
-    if(write_index>=StringSize){\r
-        my_fatal("engine_send(): write_buffer overflow\n");\r
-    }\r
-    va_start(arg_list,format);\r
-    vsnprintf(write_buffer + write_index,\r
-              StringSize-write_index,\r
-              format,\r
-              arg_list);\r
-    va_end(arg_list);\r
-    pipex_writeln(engine->pipex,write_buffer);\r
-    write_index = 0;\r
+    char buf[FormatBufferSize];\r
+    CONSTRUCT_ARG_STRING(format,buf);\r
+    pipex_writeln(engine->pipex,buf);\r
 }\r
 \r
 // engine_close()\r
 \r
 void engine_close(engine_t * engine){\r
     char string[StringSize];\r
+    int elapsed_time;\r
+    int ret;\r
+    int close_timeout=500;\r
+    my_log("POLYGLOT Closing engine.\n");\r
     pipex_send_eof(engine->pipex);\r
         // TODO: Timeout\r
-    while (!engine_eof(engine)) { \r
-      engine_get(Engine,string);\r
+\r
+    elapsed_time=0;\r
+    while (!engine_eof(engine) && (elapsed_time<close_timeout)) { \r
+      ret=engine_get_non_blocking(engine,string);\r
+      if(!ret  && !engine_eof(engine)){\r
+       my_log("POLYGLOT Engine does not reply. Sleeping %dms.\n", WAIT_GRANULARITY);\r
+       my_sleep(WAIT_GRANULARITY);\r
+       elapsed_time+=WAIT_GRANULARITY;\r
+      }\r
     }\r
-    pipex_exit(engine->pipex);\r
+    if(elapsed_time>=close_timeout){\r
+      my_log("POLYGLOT Waited more than %dms. Moving on.\n",close_timeout); \r
+    }\r
+    pipex_exit(engine->pipex,200);\r
 }\r
 \r
 // engine_open()\r
 \r
 void engine_open(engine_t * engine){\r
     int affinity;\r
-    char *my_dir;\r
-    if( (my_dir = my_getcwd( NULL, 0 )) == NULL )\r
-        my_fatal("engine_open(): no current directory: %s\n",strerror(errno));\r
-    if(my_chdir(option_get_string("EngineDir"))){\r
-        my_fatal("engine_open(): cannot change directory: %s\n",strerror(errno));\r
-    }\r
-    pipex_open(engine->pipex,"Engine",option_get_string("EngineCommand"));\r
+    pipex_open(engine->pipex,\r
+               "Engine",\r
+               option_get_string(Option,"EngineDir"),\r
+               option_get_string(Option,"EngineCommand"));\r
     if(pipex_active(engine->pipex)){\r
             //play with affinity (bad idea)\r
-        affinity=option_get_int("Affinity");\r
+        affinity=option_get_int(Option,"Affinity");\r
         if(affinity!=-1) set_affinity(engine,affinity); //AAA\r
-            //lets go back\r
-        my_chdir(my_dir);\r
             // set a low priority\r
-        if (option_get_bool("UseNice")){\r
+        if (option_get_bool(Option,"UseNice")){\r
             my_log("POLYGLOT Adjust Engine Piority\n");\r
-            engine_set_nice_value(engine, option_get_int("NiceValue"));\r
+            engine_set_nice_value(engine, option_get_int(Option,"NiceValue"));\r
         }\r
     }\r
     \r