From 80d9a48e7538e146c639c538a52a1113d4fa922f Mon Sep 17 00:00:00 2001
From: Takishipp <toufik.boubehziz@gmail.com>
Date: Wed, 31 May 2017 17:26:31 +0200
Subject: [PATCH] Use automated call to sd_exit

---
 examples/simdag/availability/sd_availability.c                 | 1 -
 examples/simdag/dag-dotload/sd_dag-dotload.c                   | 2 --
 examples/simdag/daxload/sd_daxload.c                           | 3 +--
 examples/simdag/fail/sd_fail.c                                 | 1 -
 examples/simdag/goal/goal_test.c                               | 1 -
 examples/simdag/properties/sd_properties.c                     | 1 -
 examples/simdag/ptg-dotload/sd_ptg-dotload.c                   | 3 ---
 examples/simdag/schedule-dotload/sd_schedule-dotload.c         | 3 ---
 examples/simdag/scheduling/sd_scheduling.c                     | 2 --
 examples/simdag/test/sd_test.cpp                               | 1 -
 examples/simdag/throttling/sd_throttling.c                     | 1 -
 examples/simdag/typed_tasks/sd_typed_tasks.c                   | 1 -
 teshsuite/simdag/availability/availability.c                   | 1 -
 teshsuite/simdag/basic-link-test/basic-link-test.c             | 1 -
 teshsuite/simdag/basic-parsing-test/basic-parsing-test.c       | 1 -
 teshsuite/simdag/basic0/basic0.c                               | 1 -
 teshsuite/simdag/basic1/basic1.c                               | 1 -
 teshsuite/simdag/basic3/basic3.c                               | 1 -
 teshsuite/simdag/basic4/basic4.c                               | 1 -
 teshsuite/simdag/basic5/basic5.c                               | 1 -
 teshsuite/simdag/basic6/basic6.c                               | 1 -
 teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c           | 1 -
 teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c   | 1 -
 teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c           | 1 -
 teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.c       | 1 -
 teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c       | 1 -
 teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c       | 1 -
 .../simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c     | 1 -
 teshsuite/simdag/comp-only-par/comp-only-par.c                 | 1 -
 teshsuite/simdag/comp-only-seq/comp-only-seq.c                 | 1 -
 .../simdag/evaluate-get-route-time/evaluate-get-route-time.c   | 1 -
 teshsuite/simdag/evaluate-parse-time/evaluate-parse-time.c     | 1 -
 teshsuite/simdag/flatifier/flatifier.cpp                       | 1 -
 teshsuite/simdag/incomplete/incomplete.c                       | 2 +-
 teshsuite/simdag/is-router/is-router.cpp                       | 1 -
 35 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/examples/simdag/availability/sd_availability.c b/examples/simdag/availability/sd_availability.c
index b85738c095..1d9c75c775 100644
--- a/examples/simdag/availability/sd_availability.c
+++ b/examples/simdag/availability/sd_availability.c
@@ -94,7 +94,6 @@ int main(int argc, char **argv)
     }
     xbt_dynar_reset(changed_tasks);
   }
-  SD_exit();
   xbt_free(hosts);
   xbt_dynar_free(&changed_tasks);
   return 0;
diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.c b/examples/simdag/dag-dotload/sd_dag-dotload.c
index 11260d929d..6baccb0fbc 100644
--- a/examples/simdag/dag-dotload/sd_dag-dotload.c
+++ b/examples/simdag/dag-dotload/sd_dag-dotload.c
@@ -33,7 +33,6 @@ int main(int argc, char **argv)
   dot = SD_dotload(argv[2]);
   if(dot == NULL){
     XBT_CRITICAL("No dot loaded. Do you have a cycle in your graph?");
-    SD_exit();
     exit(2);
   }
 
@@ -104,6 +103,5 @@ int main(int argc, char **argv)
   fclose(out);
 
   /* exit */
-  SD_exit();
   return 0;
 }
diff --git a/examples/simdag/daxload/sd_daxload.c b/examples/simdag/daxload/sd_daxload.c
index 45cbd05d48..e3af5411e6 100644
--- a/examples/simdag/daxload/sd_daxload.c
+++ b/examples/simdag/daxload/sd_daxload.c
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
   if (!dax){
     XBT_ERROR("A problem occurred during DAX parsing (cycle or syntax). Do not continue this test");
     free(tracefilename);
-    SD_exit();
+  
     exit(255);
   }
 
@@ -108,6 +108,5 @@ int main(int argc, char **argv)
   fclose(out);
   xbt_dynar_free_container(&dax);
 
-  SD_exit();
   return 0;
 }
