#include "util.h"\r
#include "xboard2uci.h"\r
#include "uci2uci.h"\r
+#include "ini.h"\r
\r
// constants\r
\r
\r
-static const char * const Version = "1.4.38b";\r
+static const char * const Version = "1.4.39b";\r
static const char * const HelpMessage = "\\r
SYNTAX\n\\r
-* polyglot [configfile]\n\\r
-* polyglot -ec enginecommand\n\\r
+* polyglot [configfile] [-noini] [-ec engine] [-ed enginedirectory] [-en enginename] [-log] [-lf logfile] [-hash value] [-bk book] [-pg <name>=<value>]* [-uci <name>=<value>]*\n\\r
* polyglot make-book [-pgn inputfile] [-bin outputfile] [-max-ply ply] [-min-game games] [-min-score score] [-only-white] [-only-black] [-uniform]\n\\r
* polyglot merge-book -in1 inputfile1 -in2 inputfile2 [-out outputfile]\n\\r
* polyglot info-book [-bin inputfile] [-exact]\n\\r
* polyglot dump-book [-bin inputfile] -color color [-out outputfile]\n\\r
-* polyglot [configfile] epd-test [-epd inputfile] [-min-depth depth] [-max-depth depth] [-min-time time] [-max-time time] [-depth-delta delta]\n\\r
+* polyglot [configfile] epd-test [engineoptions] [-epd inputfile] [-min-depth depth] [-max-depth depth] [-min-time time] [-max-time time] [-depth-delta delta]\n\\r
* polyglot perft [-fen fen] [-max-depth depth]\\r
";\r
\r
\r
// prototypes\r
\r
-static void parse_option ();\r
static void init_book ();\r
-static bool parse_line (char line[], char * * name_ptr, char * * value_ptr);\r
static void stop_search ();\r
\r
// functions\r
\r
+// arg_shift_left()\r
+\r
+void arg_shift_left(char **argv, int index){\r
+ int i;\r
+ for(i=index; argv[i]!=NULL; i++){\r
+ argv[i]=argv[i+1];\r
+ }\r
+}\r
+\r
+\r
+void write_ini(const char *filename,\r
+ option_list_t *pg_options,\r
+ option_list_t *uci_options){\r
+ option_t *opt;\r
+ char tmp[StringSize];\r
+ FILE *f;\r
+ f=fopen(filename,"w");\r
+ if(!f){\r
+ my_fatal("ini_create_pg(): Cannot open %s for writing.\n",filename);\r
+ }\r
+ fprintf(f,"[PolyGlot]\n");\r
+ option_start_iter(pg_options);\r
+ while((opt=option_next(pg_options))){\r
+ if(opt->mode & XBOARD){\r
+ snprintf(tmp,sizeof(tmp),"%s=%s\n",opt->name,opt->value);\r
+ tmp[sizeof(tmp)-1]='\0';\r
+ fprintf(f,"%s",tmp);\r
+ }\r
+ }\r
+ fprintf(f,"[Engine]\n");\r
+ option_start_iter(uci_options);\r
+ while((opt=option_next(uci_options))){\r
+ snprintf(tmp,sizeof(tmp),"%s=%s\n",opt->name,opt->value);\r
+ tmp[sizeof(tmp)-1]='\0';\r
+ fprintf(f,"%s",tmp);\r
+ }\r
+ fclose(f);\r
+}\r
+\r
+\r
// main()\r
\r
int main(int argc, char * argv[]) {\r
-\r
+ ini_t ini[1];\r
+ ini_entry_t *entry;\r
+ char *arg;\r
+ int arg_index;\r
+ bool NoIni;\r
+ \r
if(!DEBUG){\r
printf("PolyGlot %s by Fabien Letouzey.\n",Version);\r
}else{\r
attack_init();\r
\r
hash_init();\r
- \r
+\r
my_random_init();\r
\r
- // build book\r
+ // book utilities\r
\r
if (argc >= 2 && my_string_equal(argv[1],"make-book")) {\r
book_make(argc,argv);\r
return EXIT_SUCCESS;\r
}\r
\r
- if (argc >= 2 && my_string_equal(argv[1],"merge-book")) {\r
- book_merge(argc,argv);\r
- return EXIT_SUCCESS;\r
- }\r
-\r
- if (argc >= 2 && my_string_equal(argv[1],"dump-book")) {\r
- book_dump(argc,argv);\r
- return EXIT_SUCCESS;\r
- }\r
+ if (argc >= 2 && my_string_equal(argv[1],"dump-book")) {\r
+ book_dump(argc,argv);\r
+ return EXIT_SUCCESS;\r
+ }\r
+ \r
+ if (argc >= 2 && my_string_equal(argv[1],"info-book")) {\r
+ book_info(argc,argv);\r
+ return EXIT_SUCCESS;\r
+ }\r
\r
- if (argc >= 2 && my_string_equal(argv[1],"info-book")) {\r
- book_info(argc,argv);\r
- return EXIT_SUCCESS;\r
- }\r
+ // perft\r
\r
if (argc >= 2 && my_string_equal(argv[1],"perft")) {\r
do_perft(argc,argv);\r
return EXIT_SUCCESS;\r
}\r
+\r
+ // what is the config file? This is very hacky right now?\r
+\r
+ // Do we want a config file at all?\r
+\r
+ arg_index=0;\r
+ NoIni=FALSE;\r
+ while((arg=argv[arg_index++])){\r
+ if(my_string_equal(arg,"-noini")){\r
+ NoIni=TRUE;\r
+ break;\r
+ }\r
+ }\r
+ arg_shift_left(argv,arg_index-1);\r
+ if(NoIni){\r
+ option_set(Option,"OptionFile","<empty>");\r
+ }\r
+\r
+ // Ok see if first argument looks like config file\r
+ \r
+ if(argv[1] && !my_string_equal(argv[1],"epd-test") && !(argv[1][0]=='-')){\r
+ // first argument must be config file\r
+ if(!NoIni){\r
+ option_set(Option,"OptionFile",argv[1]);\r
+ }else{\r
+ // ignore\r
+ }\r
+ arg_shift_left(argv,1);\r
+ }else{\r
+ // Config file is the default.\r
+ // This has already been set above or in "option_init_pg"\r
+ }\r
+ \r
+ ini_init(ini);\r
+\r
+ // if we use a config file: load it!\r
\r
- if (argc >= 3 && my_string_equal(argv[1],"-ec")) {\r
- option_set(Option,"EngineCommand",argv[2]);\r
- engine_open(Engine);\r
- if(!engine_active(Engine)){\r
- my_fatal("Could not start \"%s\"\n",\r
- option_get(Option,"EngineCommand"));\r
+ if(!my_string_equal(option_get_string(Option,"OptionFile"),"<empty>")){\r
+ if(ini_parse(ini,option_get_string(Option,"OptionFile"))){\r
+ my_fatal("main(): Can't open file \"%s\": %s\n",\r
+ option_get_string(Option,"OptionFile"),\r
+ strerror(errno));\r
+ }\r
+ }\r
+\r
+ // parse the command line and merge options\r
+\r
+ arg_index=1;\r
+ while((arg=argv[arg_index])){\r
+// int i=1;\r
+// char *arg1;\r
+// printf("arg_index=%d\n",arg_index);\r
+// while((arg1=argv[i++])){\r
+// printf("arg=%s ",arg1);\r
+// }\r
+// printf("\n");\r
+ if(my_string_equal(arg,"-ec") && argv[arg_index+1]){\r
+ ini_insert_ex(ini,"PolyGlot","EngineCommand",argv[arg_index+1]);\r
+ arg_shift_left(argv,arg_index);\r
+ arg_shift_left(argv,arg_index);\r
+ continue;\r
+ }\r
+ if(my_string_equal(arg,"-ed") && argv[arg_index+1]){\r
+ ini_insert_ex(ini,"PolyGlot","EngineDir",argv[arg_index+1]);\r
+ arg_shift_left(argv,arg_index);\r
+ arg_shift_left(argv,arg_index);\r
+ continue;\r
}\r
- Init=TRUE;\r
- gui_init(GUI);\r
- uci_open(Uci,Engine);\r
- if (my_string_equal(option_get_string(Option,"EngineName"),"<empty>")) {\r
- option_set(Option,"EngineName",Uci->name);\r
+ if(my_string_equal(arg,"-en") && argv[arg_index+1]){\r
+ ini_insert_ex(ini,"PolyGlot","EngineName",argv[arg_index+1]);\r
+ arg_shift_left(argv,arg_index);\r
+ arg_shift_left(argv,arg_index);\r
+ continue;\r
}\r
- mainloop();\r
- return EXIT_SUCCESS; \r
+ if(my_string_equal(arg,"-log")){\r
+ ini_insert_ex(ini,"PolyGlot","Log","true");\r
+ arg_shift_left(argv,arg_index);\r
+ continue;\r
+ }\r
+ if(my_string_equal(arg,"-lf") && argv[arg_index+1]){\r
+ ini_insert_ex(ini,"PolyGlot","LogFile",argv[arg_index+1]);\r
+ arg_shift_left(argv,arg_index);\r
+ arg_shift_left(argv,arg_index);\r
+ continue;\r
+ }\r
+ if(my_string_equal(arg,"-hash") && argv[arg_index+1]){\r
+ ini_insert_ex(ini,"Engine","Hash",argv[arg_index+1]);\r
+ arg_shift_left(argv,arg_index);\r
+ arg_shift_left(argv,arg_index);\r
+ continue;\r
+ }\r
+ if(my_string_equal(arg,"-bk") && argv[arg_index+1]){\r
+ ini_insert_ex(ini,"PolyGlot","Book","true");\r
+ ini_insert_ex(ini,"PolyGlot","BookFile",argv[arg_index+1]);\r
+ arg_shift_left(argv,arg_index);\r
+ arg_shift_left(argv,arg_index);\r
+ continue;\r
+ }\r
+ if((my_string_equal(arg,"-pg")||my_string_equal(arg,"-uci")) &&\r
+ argv[arg_index]){\r
+ int ret;\r
+ char section[StringSize];\r
+ char name[StringSize];\r
+ char value[StringSize];\r
+ ret=ini_line_parse(argv[arg_index++],section,name,value);\r
+ if(ret==NAME_VALUE){\r
+ if(my_string_equal(arg,"-pg")){\r
+ ini_insert_ex(ini,"PolyGlot",name,value);\r
+ }else{\r
+ ini_insert_ex(ini,"Engine",name,value);\r
+ }\r
+ }\r
+ arg_shift_left(argv,arg_index);\r
+ arg_shift_left(argv,arg_index);\r
+ continue;\r
+ }\r
+ arg_index++;\r
+ }\r
+\r
+ // extract PG options\r
+ // this sets both the default and the value\r
+ \r
+ option_from_ini(Option,ini,"polyglot");\r
+ \r
+ // start logging if required\r
+ \r
+ if (option_get_bool(Option,"Log")) {\r
+ my_log_open(option_get_string(Option,"LogFile"));\r
}\r
+\r
+ // log welcome stuff\r
+ \r
+ if(!DEBUG){\r
+ my_log("PolyGlot %s by Fabien Letouzey\n",Version);\r
+ }else{\r
+ my_log("PolyGlot %s by Fabien Letouzey (debug build)\n",Version);\r
+ } \r
+ my_log("POLYGLOT *** START ***\n");\r
+ my_log("POLYGLOT INI file \"%s\"\n",option_get_string(Option,"OptionFile"));\r
+\r
+ // start engine\r
+ \r
+ engine_open(Engine);\r
+ if(!engine_active(Engine)){\r
+ my_fatal("Could not start \"%s\"\n",option_get(Option,"EngineCommand"));\r
+ }\r
+\r
+ // switch to UCI mode if necessary\r
+ \r
+ if (option_get_bool(Option,"UCI")) {\r
+ my_log("POLYGLOT *** Switching to UCI mode ***\n");\r
+ }\r
+\r
+ // initialize uci parsing and send uci command. Parse options and wait\r
+ // for uciok\r
\r
- // read options\r
+ uci_open(Uci,Engine);\r
\r
+ // get engine name from engine if not supplied in config file\r
\r
- if (argc == 2) option_set(Option,"OptionFile",argv[1]); // HACK for compatibility\r
+ if (my_string_equal(option_get_string(Option,"EngineName"),"<empty>")) {\r
+ option_set(Option,"EngineName",Uci->name);\r
+ }\r
+\r
+ // if there is a save file: load it!\r
\r
- parse_option(); // HACK: also launches the engine\r
+ if(my_string_equal(option_get_string(Option,"SaveFile"),"<empty>")){\r
+ char tmp[StringSize];\r
+ snprintf(tmp,sizeof(tmp),"%s.ini",\r
+ option_get_string(Option,"EngineName"));\r
+ tmp[sizeof(tmp)-1]='\0';\r
+ option_set(Option,"SaveFile",tmp);\r
+ }\r
+ if(option_get_bool(Option,"SaveSettingsOnExit")){\r
+ my_log("POLYGLOT SaveFile=%s\n",option_get_string(Option,"SaveFile"));\r
+ if(ini_parse(ini,option_get_string(Option,"SaveFile"))){\r
+ my_log("POLYGLOT Unable to open SaveFile\n"); \r
+ }\r
+ }\r
+ // start if it was enabled in the SaveFile\r
+ \r
+ if (option_get_bool(Option,"Log")) {\r
+ my_log_close();\r
+ my_log_open(option_get_string(Option,"LogFile"));\r
+ }\r
+ // remind the user of the options that are now in effect\r
+ \r
+ ini_disp(ini);\r
+\r
+\r
+\r
+ // done initializing\r
+ \r
+ Init = TRUE;\r
+ \r
+ // collect engine options from config file(s) and send to engine\r
+ \r
+ ini_start_iter(ini);\r
+ while((entry=ini_next(ini))){\r
+ if(my_string_case_equal(entry->section,"engine")){\r
+ // also updates value in Uci->option\r
+ uci_send_option(Uci,entry->name,"%s",entry->value);\r
+ // since this comes from the ini file, also update default\r
+ option_set_default(Uci->option,entry->name,entry->value);\r
+ //to get a decent display in winboard_x we need to now if an engine really is doing multipv analysis\r
+ // "multipv 1" in the pv is meaningless,f.i. toga sends that all the time\r
+ //therefore check if MultiPV is set to a decent value in the polyglot ini file\r
+ if(my_string_case_equal(entry->name,"MultiPV") &&\r
+ atoi(entry->value)>1){\r
+ Uci->multipv_mode=TRUE;\r
+ }\r
+ }\r
+ }\r
+ \r
\r
// EPD test\r
\r
- if (argc >= 2 && my_string_equal(argv[1],"epd-test")){\r
- epd_test(argc,argv);\r
- return EXIT_SUCCESS;\r
- }else if(argc >= 3 && my_string_equal(argv[2],"epd-test")){\r
- epd_test(argc-1,argv+1);\r
+ if (argv[1] && my_string_equal(argv[1],"epd-test")){\r
+ argc=0;\r
+ while((arg=argv[argc++]));\r
+ epd_test(argc-1,argv);\r
return EXIT_SUCCESS;\r
}\r
\r
- if (argc >= 3) my_fatal("Too many arguments\n");\r
+ // Anything that hasn't been parsed yet is a syntax error\r
+\r
+ if(argv[1]){\r
+ my_fatal("main(): Unknown option: %s\n",argv[1]);\r
+ }\r
\r
\r
init_book();\r
}\r
}\r
\r
-// parse_option()\r
-\r
-static void parse_option() {\r
-\r
- const char * file_name;\r
- FILE * file;\r
- char line[256];\r
- char * name, * value;\r
- file_name = option_get_string(Option,"OptionFile");\r
- \r
- file = fopen(file_name,"r");\r
- if (file == NULL) {\r
- my_fatal("Can't open file \"%s\": %s\n",file_name,strerror(errno));\r
- }\r
- \r
- // PolyGlot options (assumed first)\r
- \r
- while (TRUE) {\r
- \r
- if (!my_file_read_line(file,line,256)) {\r
- my_fatal("parse_option(): missing [Engine] section\n");\r
- }\r
- \r
- if (my_string_case_equal(line,"[engine]")) break;\r
- \r
- if (parse_line(line,&name,&value)) {\r
- option_set(Option,name,value);\r
- option_set_default(Option,name,value);\r
- }\r
- }\r
- \r
- if (option_get_bool(Option,"Log")) {\r
- my_log_open(option_get_string(Option,"LogFile"));\r
- }\r
- \r
- if(!DEBUG){\r
- my_log("PolyGlot %s by Fabien Letouzey\n",Version);\r
- }else{\r
- my_log("PolyGlot %s by Fabien Letouzey (debug build)\n",Version);\r
- }\r
-\r
- my_log("POLYGLOT *** START ***\n");\r
- my_log("POLYGLOT INI file \"%s\"\n",file_name);\r
- engine_open(Engine);\r
- if(!engine_active(Engine)){\r
- my_fatal("Could not start \"%s\"\n",option_get(Option,"EngineCommand"));\r
- }\r
-\r
- if (option_get_bool(Option,"UCI")) {\r
- my_log("POLYGLOT *** Switching to UCI mode ***\n");\r
- }\r
- uci_open(Uci,Engine);\r
- Init = TRUE;\r
- while (my_file_read_line(file,line,256)) {\r
- if (line[0] == '[') my_fatal("parse_option(): unknown section %s\n",line);\r
- if (parse_line(line,&name,&value)) {\r
- uci_send_option(Uci,name,"%s",value);\r
- //to get a decent display in winboard_x we need to now if an engine really is doing multipv analysis\r
- // "multipv 1" in the pv is meaningless,f.i. toga sends that all the time\r
- //therefore check if MultiPV is set to a decent value in the polyglot ini file\r
- if(my_string_case_equal(name,"MultiPV") && atoi(value)>1) Uci->multipv_mode=TRUE;\r
- }\r
- }\r
- if (my_string_equal(option_get_string(Option,"EngineName"),"<empty>")) {\r
- option_set(Option,"EngineName",Uci->name);\r
- }\r
- \r
- fclose(file);\r
-}\r
-\r
-// parse_line()\r
-\r
-static bool parse_line(char line[], char * * name_ptr, char * * value_ptr) {\r
- \r
- char * ptr;\r
- char * name, * value;\r
- \r
- ASSERT(line!=NULL);\r
- ASSERT(name_ptr!=NULL);\r
- ASSERT(value_ptr!=NULL);\r
- \r
- // remove comments\r
- \r
- ptr = strchr(line,';');\r
- if (ptr != NULL) *ptr = '\0';\r
- \r
- ptr = strchr(line,'#');\r
- if (ptr != NULL) *ptr = '\0';\r
- \r
- // split at '='\r
- \r
- ptr = strchr(line,'=');\r
- if (ptr == NULL) return FALSE;\r
- \r
- name = line;\r
- value = ptr+1;\r
- \r
- // cleanup name\r
- \r
- while (*name == ' ') name++; // remove leading spaces\r
- \r
- while (ptr > name && ptr[-1] == ' ') ptr--; // remove trailing spaces\r
- *ptr = '\0';\r
- \r
- if (*name == '\0') return FALSE;\r
- \r
- // cleanup value\r
- \r
- ptr = &value[strlen(value)]; // pointer to string terminator\r
- \r
- while (*value == ' ') value++; // remove leading spaces\r
- \r
- while (ptr > value && ptr[-1] == ' ') ptr--; // remove trailing spaces\r
- *ptr = '\0';\r
- \r
- if (*value == '\0') return FALSE;\r
- \r
- // end\r
- \r
- *name_ptr = name;\r
- *value_ptr = value;\r
- \r
- return TRUE;\r
-}\r
\r
// quit()\r
\r
engine_close(Engine);\r
\r
}\r
+ if(option_get_bool(Option,"SaveSettingsOnExit")){\r
+ write_ini(option_get_string(Option,"SaveFile"),Option,Uci->option);\r
+ }\r
my_log("POLYGLOT Calling exit\n");\r
exit(EXIT_SUCCESS);\r
}\r
projects / polyglot.git / blobdiff