X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e9c0448c6566825b170b98ecff716b098bda10e..2b1640b1ff96d9a64a02d0c9862cf81e32d73e2e:/examples/simdag/dot/dot_test2.c diff --git a/examples/simdag/dot/dot_test2.c b/examples/simdag/dot/dot_test2.c index ea5a4c7f5e..a9b9c68bb5 100644 --- a/examples/simdag/dot/dot_test2.c +++ b/examples/simdag/dot/dot_test2.c @@ -1,20 +1,15 @@ /* simple test trying to load a DOT file. */ -/* Copyright (c) 2010-2012. 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 * under the terms of the license (GNU LGPL) which comes with this package. */ -#include +#include "simgrid/simdag.h" #include -#include "simdag/simdag.h" -#include "xbt/log.h" -#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) { @@ -22,31 +17,25 @@ int main(int argc, char **argv) unsigned int cursor; SD_task_t task, *dot_as_array=NULL; - /* initialisation of SD */ + /* SD initialization */ 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); }