diff --git a/examples/simdag/fail/sd_fail.c b/examples/simdag/fail/sd_fail.c
index 1cc34e7032..2d3c9f6ce4 100644
--- a/examples/simdag/fail/sd_fail.c
+++ b/examples/simdag/fail/sd_fail.c
@@ -85,6 +85,5 @@ int main(int argc, char **argv)
            SD_task_get_finish_time(task));
 
   SD_task_destroy(task);
-  SD_exit();
   return 0;
 }
diff --git a/examples/simdag/goal/goal_test.c b/examples/simdag/goal/goal_test.c
index 290e5f3b55..6dfc394840 100644
--- a/examples/simdag/goal/goal_test.c
+++ b/examples/simdag/goal/goal_test.c
@@ -99,7 +99,6 @@ int main(int argc, char **argv) {
   xbt_dynar_free(&done);
   xbt_dynar_free(&reclaimed);
 
-  SD_exit();
   XBT_INFO("Done. Bailing out");
   return 0;
 }
diff --git a/examples/simdag/properties/sd_properties.c b/examples/simdag/properties/sd_properties.c
index 94186bd93a..697c10c83d 100644
--- a/examples/simdag/properties/sd_properties.c
+++ b/examples/simdag/properties/sd_properties.c
@@ -72,6 +72,5 @@ int main(int argc, char **argv)
   /* Test if properties are displayed by sg_host_dump */
   sg_host_dump(h2);
 
-  SD_exit();
   return 0;
 }
diff --git a/examples/simdag/ptg-dotload/sd_ptg-dotload.c b/examples/simdag/ptg-dotload/sd_ptg-dotload.c
index 4104475845..e6b45de68d 100644
--- a/examples/simdag/ptg-dotload/sd_ptg-dotload.c
+++ b/examples/simdag/ptg-dotload/sd_ptg-dotload.c
@@ -27,7 +27,6 @@ int main(int argc, char **argv){
   /* load the DOT file */
   dot = SD_PTG_dotload(argv[2]);
   if(dot == NULL){
-    SD_exit();
     xbt_die("No dot load may be you have a cycle in your graph");
   }
 
@@ -56,7 +55,5 @@ int main(int argc, char **argv){
   }
   xbt_dynar_free_container(&dot);
 
-  /* exit */
-  SD_exit();
   return 0;
 }
diff --git a/examples/simdag/schedule-dotload/sd_schedule-dotload.c b/examples/simdag/schedule-dotload/sd_schedule-dotload.c
index 67a27934e9..aa77528c9f 100644
--- a/examples/simdag/schedule-dotload/sd_schedule-dotload.c
+++ b/examples/simdag/schedule-dotload/sd_schedule-dotload.c
@@ -34,7 +34,6 @@ int main(int argc, char **argv)
   if(!dot){
     XBT_CRITICAL("The dot file with the provided scheduling is wrong,"
                  " more information with the option : --log=sd_dotparse.thres:verbose");
-    SD_exit();
     exit(2);
   }
 
@@ -81,7 +80,5 @@ int main(int argc, char **argv)
   fclose(out);
   xbt_dynar_free_container(&dot);
 
-  /* exit */
-  SD_exit();
   return 0;
 }
diff --git a/examples/simdag/scheduling/sd_scheduling.c b/examples/simdag/scheduling/sd_scheduling.c
index a949e7319c..870583652f 100644
--- a/examples/simdag/scheduling/sd_scheduling.c
+++ b/examples/simdag/scheduling/sd_scheduling.c
@@ -250,7 +250,5 @@ int main(int argc, char **argv)
   }
 
   xbt_free(hosts);
-  /* exit */
-  SD_exit();
   return 0;
 }
diff --git a/examples/simdag/test/sd_test.cpp b/examples/simdag/test/sd_test.cpp
index bef939ba5b..0a698f8611 100644
--- a/examples/simdag/test/sd_test.cpp
+++ b/examples/simdag/test/sd_test.cpp
@@ -140,7 +140,6 @@ int main(int argc, char **argv)
   SD_task_destroy(taskD);
 
   XBT_DEBUG("Tasks destroyed. Exiting SimDag...");
-  SD_exit();
   xbt_free((sg_host_t*)hosts);
   return 0;
 }
diff --git a/examples/simdag/throttling/sd_throttling.c b/examples/simdag/throttling/sd_throttling.c
index cbef569998..dd9e0a45b6 100644
--- a/examples/simdag/throttling/sd_throttling.c
+++ b/examples/simdag/throttling/sd_throttling.c
@@ -74,7 +74,6 @@ int main(int argc, char **argv)
   SD_task_destroy(taskE);
 
   XBT_DEBUG("Tasks destroyed. Exiting SimDag...");
