fixup more id vs. thread_id_t

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 7a703abab8cc7e229f7218c85add8580c7f3ad53..88200a81cc650617044b4b0449477fbed1afb4e9 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -18,11 +18,11 @@ Scheduler::Scheduler() :
 void Scheduler::set_enabled(Thread *t, bool enabled_status) {
        int threadid=id_to_int(t->get_id());
        if (threadid>=enabled_len) {
-               bool * new_enabled=(bool *)malloc(sizeof(bool)*(threadid+1));
+               bool *new_enabled = (bool *)snapshot_malloc(sizeof(bool) * (threadid + 1));
                memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(bool));
                if (is_enabled != NULL) {
                        memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));
-                       free(is_enabled);
+                       snapshot_free(is_enabled);
                }
                is_enabled=new_enabled;
                enabled_len=threadid+1;
@@ -36,7 +36,7 @@ void Scheduler::set_enabled(Thread *t, bool enabled_status) {
  */
 void Scheduler::add_thread(Thread *t)
 {
-       DEBUG("thread %d\n", t->get_id());
+       DEBUG("thread %d\n", id_to_int(t->get_id()));
        set_enabled(t, true);
 }
 
@@ -119,7 +119,7 @@ Thread * Scheduler::get_current_thread() const
 void Scheduler::print() const
 {
        if (current)
-               DEBUG("Current thread: %d\n", current->get_id());
+               DEBUG("Current thread: %d\n", id_to_int(current->get_id()));
        else
                DEBUG("No current thread\n");
 }