Change initialize a bit

[c11tester.git] / waitobj.cc

diff --git a/waitobj.cc b/waitobj.cc
index 39b47afc42e6a2fbc4889e2649406f19669a2b34..dc422be7804e0a245130b1ff0b3a93c511931e75 100644 (file)
--- a/waitobj.cc
+++ b/waitobj.cc
@@ -15,10 +15,10 @@ WaitObj::WaitObj(thread_id_t tid) :
 
 WaitObj::~WaitObj()
 {
 
 WaitObj::~WaitObj()
 {

-       for (uint i = 0; i < thrd_dist_maps.size(); i++)
+       for (uint i = 0;i < thrd_dist_maps.size();i++)

                delete thrd_dist_maps[i];
 
                delete thrd_dist_maps[i];
 

-       for (uint i = 0; i < thrd_target_nodes.size(); i++)
+       for (uint i = 0;i < thrd_target_nodes.size();i++)

                delete thrd_target_nodes[i];
 }
 
                delete thrd_target_nodes[i];
 }
 


@@ -107,7 +107,7 @@ dist_map_t * WaitObj::getDistMap(thread_id_t tid)
 
        if (old_size <= thread_id) {
                thrd_dist_maps.resize(thread_id + 1);
 
        if (old_size <= thread_id) {
                thrd_dist_maps.resize(thread_id + 1);

-               for (int i = old_size; i < thread_id + 1; i++) {
+               for (int i = old_size;i < thread_id + 1;i++) {

                        thrd_dist_maps[i] = new dist_map_t(16);
                }
        }
                        thrd_dist_maps[i] = new dist_map_t(16);
                }
        }


@@ -122,7 +122,7 @@ node_set_t * WaitObj::getTargetNodes(thread_id_t tid)
 
        if (old_size <= thread_id) {
                thrd_target_nodes.resize(thread_id + 1);
 
        if (old_size <= thread_id) {
                thrd_target_nodes.resize(thread_id + 1);

-               for (int i = old_size; i < thread_id + 1; i++) {
+               for (int i = old_size;i < thread_id + 1;i++) {

                        thrd_target_nodes[i] = new node_set_t(16);
                }
        }
                        thrd_target_nodes[i] = new node_set_t(16);
                }
        }


@@ -168,6 +168,8 @@ void WaitObj::clear_waiting_for()
                target_nodes->reset();
        }
 
                target_nodes->reset();
        }
 

+       delete iter;
+

        waiting_for.reset();
        /* waited_by relation should be kept */
 }
        waiting_for.reset();
        /* waited_by relation should be kept */
 }


@@ -185,11 +187,12 @@ void WaitObj::print_waiting_for(bool verbose)
                model_print("%d ", waiting_for_id);
        }
        model_print("\n");
                model_print("%d ", waiting_for_id);
        }
        model_print("\n");

+       delete it;

 
        if (verbose) {
                /* Print out the distances from each thread to target nodes */
                model_print("\t");
 
        if (verbose) {
                /* Print out the distances from each thread to target nodes */
                model_print("\t");

-               for (uint i = 0; i < thrd_target_nodes.size(); i++) {
+               for (uint i = 0;i < thrd_target_nodes.size();i++) {

                        dist_map_t * dist_map = getDistMap(i);
                        node_set_t * node_set = getTargetNodes(i);
                        node_set_iter * node_iter = node_set->iterator();
                        dist_map_t * dist_map = getDistMap(i);
                        node_set_t * node_set = getTargetNodes(i);
                        node_set_iter * node_iter = node_set->iterator();


@@ -197,13 +200,15 @@ void WaitObj::print_waiting_for(bool verbose)
                        if (!node_set->isEmpty()) {
                                model_print("[thread %d](", int_to_id(i));
 
                        if (!node_set->isEmpty()) {
                                model_print("[thread %d](", int_to_id(i));
 

-                               while (node_iter->hasNext()){
+                               while (node_iter->hasNext()) {

                                        FuncNode * node = node_iter->next();
                                        int dist = dist_map->get(node);
                                        model_print("node %d: %d, ", node->get_func_id(), dist);
                                }
                                model_print(") ");
                        }
                                        FuncNode * node = node_iter->next();
                                        int dist = dist_map->get(node);
                                        model_print("node %d: %d, ", node->get_func_id(), dist);
                                }
                                model_print(") ");
                        }

+
+                       delete node_iter;

                }
                model_print("\n");
        }
                }
                model_print("\n");
        }


@@ -222,4 +227,6 @@ void WaitObj::print_waited_by()
                model_print("%d ", thread_id);
        }
        model_print("\n");
                model_print("%d ", thread_id);
        }
        model_print("\n");

+
+       delete it;

 }
 }