-  SD_exit();
   xbt_free(hosts);
   return 0;
 }
diff --git a/examples/simdag/typed_tasks/sd_typed_tasks.c b/examples/simdag/typed_tasks/sd_typed_tasks.c
index f74df77ece..f86c64a1af 100644
--- a/examples/simdag/typed_tasks/sd_typed_tasks.c
+++ b/examples/simdag/typed_tasks/sd_typed_tasks.c
@@ -74,6 +74,5 @@ int main(int argc, char **argv)
   xbt_dynar_free_container(&changed_tasks);
 
   xbt_free(hosts);
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/availability/availability.c b/teshsuite/simdag/availability/availability.c
index ed79a9327a..73c9e993da 100644
--- a/teshsuite/simdag/availability/availability.c
+++ b/teshsuite/simdag/availability/availability.c
@@ -60,6 +60,5 @@ int main(int argc, char *argv[])
     SD_task_destroy(task);
   }
   xbt_dynar_free(&dax);
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/basic-link-test/basic-link-test.c b/teshsuite/simdag/basic-link-test/basic-link-test.c
index 36971c3fe7..e3a01ade8a 100644
--- a/teshsuite/simdag/basic-link-test/basic-link-test.c
+++ b/teshsuite/simdag/basic-link-test/basic-link-test.c
@@ -34,6 +34,5 @@ int main(int argc, char **argv)
     xbt_assert(!strcmp(user_data, (const char*)sg_link_data(links[i])),"User data was corrupted.");
   }
   xbt_free(links);
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
index e8a056c6bf..c2ea385515 100644
--- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
@@ -64,6 +64,5 @@ int main(int argc, char **argv)
   }
   xbt_free(hosts);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/basic0/basic0.c b/teshsuite/simdag/basic0/basic0.c
index 04c1e09631..0115af360d 100644
--- a/teshsuite/simdag/basic0/basic0.c
+++ b/teshsuite/simdag/basic0/basic0.c
@@ -54,6 +54,5 @@ int main(int argc, char **argv)
 
   XBT_INFO("Simulation time: %f", SD_get_clock());
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/basic1/basic1.c b/teshsuite/simdag/basic1/basic1.c
index 318911f5d9..5f0cdfa749 100644
--- a/teshsuite/simdag/basic1/basic1.c
+++ b/teshsuite/simdag/basic1/basic1.c
@@ -53,6 +53,5 @@ int main(int argc, char **argv)
 
   XBT_INFO("Simulation time: %f", SD_get_clock());
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/basic3/basic3.c b/teshsuite/simdag/basic3/basic3.c
index ab44e3e9ce..01467e7000 100644
--- a/teshsuite/simdag/basic3/basic3.c
+++ b/teshsuite/simdag/basic3/basic3.c
@@ -47,6 +47,5 @@ int main(int argc, char **argv)
 
   XBT_INFO("Simulation time: %f", SD_get_clock());
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/basic4/basic4.c b/teshsuite/simdag/basic4/basic4.c
index c061e6ac01..3d3ea052c3 100644
--- a/teshsuite/simdag/basic4/basic4.c
+++ b/teshsuite/simdag/basic4/basic4.c
@@ -50,6 +50,5 @@ int main(int argc, char **argv)
 
   XBT_INFO("Simulation time: %f", SD_get_clock());
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/basic5/basic5.c b/teshsuite/simdag/basic5/basic5.c
index 485cdcb40b..1382e36d7a 100644
--- a/teshsuite/simdag/basic5/basic5.c
+++ b/teshsuite/simdag/basic5/basic5.c
@@ -53,6 +53,5 @@ int main(int argc, char **argv)
 
   XBT_INFO("Simulation time: %f", SD_get_clock());
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/basic6/basic6.c b/teshsuite/simdag/basic6/basic6.c
index c9adf72f3c..50886ba52b 100644
--- a/teshsuite/simdag/basic6/basic6.c
+++ b/teshsuite/simdag/basic6/basic6.c
@@ -46,6 +46,5 @@ int main(int argc, char **argv)
 
   XBT_INFO("Simulation time: %f", SD_get_clock());
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c
index 5ba3320eaf..45e8e62849 100644
--- a/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c
+++ b/teshsuite/simdag/comm-mxn-all2all/comm-mxn-all2all.c
@@ -40,6 +40,5 @@ int main(int argc, char **argv)
 
   SD_task_destroy(task);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c
index 07a79ac9aa..7e9e61921d 100644
--- a/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c
+++ b/teshsuite/simdag/comm-mxn-independent/comm-mxn-independent.c
@@ -41,6 +41,5 @@ int main(int argc, char **argv)
 
   SD_task_destroy(task);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c
