From c182f3f16e56e9533060ffa06b25391e239a28ee Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Thu, 17 Apr 2025 14:36:47 +0200 Subject: Restore logging to stderr for tools --- tools/000_gendata/gendata.c | 2 +- tools/001_derive_h48/derive_h48.c | 2 +- tools/100_checkdata/checkdata.c | 2 +- tools/300_solve_small/solve_small.c | 2 +- tools/301_solve_file/solve_file.c | 2 +- tools/302_solve_multisol/solve_multisol.c | 2 +- tools/400_solvetest/solve_test.c | 2 +- tools/tool.h | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/000_gendata/gendata.c b/tools/000_gendata/gendata.c index 3123bf5..470fe9b 100644 --- a/tools/000_gendata/gendata.c +++ b/tools/000_gendata/gendata.c @@ -51,7 +51,7 @@ int main(int argc, char **argv) { parse_h48_solver(solver, &h, &k); expected = expected_h48[h][k]; - nissy_setlogger(log_stdout, NULL); + nissy_setlogger(log_stderr, NULL); timerun(run); diff --git a/tools/001_derive_h48/derive_h48.c b/tools/001_derive_h48/derive_h48.c index e471f9b..e8db207 100644 --- a/tools/001_derive_h48/derive_h48.c +++ b/tools/001_derive_h48/derive_h48.c @@ -32,7 +32,7 @@ int main(int argc, char **argv) { filename_large = argv[3]; filename_small = argv[4]; - nissy_setlogger(log_stdout, NULL); + nissy_setlogger(log_stderr, NULL); timerun(run); diff --git a/tools/100_checkdata/checkdata.c b/tools/100_checkdata/checkdata.c index 00875fa..cf42cbe 100644 --- a/tools/100_checkdata/checkdata.c +++ b/tools/100_checkdata/checkdata.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) { solver = argv[1]; filename = argv[2]; - nissy_setlogger(log_stdout, NULL); + nissy_setlogger(log_stderr, NULL); timerun(run); diff --git a/tools/300_solve_small/solve_small.c b/tools/300_solve_small/solve_small.c index c6dd661..d81ed51 100644 --- a/tools/300_solve_small/solve_small.c +++ b/tools/300_solve_small/solve_small.c @@ -56,7 +56,7 @@ int main(int argc, char **argv) { solver = argv[1]; srand(time(NULL)); - nissy_setlogger(log_stdout, NULL); + nissy_setlogger(log_stderr, NULL); sprintf(filename, "tables/%s", solver); diff --git a/tools/301_solve_file/solve_file.c b/tools/301_solve_file/solve_file.c index 06b8198..110c7d2 100644 --- a/tools/301_solve_file/solve_file.c +++ b/tools/301_solve_file/solve_file.c @@ -46,7 +46,7 @@ int main(int argc, char **argv) { scrfilename = argv[2]; srand(time(NULL)); - nissy_setlogger(log_stdout, NULL); + nissy_setlogger(log_stderr, NULL); sprintf(filename, "tables/%s", solver); if (getdata(solver, &buf, filename) != 0) diff --git a/tools/302_solve_multisol/solve_multisol.c b/tools/302_solve_multisol/solve_multisol.c index ec36711..e4256de 100644 --- a/tools/302_solve_multisol/solve_multisol.c +++ b/tools/302_solve_multisol/solve_multisol.c @@ -50,7 +50,7 @@ int main(int argc, char **argv) { solver = argv[1]; nsol = atoi(argv[2]); srand(time(NULL)); - nissy_setlogger(log_stdout, NULL); + nissy_setlogger(log_stderr, NULL); sprintf(filename, "tables/%s", solver); diff --git a/tools/400_solvetest/solve_test.c b/tools/400_solvetest/solve_test.c index 6e7b2a5..a4121a5 100644 --- a/tools/400_solvetest/solve_test.c +++ b/tools/400_solvetest/solve_test.c @@ -104,7 +104,7 @@ int main(int argc, char **argv) { solver = argv[1]; srand(time(NULL)); - nissy_setlogger(log_stdout, NULL); + nissy_setlogger(log_stderr, NULL); sprintf(filename, "tables/%s", solver); if (getdata(solver, &buf, filename) != 0) diff --git a/tools/tool.h b/tools/tool.h index ee6c8eb..58721a2 100644 --- a/tools/tool.h +++ b/tools/tool.h @@ -9,7 +9,7 @@ #include "../src/nissy.h" #include "nissy_extra.h" -static void log_stdout(const char *, void *); +static void log_stderr(const char *, void *); static double timerun(void (*)(void)); static void writetable(const char *, int64_t, const char *); static long long int generatetable(const char *, char **, @@ -22,9 +22,9 @@ static void derivedata_run( const char *, const char *, const char *, const char *); static void -log_stdout(const char *str, void *unused) +log_stderr(const char *str, void *unused) { - fprintf(stdout, "%s", str); + fprintf(stderr, "%s", str); } static double -- cgit v1.3