Refactor solver dispatch and checkdata

6 files changed, 125 insertions, 86 deletions

diff --git a/src/solvers/h48/gendata_cocsep.h b/src/solvers/h48/gendata_cocsep.h
index 2eac383..3117a8e 100644
--- a/src/solvers/h48/gendata_cocsep.h
+++ b/src/solvers/h48/gendata_cocsep.h
@@ -1,7 +1,5 @@
 STATIC size_t gendata_cocsep(unsigned char *, uint64_t *, cube_t *);
 STATIC uint32_t gendata_cocsep_dfs(cocsep_dfs_arg_t [static 1]);
-STATIC void getdistribution_cocsep(
-    const uint32_t [static COCSEP_TABLESIZE], uint64_t [static 21]);
 
 STATIC_INLINE bool gendata_cocsep_get_visited(
     const uint8_t [static COCSEP_VISITEDSIZE], int64_t);
@@ -136,20 +134,6 @@ gendata_cocsep_dfs(cocsep_dfs_arg_t arg[static 1])
         return cc;
 }
 
-STATIC void
-getdistribution_cocsep(
-    const uint32_t table[static COCSEP_TABLESIZE],
-    uint64_t distr[static 21]
-)
-{
-        size_t i;
-
-        memset(distr, 0, 21 * sizeof(uint64_t));
-
-        for (i = 0; i < COCSEP_TABLESIZE; i++)
-                distr[CBOUND(table[i])]++;
-}
-
 STATIC_INLINE bool
 gendata_cocsep_get_visited(
         const uint8_t a[static COCSEP_VISITEDSIZE],
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index c1a9ced..644ddc2 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -1,3 +1,5 @@
+STATIC long long gendata_h48_dispatch(
+    const char *, unsigned long long, unsigned char *);
 STATIC uint64_t gendata_h48short(gendata_h48short_arg_t [static 1]);
 STATIC int64_t gendata_h48(gendata_h48_arg_t [static 1]);
 STATIC void gendata_h48h0k4(gendata_h48_arg_t [static 1]);
@@ -12,9 +14,6 @@ STATIC_INLINE bool gendata_h48k2_dfs_stop(
     cube_t, int8_t, h48k2_dfs_arg_t [static 1]);
 STATIC void gendata_h48k2_dfs(h48k2_dfs_arg_t [static 1]);
 STATIC tableinfo_t makeinfo_h48k2(gendata_h48_arg_t [static 1]);
-STATIC void *getdistribution_h48_runthread(void *);
-STATIC void getdistribution_h48(const unsigned char *,
-    uint64_t [static INFO_DISTRIBUTION_LEN], uint8_t, uint8_t);
 
 STATIC const uint32_t *get_cocsepdata_constptr(const unsigned char *);
 STATIC const unsigned char *get_h48data_constptr(const unsigned char *);
@@ -28,6 +27,27 @@ STATIC_INLINE void set_h48_pval_atomic(
 
 size_t gendata_h48_derive(uint8_t, const unsigned char *, unsigned char *);
 
+STATIC long long
+gendata_h48_dispatch(
+        const char *solver,
+        unsigned long long data_size,
+        unsigned char *data
+)
+{
+        long long err;
+        gendata_h48_arg_t arg;
+
+        err = parse_h48_hk(solver, &arg.h, &arg.k);
+        if (err != NISSY_OK)
+                return err;
+
+        arg.buf_size = data_size;
+        arg.buf = data;
+        arg.maxdepth = 20;
+
+        return gendata_h48(&arg);
+}
+
 STATIC uint64_t
 gendata_h48short(gendata_h48short_arg_t arg[static 1])
 {
@@ -649,64 +669,6 @@ makeinfo_h48k2(gendata_h48_arg_t arg[static 1])
         return info;
 }
 
-STATIC void *
-getdistribution_h48_runthread(void *arg)
-{
-        getdistribution_h48_data_t *data = (getdistribution_h48_data_t *)arg;
-        const unsigned char *table;
-        uint8_t j, k, m;
-        int64_t i;
-
-        memset(data->distr, 0, INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
-
-        k = data->k;
-        table = data->table;
-        m = H48_MASK(0, k);
-        for (i = data->min; i < data->max; i++)
-                for (j = 0; j < H48_DIV(k); j++)
-                        data->distr[(table[i] & (m << (j*k))) >> (j*k)]++;
-
-        return NULL;
-}
-
-STATIC void
-getdistribution_h48(
-        const unsigned char *table,
-        uint64_t distr[static INFO_DISTRIBUTION_LEN],
-        uint8_t h,
-        uint8_t k
-) {
-        getdistribution_h48_data_t targ[THREADS];
-        pthread_t thread[THREADS];
-        uint64_t local_distr[THREADS][INFO_DISTRIBUTION_LEN];
-        int64_t i, j, nbytes, sz;
-
-        nbytes = H48_COORDMAX(h) / H48_DIV(k);
-        sz = nbytes / THREADS;
-        for (i = 0; i < THREADS; i++) {
-                targ[i] = (getdistribution_h48_data_t) {
-                        .min = i * sz,
-                        .max = i == THREADS - 1 ? nbytes : (i+1) * sz,
-                        .k = k,
-                        .distr = local_distr[i],
-                        .table = table,
-                };
-                pthread_create(&thread[i], NULL,
-                    getdistribution_h48_runthread, &targ[i]);
-        }
-
-        for (i = 0; i < THREADS; i++)
-                pthread_join(thread[i], NULL);
-
-        memset(distr, 0, INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
-        for (i = 0; i < THREADS; i++)
-                for (j = 0; j < INFO_DISTRIBUTION_LEN; j++)
-                        distr[j] += local_distr[i][j];
-
-        for (i = nbytes * H48_DIV(k); i < H48_COORDMAX(h); i++)
-                distr[get_h48_pval(table, i, k)]++;
-}
-
 STATIC const uint32_t *
 get_cocsepdata_constptr(const unsigned char *data)
 {
@@ -821,7 +783,7 @@ gendata_h48_derive(uint8_t h, const unsigned char *fulltable, unsigned char *buf
                     h48derive, j, arg.k, MIN(val_full, val_derive));
         }
 
-        getdistribution_h48(h48derive, arg.info.distribution, h, arg.k);
+        getdistribution(h48derive, arg.info.distribution, &arg.info);
 
         bufsize = arg.buf_size - COCSEP_FULLSIZE - INFOSIZE;
         if (writetableinfo(&arg.info, bufsize, (unsigned char *)arg.h48buf)
diff --git a/src/solvers/h48/gendata_types_macros.h b/src/solvers/h48/gendata_types_macros.h
index c4b1b5a..b0592c2 100644
--- a/src/solvers/h48/gendata_types_macros.h
+++ b/src/solvers/h48/gendata_types_macros.h
@@ -121,11 +121,3 @@ typedef struct {
         _Atomic unsigned char *table_atomic;
         pthread_mutex_t **table_mutex;
 } gendata_h48_mark_t;
-
-typedef struct {
-        int64_t min;
-        int64_t max;
-        uint8_t k;
-        uint64_t *distr;
-        const unsigned char *table;
-} getdistribution_h48_data_t;
diff --git a/src/solvers/h48/h48.h b/src/solvers/h48/h48.h
index 0cfa773..79d2583 100644
--- a/src/solvers/h48/h48.h
+++ b/src/solvers/h48/h48.h
@@ -1,3 +1,4 @@
+#include "utils.h"
 #include "coordinate_types_macros.h"
 #include "map_types_macros.h"
 #include "gendata_types_macros.h"
diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h
index f2967ed..2818c09 100644
--- a/src/solvers/h48/solve.h
+++ b/src/solvers/h48/solve.h
@@ -50,6 +50,10 @@ typedef struct {
         int8_t *shortest_sol;
 } dfsarg_solve_h48_maketasks_t;
 
+STATIC long long solve_h48_dispatch(oriented_cube_t, const char *, unsigned,
+    unsigned, unsigned, unsigned, unsigned, unsigned, unsigned long long n,
+    const unsigned char [n], unsigned m, char [m],
+    long long [static NISSY_SIZE_SOLVE_STATS], int (*)(void *), void *);
 STATIC_INLINE bool solve_h48_stop(dfsarg_solve_h48_t [static 1]);
 STATIC int64_t solve_h48_maketasks(
     dfsarg_solve_h48_t [static 1], dfsarg_solve_h48_maketasks_t [static 1],
@@ -61,6 +65,36 @@ STATIC int64_t solve_h48(oriented_cube_t, uint8_t, uint8_t, uint8_t, uint8_t,
     uint8_t, uint64_t, const unsigned char *, size_t n, char [n],
     long long [static NISSY_SIZE_SOLVE_STATS], int (*)(void *), void *);
 
+STATIC long long solve_h48_dispatch(
+        oriented_cube_t oc,
+        const char *solver,
+        unsigned nissflag,
+        unsigned minmoves,
+        unsigned maxmoves,
+        unsigned maxsols,
+        unsigned optimal,
+        unsigned threads,
+        unsigned long long data_size,
+        const unsigned char data[data_size],
+        unsigned sols_size,
+        char sols[sols_size],
+        long long stats[static NISSY_SIZE_SOLVE_STATS],
+        int (*poll_status)(void *),
+        void *poll_status_data
+)
+{
+        uint8_t h, k;
+        long long err;
+
+        err = parse_h48_hk(solver, &h, &k);
+        if (err != NISSY_OK)
+                return err;
+
+        return solve_h48(oc, minmoves, maxmoves, maxsols, optimal, threads,
+            data_size, data, sols_size, sols, stats,
+            poll_status, poll_status_data);
+}
+
 STATIC_INLINE bool
 solve_h48_stop(dfsarg_solve_h48_t arg[static 1])
 {
diff --git a/src/solvers/h48/utils.h b/src/solvers/h48/utils.h
new file mode 100644
index 0000000..b266c66
--- /dev/null
+++ b/src/solvers/h48/utils.h
@@ -0,0 +1,66 @@
+long long parse_h48_hk(
+    const char *, uint8_t [static 1], uint8_t [static 1]);
+STATIC long long dataid_h48(const char *, char [static NISSY_SIZE_DATAID]);
+
+long long
+parse_h48_hk(const char *buf, uint8_t h[static 1], uint8_t k[static 1])
+{
+        char format_error_msg[100];
+        sprintf(format_error_msg, "[H48] Error parsing H48 solver: must be in "
+            "'h48h*k*' format, but got '%s'\n", buf);
+
+        buf += 3;
+
+        if (*buf != 'h') {
+                LOG(format_error_msg);
+                goto parse_h48_hk_error;
+        }
+        buf++;
+
+        *h = atoi(buf);
+        if (*h > 11) {
+                LOG("[H48] Invalid value %" PRIu8 " for parameter h\n", *h);
+                goto parse_h48_hk_error;
+        }
+
+        for ( ; *buf >= 0 + '0' && *buf <= 9 + '0'; buf++) {
+                if (*buf == 0) {
+                        LOG(format_error_msg);
+                        goto parse_h48_hk_error;
+                }
+        }
+
+        if (*buf != 'k') {
+                LOG(format_error_msg);
+                goto parse_h48_hk_error;
+        }
+        buf++;
+
+        *k = atoi(buf);
+        if (!(*k == 2 || (*k == 4 && *h == 0))) {
+                LOG("[H48] Invalid combinations of values h=%" PRIu8 " and k=%"
+                    PRIu8 " for parameters h and k\n", *h, *k);
+                goto parse_h48_hk_error;
+        }
+
+        return NISSY_OK;
+
+parse_h48_hk_error:
+        *h = 0;
+        *k = 0;
+        return NISSY_ERROR_INVALID_SOLVER;
+}
+
+STATIC long long
+dataid_h48(const char *hk, char buf[static NISSY_SIZE_DATAID])
+{
+        uint8_t h, k;
+        long long err;
+
+        err = parse_h48_hk(hk, &h, &k);
+        if (err < 0)
+                return err;
+
+        sprintf(buf, "h48h%" PRIu8 "k%" PRIu8, h, k);
+        return NISSY_OK;
+}