index e55fadfe85..6116df43e7 100644
--- a/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c
+++ b/teshsuite/simdag/comm-mxn-scatter/comm-mxn-scatter.c
@@ -42,6 +42,5 @@ int main(int argc, char **argv)
 
   SD_task_destroy(task);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.c b/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.c
index ed3557ac75..e4bce55f33 100644
--- a/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.c
+++ b/teshsuite/simdag/comm-p2p-latency-1/comm-p2p-latency-1.c
@@ -37,6 +37,5 @@ int main(int argc, char **argv)
 
   SD_task_destroy(task);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c
index dd845e12d8..95f3491074 100644
--- a/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c
+++ b/teshsuite/simdag/comm-p2p-latency-2/comm-p2p-latency-2.c
@@ -46,7 +46,6 @@ int main(int argc, char **argv)
   SD_task_destroy(task1);
   SD_task_destroy(task2);
 
-  SD_exit();
 
   return 0;
 }
diff --git a/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c
index 74aaca0c5f..abdfb6e15f 100644
--- a/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c
+++ b/teshsuite/simdag/comm-p2p-latency-3/comm-p2p-latency-3.c
@@ -48,6 +48,5 @@ int main(int argc, char **argv)
   SD_task_destroy(task1);
   SD_task_destroy(task2);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c
index f29bdd9def..db1fa4ff49 100644
--- a/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c
+++ b/teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c
@@ -50,6 +50,5 @@ int main(int argc, char **argv)
   }
   SD_task_destroy(root);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/comp-only-par/comp-only-par.c b/teshsuite/simdag/comp-only-par/comp-only-par.c
index 6ce8ddb9b1..9968151ff2 100644
--- a/teshsuite/simdag/comp-only-par/comp-only-par.c
+++ b/teshsuite/simdag/comp-only-par/comp-only-par.c
@@ -27,6 +27,5 @@ int main(int argc, char **argv)
 
   SD_task_destroy(task);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/comp-only-seq/comp-only-seq.c b/teshsuite/simdag/comp-only-seq/comp-only-seq.c
index a0908e21c8..012a960d4e 100644
--- a/teshsuite/simdag/comp-only-seq/comp-only-seq.c
+++ b/teshsuite/simdag/comp-only-seq/comp-only-seq.c
@@ -30,6 +30,5 @@ int main(int argc, char **argv)
 
   SD_task_destroy(task);
 
-  SD_exit();
   return 0;
 }
diff --git a/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c b/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c
index c8bf42ad1f..7dd4dd6469 100644
--- a/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c
+++ b/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c
@@ -47,7 +47,6 @@ int main(int argc, char **argv)
   printf("%f\n", xbt_os_timer_elapsed(timer) );
 
   xbt_free(hosts);
-  SD_exit();
 
   return 0;
 }
diff --git a/teshsuite/simdag/evaluate-parse-time/evaluate-parse-time.c b/teshsuite/simdag/evaluate-parse-time/evaluate-parse-time.c
index f21cb3a5b9..9bce26c5e3 100644
--- a/teshsuite/simdag/evaluate-parse-time/evaluate-parse-time.c
+++ b/teshsuite/simdag/evaluate-parse-time/evaluate-parse-time.c
@@ -34,7 +34,6 @@ int main(int argc, char **argv)
     sleep(atoi(argv[2]));
   }
 
-  SD_exit();
 
   free(timer);
   return 0;
diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index e434b5bf1d..66d88d9eda 100644
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -202,7 +202,6 @@ int main(int argc, char** argv)
     dump_platform();
   }
 
-  SD_exit();
   xbt_os_timer_free(parse_time);
 
   return 0;
diff --git a/teshsuite/simdag/incomplete/incomplete.c b/teshsuite/simdag/incomplete/incomplete.c
index 593b93490f..538a3838aa 100644
--- a/teshsuite/simdag/incomplete/incomplete.c
+++ b/teshsuite/simdag/incomplete/incomplete.c
@@ -59,6 +59,6 @@ int main(int argc, char **argv)
 
   XBT_INFO("Simulation time: %f", SD_get_clock());
 
-  SD_exit();
+
   return 0;
 }
diff --git a/teshsuite/simdag/is-router/is-router.cpp b/teshsuite/simdag/is-router/is-router.cpp
index 4a4d891168..523080ccba 100644
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -44,6 +44,5 @@ int main(int argc, char **argv)
     std::printf("   - Seen: \"%s\". Type: %s\n", nc->cname(),
                 nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : (nc->isHost() ? "host" : "buggy")));
 
-  SD_exit();
   return 0;
 }
-- 
2.20.1