put hashing back into the fn calls

libptimc/examples/hashing.c

@@ -1,17 +1,10 @@
 #include "libptimc.h"
 #include <assert.h>
 
-static hash_t HASH = 0;
-hash_t state_hasher() { return (hash_t)HASH; }
-
 void imc_check_main(void) {
-    register_hasher(state_hasher);
-
     int counter = 0;
     for (int i = 0; i < 5; i++) {
-        HASH = (counter << 8) | i;
-
-        counter += choose(2);
+        counter += choose(2, (counter << 8) | i);
         assert(counter < 6);
     }
 }

libptimc/libimc/libimc.h

@@ -10,9 +10,7 @@
 typedef uint8_t choice_t;
 typedef uint64_t hash_t;
 
-choice_t choose(choice_t n);
+choice_t choose(choice_t n, hash_t hash);
 void report_error();
 void check_exit_normal();
 extern void check_main();
-
-void register_hasher(hash_t (*hasher)(void));

libptimc/libimc/worker.c

@@ -10,14 +10,9 @@ struct partial_path CURRENT_PATH;
 int CURRENT_N_CHOICES;
 struct message_bundle BUNDLE;
 
-static hash_t (*HASHER)(void);
-void register_hasher(hash_t (*hasher)(void)) { HASHER = hasher; }
-
-choice_t choose(choice_t n) {
+choice_t choose(choice_t n, hash_t hash) {
     if (n == 1) return 0;
 
-    hash_t hash = HASHER ? HASHER() : 0;
-
     if (CURRENT_N_CHOICES++ < CURRENT_PATH.n_choices)
         return CURRENT_PATH.choices[CURRENT_N_CHOICES - 1];
 

libptimc/libptimc.c

@@ -32,7 +32,7 @@ int imcthread_create(imcthread_t *threadp,
     return 0;
 }
 
-int imcthread_yield(void) {
+int imcthread_yieldh(hash_t hash) {
     // pauses the current thread and returns to the master thread
     assert(CURRENT_THREAD);
     struct imcthread *thread = CURRENT_THREAD;
@@ -48,6 +48,7 @@ int imcthread_yield(void) {
 
     return 0;
 }
+int imcthread_yield(void) { imcthread_yieldh(0); }
 
 static void *_imc_check_main(void *_) { imc_check_main(); return 0; }
 void check_main() {
@@ -76,7 +77,7 @@ void check_main() {
     }
 }
 
-int imcthread_join(imcthread_t thread, void **retval) {
+int imcthread_joinh(imcthread_t thread, void **retval, hash_t hash) {
     if (thread->state != THREAD_STATE_DEAD) {
         CURRENT_THREAD->waiting_on = thread;
         imcthread_yield();
@@ -85,6 +86,9 @@ int imcthread_join(imcthread_t thread, void **retval) {
     if (retval) *retval = thread->retval;
     return 0;
 }
+int imcthread_join(imcthread_t thread, void **retval) {
+    return imcthread_joinh(thread, retval, 0);
+}
 
 static void switch_to_thread(struct imcthread *thread) {
     assert(!CURRENT_THREAD);

libptimc/libptimc.h

@@ -37,6 +37,9 @@ int imcthread_create(imcthread_t *thread,
 int imcthread_yield(void);
 int imcthread_join(imcthread_t thread, void **retval);
 
+int imcthread_yieldh(hash_t hash);
+int imcthread_joinh(imcthread_t thread, void **retval, hash_t hash);
+
 void check_main(void);
 
 extern void imc_check_main(void);