From: Martin Quinson Date: Sat, 4 Apr 2015 18:14:04 +0000 (+0200) Subject: mv simdag/simdag.h simgrid/simdag.h X-Git-Tag: v3_12~738^2~8 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a6dbc279b78e4a84b3921b509f3138ed01399bca mv simdag/simdag.h simgrid/simdag.h --- diff --git a/ChangeLog b/ChangeLog index b336ea1ba2..1bc285f78b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,8 @@ SimGrid (3.12) NOT RELEASED; urgency=low * Move headers around to sort them out on installed systems: - instr/instr.h -> simgrid/instr.h - instr/jedule/* -> simgrid/jedule + - simdag/datatypes.h was removed + - simdag/simdag.h -> simgrid/simdag.h -- $date Da SimGrid team diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 2e075c1ae6..cf023bf99b 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -568,10 +568,10 @@ set(TRACING_SRC ) set(JEDULE_SRC - include/instr/jedule/jedule_events.h - include/instr/jedule/jedule_output.h - include/instr/jedule/jedule_platform.h - include/instr/jedule/jedule_sd_binding.h + include/simgrid/jedule/jedule_events.h + include/simgrid/jedule/jedule_output.h + include/simgrid/jedule/jedule_platform.h + include/simgrid/jedule/jedule_sd_binding.h src/instr/jedule/jedule_events.c src/instr/jedule/jedule_output.c src/instr/jedule/jedule_platform.c @@ -630,11 +630,10 @@ set(MC_SRC ) set(headers_to_install - include/instr/instr.h + include/simgrid/instr.h include/msg/datatypes.h include/msg/msg.h - include/simdag/datatypes.h - include/simdag/simdag.h + include/simgrid/simdag.h include/simgrid.h include/simgrid/datatypes.h include/simgrid/modelchecker.h diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index e0b4f9fe52..005aafa326 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -678,7 +678,6 @@ INPUT = doxygen/index.doc \ @top_srcdir@/include/ \ @top_srcdir@/include/msg \ @top_srcdir@/include/xbt \ - @top_srcdir@/include/simdag \ @top_srcdir@/include/simgrid \ @top_srcdir@/src/include/surf \ @top_srcdir@/src/xbt/ \ diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index d6bcb02069..e8d50b6305 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -64,7 +64,6 @@ set(tesh_files ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_typed_tasks.tesh ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_avail.tesh ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_fail.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_fail_notrace.tesh PARENT_SCOPE ) set(xml_files diff --git a/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt index a824e281f7..669dd41503 100644 --- a/examples/simdag/dax/CMakeLists.txt +++ b/examples/simdag/dax/CMakeLists.txt @@ -15,7 +15,6 @@ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/simple_dax_with_cycle.tesh ${CMAKE_CURRENT_SOURCE_DIR}/smalldax.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/smalldax_notrace.tesh PARENT_SCOPE ) set(xml_files diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c index d33f9f8182..c495481099 100644 --- a/examples/simdag/dax/dax_test.c +++ b/examples/simdag/dax/dax_test.c @@ -8,7 +8,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/ex.h" #include diff --git a/examples/simdag/dot/CMakeLists.txt b/examples/simdag/dot/CMakeLists.txt index 302bdd625f..d541688b01 100644 --- a/examples/simdag/dot/CMakeLists.txt +++ b/examples/simdag/dot/CMakeLists.txt @@ -34,7 +34,6 @@ endif() set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_dotload.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_dotload_notrace.tesh PARENT_SCOPE ) set(xml_files diff --git a/examples/simdag/dot/dot_test.c b/examples/simdag/dot/dot_test.c index 6f62578c4a..62a03edae1 100644 --- a/examples/simdag/dot/dot_test.c +++ b/examples/simdag/dot/dot_test.c @@ -8,7 +8,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/ex.h" #include diff --git a/examples/simdag/dot/dot_test2.c b/examples/simdag/dot/dot_test2.c index d065aad847..ece779728f 100644 --- a/examples/simdag/dot/dot_test2.c +++ b/examples/simdag/dot/dot_test2.c @@ -8,7 +8,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/ex.h" #include diff --git a/examples/simdag/dot/ptg_test.c b/examples/simdag/dot/ptg_test.c index cdaf55547b..c55d032e6b 100644 --- a/examples/simdag/dot/ptg_test.c +++ b/examples/simdag/dot/ptg_test.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/ex.h" #include diff --git a/examples/simdag/dot/simulate_dot.c b/examples/simdag/dot/simulate_dot.c index e16cb56819..a94f8fcc45 100644 --- a/examples/simdag/dot/simulate_dot.c +++ b/examples/simdag/dot/simulate_dot.c @@ -8,7 +8,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/ex.h" #include diff --git a/examples/simdag/goal/goal_test.c b/examples/simdag/goal/goal_test.c index fa2251f6f1..f326cce9a0 100644 --- a/examples/simdag/goal/goal_test.c +++ b/examples/simdag/goal/goal_test.c @@ -13,7 +13,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/ex.h" #include diff --git a/examples/simdag/io/sd_io.c b/examples/simdag/io/sd_io.c index 990144fbc1..d1f12214f6 100644 --- a/examples/simdag/io/sd_io.c +++ b/examples/simdag/io/sd_io.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" diff --git a/examples/simdag/metaxml/sd_meta.c b/examples/simdag/metaxml/sd_meta.c index d126b9d5f5..9cb6620e1d 100644 --- a/examples/simdag/metaxml/sd_meta.c +++ b/examples/simdag/metaxml/sd_meta.c @@ -10,7 +10,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/dynar.h" diff --git a/examples/simdag/properties/sd_prop.c b/examples/simdag/properties/sd_prop.c index c996fad4c6..bd15ece50e 100644 --- a/examples/simdag/properties/sd_prop.c +++ b/examples/simdag/properties/sd_prop.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/dynar.h" diff --git a/examples/simdag/scheduling/minmin_test.c b/examples/simdag/scheduling/minmin_test.c index 87907184d4..bbdd1b3139 100644 --- a/examples/simdag/scheduling/minmin_test.c +++ b/examples/simdag/scheduling/minmin_test.c @@ -8,7 +8,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/ex.h" #include diff --git a/examples/simdag/sd_avail.c b/examples/simdag/sd_avail.c index 51eec52c09..4873c11290 100644 --- a/examples/simdag/sd_avail.c +++ b/examples/simdag/sd_avail.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" diff --git a/examples/simdag/sd_comm_throttling.c b/examples/simdag/sd_comm_throttling.c index b43af3709a..b97e8117e4 100644 --- a/examples/simdag/sd_comm_throttling.c +++ b/examples/simdag/sd_comm_throttling.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" diff --git a/examples/simdag/sd_fail.c b/examples/simdag/sd_fail.c index eb1fd82cd7..df75380e38 100644 --- a/examples/simdag/sd_fail.c +++ b/examples/simdag/sd_fail.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" diff --git a/examples/simdag/sd_seq_access.c b/examples/simdag/sd_seq_access.c index e4cb0e6bff..c43d8fdb24 100644 --- a/examples/simdag/sd_seq_access.c +++ b/examples/simdag/sd_seq_access.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c index f3e1d5da56..e8befc700a 100644 --- a/examples/simdag/sd_test.c +++ b/examples/simdag/sd_test.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c index 781a7d4ef7..b566790dda 100644 --- a/examples/simdag/sd_test2.c +++ b/examples/simdag/sd_test2.c @@ -8,7 +8,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/sysdep.h" /* calloc, printf */ diff --git a/examples/simdag/sd_typed_tasks_test.c b/examples/simdag/sd_typed_tasks_test.c index c64bacb89c..758fede7e1 100644 --- a/examples/simdag/sd_typed_tasks_test.c +++ b/examples/simdag/sd_typed_tasks_test.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" diff --git a/examples/simdag/simdag_trace.c b/examples/simdag/simdag_trace.c index b93f1a219f..f2a64a8f7c 100644 --- a/examples/simdag/simdag_trace.c +++ b/examples/simdag/simdag_trace.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/ex.h" #include "xbt/log.h" diff --git a/include/simdag/datatypes.h b/include/simdag/datatypes.h deleted file mode 100644 index b4399cdfb6..0000000000 --- a/include/simdag/datatypes.h +++ /dev/null @@ -1,100 +0,0 @@ -/* Copyright (c) 2006, 2008-2014. 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. */ - -#ifndef SIMDAG_DATATYPES_H -#define SIMDAG_DATATYPES_H -#include "xbt/dict.h" - -/** @brief Workstation datatype - @ingroup SD_datatypes_management - - A workstation is a place where a task can be executed. - A workstation is represented as a physical - resource with computing capabilities and has a name. - - @see SD_workstation_management */ -typedef xbt_dictelm_t SD_workstation_t; - -/** @brief Workstation access mode - @ingroup SD_datatypes_management - - By default, a workstation resource is shared, i.e. several tasks - can be executed at the same time on a workstation. The CPU power of - the workstation is shared between the running tasks on the workstation. - In sequential mode, only one task can use the workstation, and the other - tasks wait in a FIFO. - - @see SD_workstation_get_access_mode(), SD_workstation_set_access_mode() */ -typedef enum { - SD_WORKSTATION_SHARED_ACCESS, /**< @brief Several tasks can be executed at the same time */ - SD_WORKSTATION_SEQUENTIAL_ACCESS /**< @brief Only one task can be executed, the others wait in a FIFO. */ -} e_SD_workstation_access_mode_t; - -typedef enum { - SD_LINK_SHARED, - SD_LINK_FATPIPE -} e_SD_link_sharing_policy_t; - -/** @brief Link datatype - @ingroup SD_datatypes_management - - A link is a network node represented as a name, a current - bandwidth and a current latency. A route is a list of - links between two workstations. - - @see SD_link_management */ -typedef struct SD_link *SD_link_t; - -/** @brief Task datatype - @ingroup SD_datatypes_management - - A task is some computing amount that can be executed - in parallel on several workstations. A task may depend on other - tasks, this means that the task cannot start until the other tasks are done. - Each task has a \ref e_SD_task_state_t "state" indicating whether - the task is scheduled, running, done, etc. - - @see SD_task_management */ -typedef struct SD_task *SD_task_t; - -/** @brief Task states - @ingroup SD_datatypes_management - - @see SD_task_management */ -typedef enum { - SD_NOT_SCHEDULED = 0, /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */ - SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */ - SD_SCHEDULED = 0x0002, /**< @brief A task becomes SD_SCHEDULED when you call function - SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */ - SD_RUNNABLE = 0x0004, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */ - SD_IN_FIFO = 0x0008, /**< @brief A runnable task can have to wait in a workstation fifo if the workstation is sequential */ - SD_RUNNING = 0x0010, /**< @brief An SD_RUNNABLE or SD_IN_FIFO becomes SD_RUNNING when it is launched. */ - SD_DONE = 0x0020, /**< @brief The task is successfully finished. */ - SD_FAILED = 0x0040 /**< @brief A problem occurred during the execution of the task. */ -} e_SD_task_state_t; - -/** @brief Task kinds - @ingroup SD_datatypes_management - - @see SD_task_management */ -typedef enum { - SD_TASK_NOT_TYPED = 0, /**< @brief no specified type */ - SD_TASK_COMM_E2E = 1, /**< @brief end to end communication */ - SD_TASK_COMP_SEQ = 2, /**< @brief sequential computation */ - SD_TASK_COMP_PAR_AMDAHL = 3, /**< @brief parallel computation (Amdahl's law) */ - SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */ -} e_SD_task_kind_t; - - -/** @brief Storage datatype - @ingroup SD_datatypes_management - - TODO PV: comment it ! - - @see SD_storage_management */ -typedef xbt_dictelm_t SD_storage_t; - -#endif diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h index 23ff7686df..f3d7640ce6 100644 --- a/include/simgrid/instr.h +++ b/include/simgrid/instr.h @@ -12,7 +12,7 @@ #include "xbt.h" #include "xbt/graph.h" #include "msg/msg.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /* * Functions to manage tracing categories diff --git a/include/simgrid/jedule/jedule_sd_binding.h b/include/simgrid/jedule/jedule_sd_binding.h index 4bed8e1510..a40f5640ff 100644 --- a/include/simgrid/jedule/jedule_sd_binding.h +++ b/include/simgrid/jedule/jedule_sd_binding.h @@ -8,9 +8,7 @@ #define JEDULE_SD_BINDING_H_ #include "simgrid_config.h" - -#include "simdag/datatypes.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #ifdef HAVE_JEDULE diff --git a/include/simdag/simdag.h b/include/simgrid/simdag.h similarity index 75% rename from include/simdag/simdag.h rename to include/simgrid/simdag.h index 1320955416..adcc3a0619 100644 --- a/include/simdag/simdag.h +++ b/include/simgrid/simdag.h @@ -7,13 +7,100 @@ #ifndef SIMDAG_SIMDAG_H #define SIMDAG_SIMDAG_H -#include "simdag/datatypes.h" #include "xbt/misc.h" #include "xbt/dynar.h" #include "xbt/dict.h" SG_BEGIN_DECL() +/** @brief Workstation datatype + @ingroup SD_datatypes_management + + A workstation is a place where a task can be executed. + A workstation is represented as a physical + resource with computing capabilities and has a name. + + @see SD_workstation_management */ +typedef xbt_dictelm_t SD_workstation_t; + +/** @brief Workstation access mode + @ingroup SD_datatypes_management + + By default, a workstation resource is shared, i.e. several tasks + can be executed at the same time on a workstation. The CPU power of + the workstation is shared between the running tasks on the workstation. + In sequential mode, only one task can use the workstation, and the other + tasks wait in a FIFO. + + @see SD_workstation_get_access_mode(), SD_workstation_set_access_mode() */ +typedef enum { + SD_WORKSTATION_SHARED_ACCESS, /**< @brief Several tasks can be executed at the same time */ + SD_WORKSTATION_SEQUENTIAL_ACCESS /**< @brief Only one task can be executed, the others wait in a FIFO. */ +} e_SD_workstation_access_mode_t; + +typedef enum { + SD_LINK_SHARED, + SD_LINK_FATPIPE +} e_SD_link_sharing_policy_t; + +/** @brief Link datatype + @ingroup SD_datatypes_management + + A link is a network node represented as a name, a current + bandwidth and a current latency. A route is a list of + links between two workstations. + + @see SD_link_management */ +typedef struct SD_link *SD_link_t; + +/** @brief Task datatype + @ingroup SD_datatypes_management + + A task is some computing amount that can be executed + in parallel on several workstations. A task may depend on other + tasks, this means that the task cannot start until the other tasks are done. + Each task has a \ref e_SD_task_state_t "state" indicating whether + the task is scheduled, running, done, etc. + + @see SD_task_management */ +typedef struct SD_task *SD_task_t; + +/** @brief Task states + @ingroup SD_datatypes_management + + @see SD_task_management */ +typedef enum { + SD_NOT_SCHEDULED = 0, /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */ + SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */ + SD_SCHEDULED = 0x0002, /**< @brief A task becomes SD_SCHEDULED when you call function + SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */ + SD_RUNNABLE = 0x0004, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */ + SD_IN_FIFO = 0x0008, /**< @brief A runnable task can have to wait in a workstation fifo if the workstation is sequential */ + SD_RUNNING = 0x0010, /**< @brief An SD_RUNNABLE or SD_IN_FIFO becomes SD_RUNNING when it is launched. */ + SD_DONE = 0x0020, /**< @brief The task is successfully finished. */ + SD_FAILED = 0x0040 /**< @brief A problem occurred during the execution of the task. */ +} e_SD_task_state_t; + +/** @brief Task kinds + @ingroup SD_datatypes_management + + @see SD_task_management */ +typedef enum { + SD_TASK_NOT_TYPED = 0, /**< @brief no specified type */ + SD_TASK_COMM_E2E = 1, /**< @brief end to end communication */ + SD_TASK_COMP_SEQ = 2, /**< @brief sequential computation */ + SD_TASK_COMP_PAR_AMDAHL = 3, /**< @brief parallel computation (Amdahl's law) */ + SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */ +} e_SD_task_kind_t; + + +/** @brief Storage datatype + @ingroup SD_datatypes_management + + TODO PV: comment it ! + + @see SD_storage_management */ +typedef xbt_dictelm_t SD_storage_t; /************************** AS handling *************************************/ XBT_PUBLIC(xbt_dict_t) SD_as_router_get_properties(const char *as); diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c index 2098267bac..dc9d45a2ae 100644 --- a/src/bindings/lua/simgrid_lua.c +++ b/src/bindings/lua/simgrid_lua.c @@ -11,7 +11,7 @@ #include "lua_utils.h" #include "xbt.h" #include "msg/msg.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "surf/surfxml_parse.h" #include diff --git a/src/simdag/instr_sd_task.c b/src/simdag/instr_sd_task.c index 9c9cdf82c3..a30923bee8 100644 --- a/src/simdag/instr_sd_task.c +++ b/src/simdag/instr_sd_task.c @@ -6,8 +6,7 @@ #include "instr/instr_private.h" #include "private.h" -#include "simdag/datatypes.h" - +#include "simgrid/simdag.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_sd, instr, "SD"); diff --git a/src/simdag/private.h b/src/simdag/private.h index 9ca6e2cbfa..67e9e7beab 100644 --- a/src/simdag/private.h +++ b/src/simdag/private.h @@ -10,8 +10,7 @@ #include "xbt/dict.h" #include "xbt/dynar.h" #include "xbt/fifo.h" -#include "simdag/simdag.h" -#include "simdag/datatypes.h" +#include "simgrid/simdag.h" #include "surf/surf.h" #include "xbt/swag.h" #include "xbt/mallocator.h" diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c index e26f393089..a1b942ef51 100644 --- a/src/simdag/sd_daxloader.c +++ b/src/simdag/sd_daxloader.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/misc.h" #include "xbt/log.h" #include diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c index 8eaa8a03f9..e40a053f75 100644 --- a/src/simdag/sd_dotloader.c +++ b/src/simdag/sd_dotloader.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/misc.h" #include "xbt/log.h" #include diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c index b59b1b407f..a79cd28577 100644 --- a/src/simdag/sd_link.c +++ b/src/simdag/sd_link.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/dict.h" #include "xbt/sysdep.h" #include "surf/surf.h" diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c index 4515ea9c10..9ab54e6cde 100644 --- a/src/simdag/sd_task.c +++ b/src/simdag/sd_task.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/sysdep.h" #include "xbt/dynar.h" #include "instr/instr_private.h" diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index 01aff11360..a803804496 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/dict.h" #include "xbt/lib.h" #include "xbt/sysdep.h" diff --git a/teshsuite/simdag/availability/availability_test.c b/teshsuite/simdag/availability/availability_test.c index 0bec635890..9389625db9 100644 --- a/teshsuite/simdag/availability/availability_test.c +++ b/teshsuite/simdag/availability/availability_test.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/teshsuite/simdag/basic/basic0.c b/teshsuite/simdag/basic/basic0.c index 2961efdd87..9488361fd0 100644 --- a/teshsuite/simdag/basic/basic0.c +++ b/teshsuite/simdag/basic/basic0.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic0, sd, "SimDag test basic0"); diff --git a/teshsuite/simdag/basic/basic1.c b/teshsuite/simdag/basic/basic1.c index 48b79528a6..6d13dc7190 100644 --- a/teshsuite/simdag/basic/basic1.c +++ b/teshsuite/simdag/basic/basic1.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic1, sd, "SimDag test basic1"); diff --git a/teshsuite/simdag/basic/basic2.c b/teshsuite/simdag/basic/basic2.c index 44e6d7bde9..620f47a793 100644 --- a/teshsuite/simdag/basic/basic2.c +++ b/teshsuite/simdag/basic/basic2.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic2, sd, "SimDag test basic2"); diff --git a/teshsuite/simdag/basic/basic3.c b/teshsuite/simdag/basic/basic3.c index 273e1177ad..f4ebf046b6 100644 --- a/teshsuite/simdag/basic/basic3.c +++ b/teshsuite/simdag/basic/basic3.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic3, sd, "SimDag test basic3"); diff --git a/teshsuite/simdag/basic/basic4.c b/teshsuite/simdag/basic/basic4.c index 0005e04d3a..52da3c9198 100644 --- a/teshsuite/simdag/basic/basic4.c +++ b/teshsuite/simdag/basic/basic4.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic4, sd, "SimDag test basic4"); diff --git a/teshsuite/simdag/basic/basic5.c b/teshsuite/simdag/basic/basic5.c index 9dfa416dd4..bf94828be1 100644 --- a/teshsuite/simdag/basic/basic5.c +++ b/teshsuite/simdag/basic/basic5.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic5, sd, "SimDag test basic5"); diff --git a/teshsuite/simdag/basic/basic6.c b/teshsuite/simdag/basic/basic6.c index bd1de6cd5f..7f1cbb8cbc 100644 --- a/teshsuite/simdag/basic/basic6.c +++ b/teshsuite/simdag/basic/basic6.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/asserts.h" #include "xbt/log.h" diff --git a/teshsuite/simdag/incomplete/incomplete.c b/teshsuite/simdag/incomplete/incomplete.c index b82a105e86..267614a3da 100644 --- a/teshsuite/simdag/incomplete/incomplete.c +++ b/teshsuite/simdag/incomplete/incomplete.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(incomplete, sd, "SimDag incomplete test"); diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.c b/teshsuite/simdag/network/mxn/test_intra_all2all.c index e864eb5ab4..cf95a0a1bc 100644 --- a/teshsuite/simdag/network/mxn/test_intra_all2all.c +++ b/teshsuite/simdag/network/mxn/test_intra_all2all.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /* * intra communication test diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.c b/teshsuite/simdag/network/mxn/test_intra_independent_comm.c index e7baa31af0..58d483757c 100644 --- a/teshsuite/simdag/network/mxn/test_intra_independent_comm.c +++ b/teshsuite/simdag/network/mxn/test_intra_independent_comm.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /* * intra communication test diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.c b/teshsuite/simdag/network/mxn/test_intra_scatter.c index c0efc7632f..00c157b94f 100644 --- a/teshsuite/simdag/network/mxn/test_intra_scatter.c +++ b/teshsuite/simdag/network/mxn/test_intra_scatter.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /* * intra communication test 1 diff --git a/teshsuite/simdag/network/p2p/test_latency1.c b/teshsuite/simdag/network/p2p/test_latency1.c index 51080ceaad..f3987b1fc2 100644 --- a/teshsuite/simdag/network/p2p/test_latency1.c +++ b/teshsuite/simdag/network/p2p/test_latency1.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /* * simple latency test diff --git a/teshsuite/simdag/network/p2p/test_latency2.c b/teshsuite/simdag/network/p2p/test_latency2.c index 70d584c172..077f722d21 100644 --- a/teshsuite/simdag/network/p2p/test_latency2.c +++ b/teshsuite/simdag/network/p2p/test_latency2.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /* diff --git a/teshsuite/simdag/network/p2p/test_latency3.c b/teshsuite/simdag/network/p2p/test_latency3.c index 5d314201e9..e224bd9a36 100644 --- a/teshsuite/simdag/network/p2p/test_latency3.c +++ b/teshsuite/simdag/network/p2p/test_latency3.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /** * bw and latency test 3 diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.c b/teshsuite/simdag/network/p2p/test_latency_bound.c index 694a5c3de5..250af33c53 100644 --- a/teshsuite/simdag/network/p2p/test_latency_bound.c +++ b/teshsuite/simdag/network/p2p/test_latency_bound.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #define TASK_NUM 3 diff --git a/teshsuite/simdag/network/test_reinit_costs.c b/teshsuite/simdag/network/test_reinit_costs.c index fa9e319c4b..9e946a8d04 100644 --- a/teshsuite/simdag/network/test_reinit_costs.c +++ b/teshsuite/simdag/network/test_reinit_costs.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /* * This test checks if the reinitialization of diff --git a/teshsuite/simdag/partask/test_comp_only_par.c b/teshsuite/simdag/partask/test_comp_only_par.c index b1c7480571..92e45bff05 100644 --- a/teshsuite/simdag/partask/test_comp_only_par.c +++ b/teshsuite/simdag/partask/test_comp_only_par.c @@ -7,7 +7,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" int main(int argc, char **argv) { diff --git a/teshsuite/simdag/partask/test_comp_only_seq.c b/teshsuite/simdag/partask/test_comp_only_seq.c index 5b24395b6f..589830044c 100644 --- a/teshsuite/simdag/partask/test_comp_only_seq.c +++ b/teshsuite/simdag/partask/test_comp_only_seq.c @@ -7,7 +7,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" int main(int argc, char **argv) { diff --git a/teshsuite/simdag/platforms/Evaluate_get_route_time.c b/teshsuite/simdag/platforms/Evaluate_get_route_time.c index 03285b7aa4..8f06e05d8c 100644 --- a/teshsuite/simdag/platforms/Evaluate_get_route_time.c +++ b/teshsuite/simdag/platforms/Evaluate_get_route_time.c @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "surf/surf_private.h" #include "xbt/xbt_os_time.h" diff --git a/teshsuite/simdag/platforms/Evaluate_parse_time.c b/teshsuite/simdag/platforms/Evaluate_parse_time.c index a291e6d759..0e6c645bc4 100644 --- a/teshsuite/simdag/platforms/Evaluate_parse_time.c +++ b/teshsuite/simdag/platforms/Evaluate_parse_time.c @@ -8,7 +8,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "surf/surf_private.h" #include "xbt/xbt_os_time.h" diff --git a/teshsuite/simdag/platforms/basic_link_test.c b/teshsuite/simdag/platforms/basic_link_test.c index 5a484e3411..c7c3b717bd 100644 --- a/teshsuite/simdag/platforms/basic_link_test.c +++ b/teshsuite/simdag/platforms/basic_link_test.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "surf/surf_private.h" #include "xbt/log.h" diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c index f34e57f899..d701c1dc13 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.c +++ b/teshsuite/simdag/platforms/basic_parsing_test.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "surf/surf_private.h" int main(int argc, char **argv) diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c index 5c33f70653..a9c1c256e2 100644 --- a/teshsuite/simdag/platforms/flatifier.c +++ b/teshsuite/simdag/platforms/flatifier.c @@ -15,7 +15,7 @@ #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/dict.h" #include "xbt/ex.h" diff --git a/teshsuite/simdag/platforms/is_router_test.c b/teshsuite/simdag/platforms/is_router_test.c index 9ad9de83f8..ee97d65a79 100644 --- a/teshsuite/simdag/platforms/is_router_test.c +++ b/teshsuite/simdag/platforms/is_router_test.c @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "surf/surf_private.h" extern routing_platf_t routing_platf;