6 files changed, 38 insertions, 19 deletions

diff --git a/build.bat b/build.bat
index 909ff01..91cc4db 100644
--- a/build.bat
+++ b/build.bat
@@ -10,7 +10,7 @@ if [%1]==[/d] (
 SET CC=clang

 SET CXX=clang++

 SET ARCH=PORTABLE

-SET THREADS=1

+SET THREADS=16

 SET SANITIZE=

 

 :: TODO depends on ARCH variable

diff --git a/src/solvers/distribution.h b/src/solvers/distribution.h
index e9302da..7adc964 100644
--- a/src/solvers/distribution.h
+++ b/src/solvers/distribution.h
@@ -60,12 +60,12 @@ getdistribution(
                         .distr = local_distr[i],
                         .table = table,
                 };
-                wrapthread_create(&thread[i], NULL,
+                wrapthread_create(&thread[i],
                     getdistribution_runthread, &targ[i]);
         }
 
         for (i = 0; i < THREADS; i++)
-                wrapthread_join(thread[i], NULL);
+                wrapthread_join(thread[i]);
 
         memset(distr, 0, INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
         for (i = 0; i < THREADS; i++)
diff --git a/src/solvers/h48/distribution_h48.h b/src/solvers/h48/distribution_h48.h
index 93a6933..6d50ae5 100644
--- a/src/solvers/h48/distribution_h48.h
+++ b/src/solvers/h48/distribution_h48.h
@@ -58,12 +58,12 @@ getdistribution_h48(
                         .distr = local_distr[i],
                         .table = table,
                 };
-                wrapthread_create(&thread[i], NULL,
+                wrapthread_create(&thread[i],
                     getdistribution_h48_runthread, &targ[i]);
         }
 
         for (i = 0; i < THREADS; i++)
-                wrapthread_join(thread[i], NULL);
+                wrapthread_join(thread[i]);
 
         memset(distr, 0, INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
         for (i = 0; i < THREADS; i++)
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index ef8a854..a5bb331 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -230,9 +230,9 @@ gendata_h48_maintable(gendata_h48_arg_t arg[static 1])
 
         inext = 0;
         count = 0;
-        wrapthread_mutex_init(&shortcubes_mutex, NULL);
+        wrapthread_mutex_init(&shortcubes_mutex);
         for (i = 0; i < CHUNKS; i++)
-                wrapthread_mutex_init(&table_mutex[i], NULL);
+                wrapthread_mutex_init(&table_mutex[i]);
         for (i = 0; i < THREADS; i++) {
                 dfsarg[i] = (h48_dfs_arg_t){
                         .h = arg->h,
@@ -251,7 +251,7 @@ gendata_h48_maintable(gendata_h48_arg_t arg[static 1])
                         dfsarg[i].table_mutex[ii] = &table_mutex[ii];
 
                 wrapthread_create(
-                    &thread[i], NULL, gendata_h48_runthread, &dfsarg[i]);
+                    &thread[i], gendata_h48_runthread, &dfsarg[i]);
         }
 
         if (NISSY_CANSLEEP) {
@@ -281,7 +281,7 @@ gendata_h48_maintable(gendata_h48_arg_t arg[static 1])
         }
 
         for (i = 0; i < THREADS; i++)
-                wrapthread_join(thread[i], NULL);
+                wrapthread_join(thread[i]);
 
         h48map_destroy(&shortcubes);
 
diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h
index 15ac6ea..19aaf79 100644
--- a/src/solvers/h48/solve.h
+++ b/src/solvers/h48/solve.h
@@ -638,7 +638,7 @@ solve_h48(
 
         }
 
-        wrapthread_mutex_init(&solutions_mutex, NULL);
+        wrapthread_mutex_init(&solutions_mutex);
 
         mtarg = (dfsarg_solve_h48_maketasks_t) {
                 .cube = oc.cube,
@@ -689,7 +689,7 @@ solve_h48(
                         arg[i].target_depth = d;
                         arg[i].thread_done = false;
                         wrapthread_create(
-                            &thread[i], NULL, solve_h48_runthread, &arg[i]);
+                            &thread[i], solve_h48_runthread, &arg[i]);
                 }
 
                 /* Log solutions and handle pause / stop / resume */
@@ -718,7 +718,7 @@ solve_h48(
                 }
 
                 for (i = 0; i < threads; i++)
-                        wrapthread_join(thread[i], NULL);
+                        wrapthread_join(thread[i]);
 
                 solve_h48_log_solutions(&sollist, lastused);
                 lastused = sollist.used;
diff --git a/src/utils/wrapthread.h b/src/utils/wrapthread.h
index 28654fe..d5de155 100644
--- a/src/utils/wrapthread.h
+++ b/src/utils/wrapthread.h
@@ -9,13 +9,32 @@
 
 #define wrapthread_define_if_threads(T, x) T x; (void)(x)
 
-#define wrapthread_create(a, b, c, d) c(d)
-#define wrapthread_join(a, b)
-#define wrapthread_mutex_init(a, b)
+#define wrapthread_create(t, f, arg) f(arg)
+#define wrapthread_join(a)
+#define wrapthread_mutex_init(a)
 #define wrapthread_mutex_lock(a)
 #define wrapthread_mutex_unlock(a)
 
-#else
+#elif defined(_WIN32)
+
+#include <threads.h>
+
+#define wrapthread_atomic _Atomic
+
+#define wrapthread_define_var_thread_t(x) thrd_t x
+#define wrapthread_define_var_mutex_t(x) mtx_t x
+#define wrapthread_define_struct_thread_t(x) thrd_t x
+#define wrapthread_define_struct_mutex_t(x) mtx_t x
+
+#define wrapthread_define_if_threads(T, x) T x
+
+#define wrapthread_create(a, f, arg) thrd_create(a, (int(*)(void *))f, arg)
+#define wrapthread_join(a) thrd_join(a, NULL)
+#define wrapthread_mutex_init(a) mtx_init(a, mtx_plain)
+#define wrapthread_mutex_lock(a) mtx_lock(a)
+#define wrapthread_mutex_unlock(a) mtx_unlock(a)
+
+#elif defined(__unix__)
 
 #include <pthread.h>
 
@@ -28,9 +47,9 @@
 
 #define wrapthread_define_if_threads(T, x) T x
 
-#define wrapthread_create(a, b, c, d) pthread_create(a, b, c, d)
-#define wrapthread_join(a, b) pthread_join(a, b)
-#define wrapthread_mutex_init(a, b) pthread_mutex_init(a, b)
+#define wrapthread_create(a, f, arg) pthread_create(a, NULL, f, arg)
+#define wrapthread_join(a) pthread_join(a, NULL)
+#define wrapthread_mutex_init(a) pthread_mutex_init(a, NULL)
 #define wrapthread_mutex_lock(a) pthread_mutex_lock(a)
 #define wrapthread_mutex_unlock(a) pthread_mutex_unlock(a)