From: Frederic Suter Date: Thu, 4 Feb 2016 10:37:30 +0000 (+0100) Subject: coverage madness: use asserts here too X-Git-Tag: v3_13~981 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e4465c97e74bf0a2ac06737edfe4384e0ac1f354 coverage madness: use asserts here too --- diff --git a/examples/simdag/dot/dot_test.c b/examples/simdag/dot/dot_test.c index d06e646cc3..37f46846af 100644 --- a/examples/simdag/dot/dot_test.c +++ b/examples/simdag/dot/dot_test.c @@ -14,8 +14,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(test, - "Logging specific to this SimDag example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this SimDag example"); int main(int argc, char **argv) { @@ -27,11 +26,8 @@ int main(int argc, char **argv) SD_init(&argc, argv); /* Check our arguments */ - if (argc < 3) { - XBT_INFO("Usage: %s platform_file dot_file [trace_file]", argv[0]); - XBT_INFO("example: %s ../2clusters.xml dag.dot dag.mytrace", argv[0]); - exit(1); - } + xbt_assert(argc > 2, "Usage: %s platform_file dot_file [trace_file]" + "example: %s ../2clusters.xml dag.dot dag.mytrace", argv[0], argv[0]); /* creation of the environment */ SD_create_environment(argv[1]); @@ -45,20 +41,13 @@ int main(int argc, char **argv) } char *tracefilename; - if (argc == 3) { - char *last = strrchr(argv[2], '.'); - - tracefilename = - bprintf("%.*s.trace", - (int) (last == NULL ? strlen(argv[2]) : last - argv[2]), - argv[2]); - } else { + char *last = strrchr(argv[2], '.'); + tracefilename = bprintf("%.*s.trace", (int) (last == NULL ? strlen(argv[2]) : last - argv[2]),argv[2]); + if (argc == 4) tracefilename = xbt_strdup(argv[3]); - } /* Display all the tasks */ - XBT_INFO - ("------------------- Display all tasks of the loaded DAG ---------------------------"); + XBT_INFO("------------------- Display all tasks of the loaded DAG ---------------------------"); xbt_dynar_foreach(dot, cursor, task) { SD_task_dump(task); } @@ -85,12 +74,10 @@ int main(int argc, char **argv) } } - XBT_INFO - ("------------------- Run the schedule ---------------------------"); + XBT_INFO("------------------- Run the schedule ---------------------------"); SD_simulate(-1); - XBT_INFO - ("------------------- Produce the trace file---------------------------"); + XBT_INFO("------------------- Produce the trace file---------------------------"); XBT_INFO("Producing the trace of the run into %s", basename(tracefilename)); FILE *out = fopen(tracefilename, "w"); xbt_assert(out, "Cannot write to %s", tracefilename); @@ -102,22 +89,16 @@ int main(int argc, char **argv) switch (kind) { case SD_TASK_COMP_SEQ: fprintf(out, "[%f->%f] %s compute %f flops # %s\n", - SD_task_get_start_time(task), - SD_task_get_finish_time(task), - sg_host_get_name(wsl[0]), SD_task_get_amount(task), - SD_task_get_name(task)); + SD_task_get_start_time(task), SD_task_get_finish_time(task), + sg_host_get_name(wsl[0]), SD_task_get_amount(task), SD_task_get_name(task)); break; case SD_TASK_COMM_E2E: fprintf(out, "[%f -> %f] %s -> %s transfer of %.0f bytes # %s\n", - SD_task_get_start_time(task), - SD_task_get_finish_time(task), - sg_host_get_name(wsl[0]), - sg_host_get_name(wsl[1]), SD_task_get_amount(task), - SD_task_get_name(task)); + SD_task_get_start_time(task), SD_task_get_finish_time(task), + sg_host_get_name(wsl[0]), sg_host_get_name(wsl[1]), SD_task_get_amount(task), SD_task_get_name(task)); break; default: - xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task), - SD_task_get_kind(task)); + xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task), SD_task_get_kind(task)); } SD_task_destroy(task); } diff --git a/examples/simdag/dot/dot_test2.c b/examples/simdag/dot/dot_test2.c index 47f327a8c4..38b70958b8 100644 --- a/examples/simdag/dot/dot_test2.c +++ b/examples/simdag/dot/dot_test2.c @@ -1,6 +1,6 @@ /* simple test trying to load a DOT file. */ -/* Copyright (c) 2010-2015. The SimGrid Team. +/* Copyright (c) 2010-2016. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -13,8 +13,7 @@ #include "xbt/ex.h" #include -XBT_LOG_NEW_DEFAULT_CATEGORY(test, - "Logging specific to this SimDag example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this SimDag example"); int main(int argc, char **argv) { @@ -26,27 +25,21 @@ int main(int argc, char **argv) SD_init(&argc, argv); /* Check our arguments */ - if (argc < 2) { - XBT_INFO("Usage: %s dot_file", argv[0]); - exit(1); - } + xbt_assert(argc > 1, "Usage: %s dot_file", argv[0]); /* load the DOT file */ dot = SD_dotload(argv[1]); /* Display all the tasks */ - XBT_INFO - ("------------------- Display all tasks of the loaded DAG ---------------------------"); + XBT_INFO("------------------- Display all tasks of the loaded DAG ---------------------------"); xbt_dynar_foreach(dot, cursor, task) { SD_task_dump(task); } - XBT_INFO - ("--------------------- Transform the dynar into an array ---------------------------"); + XBT_INFO("--------------------- Transform the dynar into an array ---------------------------"); cursor=0; dot_as_array = (SD_task_t*) xbt_dynar_to_array(dot); - XBT_INFO - ("----------------------------- dump tasks again ------------------------------------"); + XBT_INFO("----------------------------- dump tasks again ------------------------------------"); while ((task=dot_as_array[cursor++])){ SD_task_dump(task); } diff --git a/examples/simdag/dot/ptg_test.c b/examples/simdag/dot/ptg_test.c index 19c6de9dc8..a313557ba3 100644 --- a/examples/simdag/dot/ptg_test.c +++ b/examples/simdag/dot/ptg_test.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-2016. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,8 +12,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(test, - "Logging specific to this SimDag example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this SimDag example"); /* simple test trying to load a Parallel Task Graph (PTG) as a DOT file. */ int main(int argc, char **argv){ @@ -25,11 +24,7 @@ int main(int argc, char **argv){ SD_init(&argc, argv); /* Check our arguments */ - if (argc < 2) { - XBT_INFO("Usage: %s platform_file dot_file ", argv[0]); - XBT_INFO("example: %s ../2clusters.xml ptg.dot", argv[0]); - exit(1); - } + xbt_assert (argc > 1,"Usage: %s platform_file dot_file example: %s ../2clusters.xml ptg.dot", argv[0], argv[0]); /* creation of the environment */ SD_create_environment(argv[1]); @@ -42,8 +37,7 @@ int main(int argc, char **argv){ } /* Display all the tasks */ - XBT_INFO - ("------------------- Display all tasks of the loaded DAG ---------------------------"); + XBT_INFO("------------------- Display all tasks of the loaded DAG ---------------------------"); xbt_dynar_foreach(dot, cursor, task) { SD_task_dump(task); } @@ -66,8 +60,7 @@ int main(int argc, char **argv){ } } - XBT_INFO - ("------------------- Run the schedule ---------------------------"); + XBT_INFO("------------------- Run the schedule ---------------------------"); SD_simulate(-1); XBT_INFO("Makespan: %f", SD_get_clock()); xbt_dynar_foreach(dot, cursor, task) { diff --git a/examples/simdag/dot/simulate_dot.c b/examples/simdag/dot/simulate_dot.c index c0fbe0ccf3..efcf24b581 100644 --- a/examples/simdag/dot/simulate_dot.c +++ b/examples/simdag/dot/simulate_dot.c @@ -1,6 +1,6 @@ /* simple test trying to load a DOT file. */ -/* Copyright (c) 2010-2015. The SimGrid Team. +/* Copyright (c) 2010-2016. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -14,8 +14,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(test, - "Logging specific to this SimDag example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this SimDag example"); int main(int argc, char **argv) { @@ -27,11 +26,8 @@ int main(int argc, char **argv) SD_init(&argc, argv); /* Check our arguments */ - if (argc < 3) { - XBT_INFO("Usage: %s platform_file dot_file [trace_file]", argv[0]); - XBT_INFO("example: %s ../2clusters.xml dag.dot dag.mytrace", argv[0]); - exit(1); - } + xbt_assert(argc > 2, "Usage: %s platform_file dot_file [trace_file]" + "example: %s ../2clusters.xml dag.dot dag.mytrace", argv[0], argv[0]); /* creation of the environment */ SD_create_environment(argv[1]); @@ -45,20 +41,14 @@ int main(int argc, char **argv) } char *tracefilename; - if (argc == 3) { - char *last = strrchr(argv[2], '.'); - - tracefilename = - bprintf("%.*s.trace", - (int) (last == NULL ? strlen(argv[2]) : last - argv[2]), - argv[2]); - } else { + char *last = strrchr(argv[2], '.'); + tracefilename = bprintf("%.*s.trace", (int) (last == NULL ? strlen(argv[2]) : last - argv[2]),argv[2]); + if (argc == 4) tracefilename = xbt_strdup(argv[3]); - } + /* Display all the tasks */ - XBT_INFO - ("------------------- Display all tasks of the loaded DAG ---------------------------"); + XBT_INFO("------------------- Display all tasks of the loaded DAG ---------------------------"); xbt_dynar_foreach(dot, cursor, task) { SD_task_dump(task); } @@ -71,12 +61,10 @@ int main(int argc, char **argv) fprintf(dotout, "}\n"); fclose(dotout); - XBT_INFO - ("------------------- Run the schedule ---------------------------"); + XBT_INFO("------------------- Run the schedule ---------------------------"); SD_simulate(-1); - XBT_INFO - ("------------------- Produce the trace file---------------------------"); + XBT_INFO("------------------- Produce the trace file---------------------------"); XBT_INFO("Producing the trace of the run into %s", basename(tracefilename)); FILE *out = fopen(tracefilename, "w"); xbt_assert(out, "Cannot write to %s", tracefilename); @@ -88,22 +76,16 @@ int main(int argc, char **argv) switch (kind) { case SD_TASK_COMP_SEQ: fprintf(out, "[%f->%f] %s compute %f flops # %s\n", - SD_task_get_start_time(task), - SD_task_get_finish_time(task), - sg_host_get_name(wsl[0]), SD_task_get_amount(task), - SD_task_get_name(task)); + SD_task_get_start_time(task), SD_task_get_finish_time(task), + sg_host_get_name(wsl[0]), SD_task_get_amount(task), SD_task_get_name(task)); break; case SD_TASK_COMM_E2E: fprintf(out, "[%f -> %f] %s -> %s transfer of %.0f bytes # %s\n", - SD_task_get_start_time(task), - SD_task_get_finish_time(task), - sg_host_get_name(wsl[0]), - sg_host_get_name(wsl[1]), SD_task_get_amount(task), - SD_task_get_name(task)); + SD_task_get_start_time(task), SD_task_get_finish_time(task), + sg_host_get_name(wsl[0]), sg_host_get_name(wsl[1]), SD_task_get_amount(task), SD_task_get_name(task)); break; default: - xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task), - SD_task_get_kind(task)); + xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task), SD_task_get_kind(task)); } SD_task_destroy(task); }