From: Martin Quinson Date: Sat, 4 Apr 2015 20:24:23 +0000 (+0200) Subject: mv msg/msg.h simgrid/msg.h X-Git-Tag: v3_12~738^2~7 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ed9b07e5c0c7eb6d4d38b0fe5aaea80d6996a8a7 mv msg/msg.h simgrid/msg.h --- diff --git a/ChangeLog b/ChangeLog index 1bc285f78b..5aa44d4ec1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,8 @@ SimGrid (3.12) NOT RELEASED; urgency=low - instr/jedule/* -> simgrid/jedule - simdag/datatypes.h was removed - simdag/simdag.h -> simgrid/simdag.h + - msg/datatypes.h was removed + - msg/msg.h -> simgrid/msg.h -- $date Da SimGrid team diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index cf023bf99b..7d18a4f464 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -631,8 +631,7 @@ set(MC_SRC set(headers_to_install include/simgrid/instr.h - include/msg/datatypes.h - include/msg/msg.h + include/simgrid/msg.h include/simgrid/simdag.h include/simgrid.h include/simgrid/datatypes.h diff --git a/doc/msg-tuto-src/masterworker0.c b/doc/msg-tuto-src/masterworker0.c index b283dc5285..328cef16c9 100644 --- a/doc/msg-tuto-src/masterworker0.c +++ b/doc/msg-tuto-src/masterworker0.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/doc/msg-tuto-src/masterworker1.c b/doc/msg-tuto-src/masterworker1.c index 5b240e354a..4ace831831 100644 --- a/doc/msg-tuto-src/masterworker1.c +++ b/doc/msg-tuto-src/masterworker1.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/doc/msg-tuto-src/masterworker2.c b/doc/msg-tuto-src/masterworker2.c index aa038972b9..f3b92c6cd9 100644 --- a/doc/msg-tuto-src/masterworker2.c +++ b/doc/msg-tuto-src/masterworker2.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/doc/msg-tuto-src/masterworker3.c b/doc/msg-tuto-src/masterworker3.c index c2891d5d29..0f6c7a194e 100644 --- a/doc/msg-tuto-src/masterworker3.c +++ b/doc/msg-tuto-src/masterworker3.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/doc/msg-tuto-src/masterworker4.c b/doc/msg-tuto-src/masterworker4.c index 1f4bb5073a..c73cc7e9a9 100644 --- a/doc/msg-tuto-src/masterworker4.c +++ b/doc/msg-tuto-src/masterworker4.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index af24651272..c48611f1cc 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "simgrid/simix.h" /* semaphores for the barrier */ #include "xbt.h" /* calloc, printf */ #include "instr/instr_private.h" diff --git a/examples/msg/bittorrent/bittorrent.c b/examples/msg/bittorrent/bittorrent.c index 0ad478188e..a1d9b76897 100644 --- a/examples/msg/bittorrent/bittorrent.c +++ b/examples/msg/bittorrent/bittorrent.c @@ -7,7 +7,7 @@ #include "bittorrent.h" #include "peer.h" #include "tracker.h" -#include +#include #include /** diff --git a/examples/msg/bittorrent/bittorrent_platfgen.c b/examples/msg/bittorrent/bittorrent_platfgen.c index 9afada064b..5d333c412e 100644 --- a/examples/msg/bittorrent/bittorrent_platfgen.c +++ b/examples/msg/bittorrent/bittorrent_platfgen.c @@ -7,7 +7,7 @@ #include "bittorrent.h" #include "peer.h" #include "tracker.h" -#include +#include #include /** * Bittorrent example launcher, using a generated platform diff --git a/examples/msg/bittorrent/messages.h b/examples/msg/bittorrent/messages.h index dab23afb66..023e23e1b2 100644 --- a/examples/msg/bittorrent/messages.h +++ b/examples/msg/bittorrent/messages.h @@ -6,7 +6,7 @@ #ifndef BITTORRENT_MESSAGES_H_ #define BITTORRENT_MESSAGES_H_ -#include +#include /** * Message sizes diff --git a/examples/msg/bittorrent/peer.c b/examples/msg/bittorrent/peer.c index 19232336c5..a614b0daf2 100644 --- a/examples/msg/bittorrent/peer.c +++ b/examples/msg/bittorrent/peer.c @@ -8,7 +8,7 @@ #include "tracker.h" #include "connection.h" #include "messages.h" -#include +#include #include #include diff --git a/examples/msg/bittorrent/peer.h b/examples/msg/bittorrent/peer.h index e64a2d2357..5c6dfa3e1e 100644 --- a/examples/msg/bittorrent/peer.h +++ b/examples/msg/bittorrent/peer.h @@ -6,7 +6,7 @@ #ifndef BITTORRENT_PEER_H #define BITTORRENT_PEER_H -#include +#include #include #include #include diff --git a/examples/msg/bittorrent/tracker.c b/examples/msg/bittorrent/tracker.c index 631a4560b8..4c32db8ada 100644 --- a/examples/msg/bittorrent/tracker.c +++ b/examples/msg/bittorrent/tracker.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "tracker.h" -#include +#include #include static void task_free(void *data); diff --git a/examples/msg/chainsend/broadcaster.h b/examples/msg/chainsend/broadcaster.h index 2b066565f0..1d1afc9559 100644 --- a/examples/msg/chainsend/broadcaster.h +++ b/examples/msg/chainsend/broadcaster.h @@ -7,7 +7,7 @@ #ifndef KADEPLOY_BROADCASTER_H #define KADEPLOY_BROADCASTER_H -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/chainsend/chainsend.c b/examples/msg/chainsend/chainsend.c index e8a4d199e3..05a336dfc8 100644 --- a/examples/msg/chainsend/chainsend.c +++ b/examples/msg/chainsend/chainsend.c @@ -7,7 +7,7 @@ #include #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/chainsend/common.h b/examples/msg/chainsend/common.h index 2336685f5b..26268361c7 100644 --- a/examples/msg/chainsend/common.h +++ b/examples/msg/chainsend/common.h @@ -7,7 +7,7 @@ #ifndef KADEPLOY_COMMON_H #define KADEPLOY_COMMON_H -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" static XBT_INLINE void queue_pending_connection(msg_comm_t comm, xbt_dynar_t q) diff --git a/examples/msg/chainsend/messages.h b/examples/msg/chainsend/messages.h index b717d5c0dc..4be0fcef06 100644 --- a/examples/msg/chainsend/messages.h +++ b/examples/msg/chainsend/messages.h @@ -7,7 +7,7 @@ #ifndef KADEPLOY_MESSAGES_H #define KADEPLOY_MESSAGES_H -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" #define MESSAGE_BUILD_CHAIN_SIZE 40 diff --git a/examples/msg/chainsend/peer.h b/examples/msg/chainsend/peer.h index 63f5a0ebe7..5acc81bfb2 100644 --- a/examples/msg/chainsend/peer.h +++ b/examples/msg/chainsend/peer.h @@ -7,7 +7,7 @@ #ifndef KADEPLOY_PEER_H #define KADEPLOY_PEER_H -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" #include "messages.h" diff --git a/examples/msg/chord/chord.c b/examples/msg/chord/chord.c index 96105a851e..2cf32341fc 100644 --- a/examples/msg/chord/chord.c +++ b/examples/msg/chord/chord.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" #include "simgrid/modelchecker.h" diff --git a/examples/msg/cloud/bound.c b/examples/msg/cloud/bound.c index ee5fc4971a..1eba3d4203 100644 --- a/examples/msg/cloud/bound.c +++ b/examples/msg/cloud/bound.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/cloud/master_worker_vm.c b/examples/msg/cloud/master_worker_vm.c index af24f85a88..3d1fb4cbe6 100644 --- a/examples/msg/cloud/master_worker_vm.c +++ b/examples/msg/cloud/master_worker_vm.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/cloud/migrate_vm.c b/examples/msg/cloud/migrate_vm.c index 7d263c7953..03a08be718 100644 --- a/examples/msg/cloud/migrate_vm.c +++ b/examples/msg/cloud/migrate_vm.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/cloud/multicore.c b/examples/msg/cloud/multicore.c index 64a00c39c9..efdb5109db 100644 --- a/examples/msg/cloud/multicore.c +++ b/examples/msg/cloud/multicore.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/cloud/scale.c b/examples/msg/cloud/scale.c index 54a0bfec9b..69db3e9b84 100644 --- a/examples/msg/cloud/scale.c +++ b/examples/msg/cloud/scale.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/cloud/simple_vm.c b/examples/msg/cloud/simple_vm.c index 624bdc47a8..3d10a25bc8 100644 --- a/examples/msg/cloud/simple_vm.c +++ b/examples/msg/cloud/simple_vm.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/cloud/two_tasks_vm.c b/examples/msg/cloud/two_tasks_vm.c index 0e2aaabea3..489c90ede6 100644 --- a/examples/msg/cloud/two_tasks_vm.c +++ b/examples/msg/cloud/two_tasks_vm.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/examples/msg/energy/e2/e2.c b/examples/msg/energy/e2/e2.c index dbfe96f729..822f1d7aad 100644 --- a/examples/msg/energy/e2/e2.c +++ b/examples/msg/energy/e2/e2.c @@ -6,7 +6,7 @@ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc */ #include "simgrid/plugins.h" diff --git a/examples/msg/energy/e3/e3.c b/examples/msg/energy/e3/e3.c index 57d3c99e62..5f31fb11cc 100644 --- a/examples/msg/energy/e3/e3.c +++ b/examples/msg/energy/e3/e3.c @@ -6,7 +6,7 @@ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc */ #include "simgrid/plugins.h" diff --git a/examples/msg/energy/pstate/pstate.c b/examples/msg/energy/pstate/pstate.c index bfbb0c0ae8..f7e7cad81e 100644 --- a/examples/msg/energy/pstate/pstate.c +++ b/examples/msg/energy/pstate/pstate.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/exception/exception.c b/examples/msg/exception/exception.c index 044b0f1f30..8059cd81ad 100644 --- a/examples/msg/exception/exception.c +++ b/examples/msg/exception/exception.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" +#include "simgrid/msg.h" #include "xbt.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test_exception, diff --git a/examples/msg/gpu/test_MSG_gpu_task_create.c b/examples/msg/gpu/test_MSG_gpu_task_create.c index c968e89ff9..a7e0d89204 100644 --- a/examples/msg/gpu/test_MSG_gpu_task_create.c +++ b/examples/msg/gpu/test_MSG_gpu_task_create.c @@ -11,7 +11,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c index eb7a88054e..26da94d6ab 100644 --- a/examples/msg/gtnets/gtnets.c +++ b/examples/msg/gtnets/gtnets.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" diff --git a/examples/msg/icomms/peer.c b/examples/msg/icomms/peer.c index 59f0d3ef0c..4c446e8f7c 100644 --- a/examples/msg/icomms/peer.c +++ b/examples/msg/icomms/peer.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/icomms/peer2.c b/examples/msg/icomms/peer2.c index d7542706b9..0eca9287a1 100644 --- a/examples/msg/icomms/peer2.c +++ b/examples/msg/icomms/peer2.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/icomms/peer3.c b/examples/msg/icomms/peer3.c index 2026f880c4..7dca7de20a 100644 --- a/examples/msg/icomms/peer3.c +++ b/examples/msg/icomms/peer3.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ #include /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c index 6d7b63517f..a02ce1c74a 100644 --- a/examples/msg/io/file.c +++ b/examples/msg/io/file.c @@ -22,7 +22,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "surf/surf_private.h" int host(int argc, char *argv[]); diff --git a/examples/msg/io/file_unlink.c b/examples/msg/io/file_unlink.c index 9fc88ca303..4e5e58191c 100644 --- a/examples/msg/io/file_unlink.c +++ b/examples/msg/io/file_unlink.c @@ -13,7 +13,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "surf/surf_private.h" int host(int argc, char *argv[]); diff --git a/examples/msg/io/remote.c b/examples/msg/io/remote.c index bb88246915..620ab8133f 100644 --- a/examples/msg/io/remote.c +++ b/examples/msg/io/remote.c @@ -11,7 +11,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "surf/surf_private.h" #define INMEGA (1024*1024) diff --git a/examples/msg/io/storage.c b/examples/msg/io/storage.c index 821d3987e3..579f0611bd 100644 --- a/examples/msg/io/storage.c +++ b/examples/msg/io/storage.c @@ -23,7 +23,7 @@ * ******************************************************************************/ -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/dict.h" diff --git a/examples/msg/kademlia/kademlia.c b/examples/msg/kademlia/kademlia.c index 5f9bb6aec9..f5424445bf 100644 --- a/examples/msg/kademlia/kademlia.c +++ b/examples/msg/kademlia/kademlia.c @@ -8,7 +8,7 @@ #include "node.h" #include "task.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" /** @addtogroup MSG_examples diff --git a/examples/msg/kademlia/node.c b/examples/msg/kademlia/node.c index 574afbefff..49c9345ecd 100644 --- a/examples/msg/kademlia/node.c +++ b/examples/msg/kademlia/node.c @@ -7,7 +7,7 @@ #include "node.h" #include "routing_table.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_kademlia_node, diff --git a/examples/msg/kademlia/node.h b/examples/msg/kademlia/node.h index e93549b7c8..2539528db1 100644 --- a/examples/msg/kademlia/node.h +++ b/examples/msg/kademlia/node.h @@ -7,7 +7,7 @@ #ifndef _MSG_EXAMPLES_ROUTING_H #define _MSG_EXAMPLES_ROUTING_H #include "xbt/dynar.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "common.h" diff --git a/examples/msg/kademlia/routing_table.c b/examples/msg/kademlia/routing_table.c index 3d1fcb12bc..774fe0c0e2 100644 --- a/examples/msg/kademlia/routing_table.c +++ b/examples/msg/kademlia/routing_table.c @@ -6,7 +6,7 @@ #include "routing_table.h" #include "node.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_kademlia_routing_table, diff --git a/examples/msg/kademlia/task.h b/examples/msg/kademlia/task.h index 49245499b6..4aca3126c7 100644 --- a/examples/msg/kademlia/task.h +++ b/examples/msg/kademlia/task.h @@ -8,7 +8,7 @@ #define _MSG_KADEMLIA_EXAMPLES_TASK #include "common.h" #include "node.h" -#include "msg/msg.h" +#include "simgrid/msg.h" /** * Types of tasks exchanged */ diff --git a/examples/msg/masterslave/masterslave_arg.c b/examples/msg/masterslave/masterslave_arg.c index 7bf9f87e25..4facb5a9fe 100644 --- a/examples/msg/masterslave/masterslave_arg.c +++ b/examples/msg/masterslave/masterslave_arg.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c index ab3902a07f..6ba7bc545f 100644 --- a/examples/msg/masterslave/masterslave_bypass.c +++ b/examples/msg/masterslave/masterslave_bypass.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c index 085d574a9e..dbb760c2ff 100644 --- a/examples/msg/masterslave/masterslave_cluster.c +++ b/examples/msg/masterslave/masterslave_cluster.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c index 90ffa8752c..1591b85113 100644 --- a/examples/msg/masterslave/masterslave_failure.c +++ b/examples/msg/masterslave/masterslave_failure.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/masterslave/masterslave_failure_platfgen.c b/examples/msg/masterslave/masterslave_failure_platfgen.c index ee179e572a..3f030c17b2 100644 --- a/examples/msg/masterslave/masterslave_failure_platfgen.c +++ b/examples/msg/masterslave/masterslave_failure_platfgen.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c index 7aa886143c..7754529667 100644 --- a/examples/msg/masterslave/masterslave_forwarder.c +++ b/examples/msg/masterslave/masterslave_forwarder.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/masterslave/masterslave_kill.c b/examples/msg/masterslave/masterslave_kill.c index 394bb3f097..9c8e09ec34 100644 --- a/examples/msg/masterslave/masterslave_kill.c +++ b/examples/msg/masterslave/masterslave_kill.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c index b9f8af621a..7a23c471f9 100644 --- a/examples/msg/masterslave/masterslave_mailbox.c +++ b/examples/msg/masterslave/masterslave_mailbox.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/masterslave/masterslave_platfgen.c b/examples/msg/masterslave/masterslave_platfgen.c index 11d3c2fec7..134fae7ae4 100644 --- a/examples/msg/masterslave/masterslave_platfgen.c +++ b/examples/msg/masterslave/masterslave_platfgen.c @@ -6,7 +6,7 @@ #include "simgrid/platf_generator.h" #include "xbt.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_CATEGORY(test_generation, diff --git a/examples/msg/mc/bugged1_liveness.c b/examples/msg/mc/bugged1_liveness.c index 5143623f2e..50ad0ae3f4 100644 --- a/examples/msg/mc/bugged1_liveness.c +++ b/examples/msg/mc/bugged1_liveness.c @@ -16,7 +16,7 @@ #include #endif -#include "msg/msg.h" +#include "simgrid/msg.h" #include "mc/mc.h" #include "xbt/automaton.h" #include "bugged1_liveness.h" diff --git a/examples/msg/mc/bugged2_liveness.c b/examples/msg/mc/bugged2_liveness.c index d6beac0f42..3cdb50a211 100644 --- a/examples/msg/mc/bugged2_liveness.c +++ b/examples/msg/mc/bugged2_liveness.c @@ -10,7 +10,7 @@ /* LTL property checked : !(GFcs) */ /******************************************************************************/ -#include "msg/msg.h" +#include "simgrid/msg.h" #include "mc/mc.h" #include "xbt/automaton.h" #include "bugged2_liveness.h" diff --git a/examples/msg/mc/centralized_mutex.c b/examples/msg/mc/centralized_mutex.c index d7231e1a2c..2d8b231ab9 100644 --- a/examples/msg/mc/centralized_mutex.c +++ b/examples/msg/mc/centralized_mutex.c @@ -10,7 +10,7 @@ /* reduction of DPOR. */ /******************************************************************************/ -#include "msg/msg.h" +#include "simgrid/msg.h" #define AMOUNT_OF_CLIENTS 4 #define CS_PER_PROCESS 2 diff --git a/examples/msg/migration/migration.c b/examples/msg/migration/migration.c index 23195981ae..ef06bf147e 100644 --- a/examples/msg/migration/migration.c +++ b/examples/msg/migration/migration.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" /* core library */ +#include "simgrid/msg.h" /* core library */ #include "xbt/sysdep.h" /* calloc */ #include "xbt/synchro_core.h" diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c index 2b10ef2c63..734403933b 100644 --- a/examples/msg/ns3/ns3.c +++ b/examples/msg/ns3/ns3.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" diff --git a/examples/msg/parallel_task/parallel_task.c b/examples/msg/parallel_task/parallel_task.c index a3dda645e1..01d772d8ee 100644 --- a/examples/msg/parallel_task/parallel_task.c +++ b/examples/msg/parallel_task/parallel_task.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c index 8626a98026..189a26c754 100644 --- a/examples/msg/parallel_task/test_ptask.c +++ b/examples/msg/parallel_task/test_ptask.c @@ -5,8 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you - need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/pastry/pastry.c b/examples/msg/pastry/pastry.c index da3f463757..3c33770c82 100644 --- a/examples/msg/pastry/pastry.c +++ b/examples/msg/pastry/pastry.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" diff --git a/examples/msg/pmm/msg_pmm.c b/examples/msg/pmm/msg_pmm.c index 59d9e1b3bb..209cc333f6 100644 --- a/examples/msg/pmm/msg_pmm.c +++ b/examples/msg/pmm/msg_pmm.c @@ -6,7 +6,7 @@ /* 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 "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/matrix.h" #include "xbt/log.h" diff --git a/examples/msg/priority/priority.c b/examples/msg/priority/priority.c index 43258ddc8a..2fd25c3bb5 100644 --- a/examples/msg/priority/priority.c +++ b/examples/msg/priority/priority.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c index c9e881f9f7..d46055026c 100644 --- a/examples/msg/properties/msg_prop.c +++ b/examples/msg/properties/msg_prop.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/semaphores/synchro.c b/examples/msg/semaphores/synchro.c index cc10147595..01dcd02834 100644 --- a/examples/msg/semaphores/synchro.c +++ b/examples/msg/semaphores/synchro.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_semaphore_example, diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c index cca42acbd5..2c9c15db48 100644 --- a/examples/msg/sendrecv/sendrecv.c +++ b/examples/msg/sendrecv/sendrecv.c @@ -6,7 +6,7 @@ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/start_kill_time/sk_time.c b/examples/msg/start_kill_time/sk_time.c index 72ce30c6fb..af50303903 100644 --- a/examples/msg/start_kill_time/sk_time.c +++ b/examples/msg/start_kill_time/sk_time.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/suspend/suspend.c b/examples/msg/suspend/suspend.c index b12fbf4a1e..ac59867221 100644 --- a/examples/msg/suspend/suspend.c +++ b/examples/msg/suspend/suspend.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/token_ring/ring_call.c b/examples/msg/token_ring/ring_call.c index dd6107f523..dd69d862cb 100644 --- a/examples/msg/token_ring/ring_call.c +++ b/examples/msg/token_ring/ring_call.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "surf/surf_private.h" int host(int argc, char *argv[]); diff --git a/examples/msg/token_ring/token_bypass.c b/examples/msg/token_ring/token_bypass.c index 7522792a2e..5f97241d60 100644 --- a/examples/msg/token_ring/token_bypass.c +++ b/examples/msg/token_ring/token_bypass.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "surf/surf_private.h" int host(int argc, char *argv[]); diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c index 238e8ef72c..77bd084c94 100644 --- a/examples/msg/tracing/categories.c +++ b/examples/msg/tracing/categories.c @@ -21,7 +21,7 @@ */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/tracing/link_srcdst_user_variables.c b/examples/msg/tracing/link_srcdst_user_variables.c index f9c4c22b4f..b47b1c6c03 100644 --- a/examples/msg/tracing/link_srcdst_user_variables.c +++ b/examples/msg/tracing/link_srcdst_user_variables.c @@ -4,7 +4,7 @@ /* 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 /** @addtogroup MSG_examples * diff --git a/examples/msg/tracing/link_user_variables.c b/examples/msg/tracing/link_user_variables.c index 1ee390dabe..7170bc15a6 100644 --- a/examples/msg/tracing/link_user_variables.c +++ b/examples/msg/tracing/link_user_variables.c @@ -4,7 +4,7 @@ /* 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 /** @addtogroup MSG_examples * diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c index aed734ede0..9d6e65402f 100644 --- a/examples/msg/tracing/ms.c +++ b/examples/msg/tracing/ms.c @@ -20,7 +20,7 @@ */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c index 1c832b7ffb..94562ac7d1 100644 --- a/examples/msg/tracing/procmig.c +++ b/examples/msg/tracing/procmig.c @@ -16,7 +16,7 @@ * (See \ref tracing_tracing_options for details) */ -#include "msg/msg.h" /* core library */ +#include "simgrid/msg.h" /* core library */ #include "xbt/sysdep.h" /* calloc */ /* Create a log channel to have nice outputs. */ diff --git a/examples/msg/tracing/simple.c b/examples/msg/tracing/simple.c index 6f9e6866b2..b79970d046 100644 --- a/examples/msg/tracing/simple.c +++ b/examples/msg/tracing/simple.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /** @addtogroup MSG_examples diff --git a/examples/msg/tracing/trace_platform.c b/examples/msg/tracing/trace_platform.c index 026524ff55..da2fd446d3 100644 --- a/examples/msg/tracing/trace_platform.c +++ b/examples/msg/tracing/trace_platform.c @@ -16,7 +16,7 @@ */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ #include "xbt/log.h" diff --git a/examples/msg/tracing/user_variables.c b/examples/msg/tracing/user_variables.c index 4b585c344a..e5035dbc5a 100644 --- a/examples/msg/tracing/user_variables.c +++ b/examples/msg/tracing/user_variables.c @@ -15,7 +15,7 @@ */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/examples/smpi/replay_multiple/replay_multiple.c b/examples/smpi/replay_multiple/replay_multiple.c index 9c1340f914..e45ac6fae7 100644 --- a/examples/smpi/replay_multiple/replay_multiple.c +++ b/examples/smpi/replay_multiple/replay_multiple.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ #include "mpi.h" /* Create a log channel to have nice outputs. */ diff --git a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c index f36ee995a1..79ee7eeed9 100644 --- a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c +++ b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ #include "mpi.h" /* Create a log channel to have nice outputs. */ diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h deleted file mode 100644 index 3739b2f167..0000000000 --- a/include/msg/datatypes.h +++ /dev/null @@ -1,208 +0,0 @@ -/* Copyright (c) 2004-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 MSG_DATATYPE_H -#define MSG_DATATYPE_H -#include "xbt/misc.h" -#include "xbt/lib.h" -#include "simgrid/simix.h" - -SG_BEGIN_DECL() - -/* ******************************** Mailbox ************************************ */ - -/** @brief Mailbox datatype - * @ingroup msg_task_usage - * - * Object representing a communication rendez-vous point, on which - * the sender finds the receiver it wants to communicate with. As a - * MSG user, you will only rarely manipulate any of these objects - * directly, since most of the public interface (such as - * #MSG_task_send and friends) hide this object behind a string - * alias. That mean that you don't provide the mailbox on which you - * want to send your task, but only the name of this mailbox. */ -typedef struct s_smx_rvpoint *msg_mailbox_t; - -/* ******************************** Environment ************************************ */ -typedef struct As *msg_as_t; - -/* ******************************** Host ************************************ */ - -extern int MSG_HOST_LEVEL; - -/** @brief Host datatype. - @ingroup m_host_management - - A location (or host) is any possible place where - a process may run. Thus it is represented as a physical - resource with computing capabilities, some mailboxes - to enable running process to communicate with remote ones, and - some private data that can be only accessed by local - process. - */ -typedef xbt_dictelm_t msg_host_t; -typedef s_xbt_dictelm_t s_msg_host_t; - -typedef struct msg_host_priv { - int dp_enabled; - xbt_dict_t dp_objs; - double dp_updated_by_deleted_tasks; - int is_migrating; - - xbt_dict_t affinity_mask_db; - -#ifdef MSG_USE_DEPRECATED - msg_mailbox_t *mailboxes; /**< the channels */ -#endif -} s_msg_host_priv_t, *msg_host_priv_t; - -static inline msg_host_priv_t MSG_host_priv(msg_host_t host){ - return (msg_host_priv_t )xbt_lib_get_level(host, MSG_HOST_LEVEL); -} - - - -/* ******************************** Task ************************************ */ - -typedef struct simdata_task *simdata_task_t; - -typedef struct msg_task { - char *name; /**< @brief task name if any */ - simdata_task_t simdata; /**< @brief simulator data */ - void *data; /**< @brief user data */ - long long int counter; /* task unique identifier for instrumentation */ - char *category; /* task category for instrumentation */ -} s_msg_task_t; - -/** @brief Task datatype. - @ingroup m_task_management - - A task may then be defined by a computing - amount, a message size and some private - data. - */ -typedef struct msg_task *msg_task_t; - -/* ******************************** VM ************************************* */ -typedef msg_host_t msg_vm_t; -typedef msg_host_priv_t msg_vm_priv_t; - -static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){ - return (msg_vm_priv_t) xbt_lib_get_level(vm, MSG_HOST_LEVEL); -} - -/** ******************************** File ************************************ */ - -/** @brief File datatype. -* @ingroup msg_file_management -* -* You should consider this as an opaque object. -*/ -typedef xbt_dictelm_t msg_file_t; -typedef s_xbt_dictelm_t s_msg_file_t; - -extern int MSG_FILE_LEVEL; -typedef struct simdata_file *simdata_file_t; - -typedef struct msg_file_priv { - char *fullpath; - sg_size_t size; - char* mount_point; - char* storageId; - char* storage_type; - char* content_type; - void *data; - simdata_file_t simdata; -} s_msg_file_priv_t, *msg_file_priv_t; - -static inline msg_file_priv_t MSG_file_priv(msg_file_t file){ - return (msg_file_priv_t )xbt_lib_get_level(file, MSG_FILE_LEVEL); -} - -/* ******************************** Storage ************************************ */ -/* TODO: PV: to comment */ - -extern int MSG_STORAGE_LEVEL; - -/** @brief Storage datatype. - * @ingroup msg_storage_management - * - * You should consider this as an opaque object. - */ -typedef xbt_dictelm_t msg_storage_t; -typedef s_xbt_dictelm_t s_msg_storage_t; - -typedef struct msg_storage_priv { - const char *hostname; - void *data; -} s_msg_storage_priv_t, *msg_storage_priv_t; - -static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){ - return (msg_storage_priv_t )xbt_lib_get_level(storage, MSG_STORAGE_LEVEL); -} - -/*************** Begin GPU ***************/ -typedef struct simdata_gpu_task *simdata_gpu_task_t; - -typedef struct msg_gpu_task { - char *name; /**< @brief task name if any */ - simdata_gpu_task_t simdata; /**< @brief simulator data */ - long long int counter; /* task unique identifier for instrumentation */ - char *category; /* task category for instrumentation */ -} s_msg_gpu_task_t; - -/** @brief GPU task datatype. - @ingroup m_task_management - - A task may then be defined by a computing - amount, a dispatch latency and a collect latency. - \see m_task_management -*/ -typedef struct msg_gpu_task *msg_gpu_task_t; -/*************** End GPU ***************/ - -/** - * \brief @brief Communication action. - * \ingroup msg_task_usage - * - * Object representing an ongoing communication between processes. Such beast is usually obtained by using #MSG_task_isend, #MSG_task_irecv or friends. - */ -typedef struct msg_comm *msg_comm_t; - -/** \brief Default value for an uninitialized #msg_task_t. - \ingroup m_task_management -*/ -#define MSG_TASK_UNINITIALIZED NULL - -/* ****************************** Process *********************************** */ - -/** @brief Process datatype. - @ingroup m_process_management - - A process may be defined as a code, with some - private data, executing in a location. - - You should not access directly to the fields of the pointed - structure, but always use the provided API to interact with - processes. - */ -typedef struct s_smx_process *msg_process_t; - -#ifdef MSG_USE_DEPRECATED - -/* Compatibility typedefs */ -typedef int m_channel_t; -typedef msg_gpu_task_t m_gpu_task_t; -typedef msg_host_t m_host_t; -typedef msg_process_t m_process_t; -typedef msg_task_t m_task_t; -typedef s_msg_gpu_task_t s_m_gpu_task_t; -typedef s_msg_host_t s_m_host_t; -typedef s_msg_task_t s_m_task_t; -#endif - -SG_END_DECL() -#endif diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h index f3d7640ce6..0c37ffe7b6 100644 --- a/include/simgrid/instr.h +++ b/include/simgrid/instr.h @@ -11,7 +11,7 @@ #include "xbt.h" #include "xbt/graph.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "simgrid/simdag.h" /* diff --git a/include/msg/msg.h b/include/simgrid/msg.h similarity index 80% rename from include/msg/msg.h rename to include/simgrid/msg.h index 77881dc69b..264a16e66e 100644 --- a/include/msg/msg.h +++ b/include/simgrid/msg.h @@ -8,15 +8,204 @@ #define MSG_H #include "xbt.h" - -#include "msg/datatypes.h" - +#include "xbt/lib.h" #include "simgrid/simix.h" - #include "simgrid/platf.h" SG_BEGIN_DECL() +/* ******************************** Mailbox ************************************ */ + +/** @brief Mailbox datatype + * @ingroup msg_task_usage + * + * Object representing a communication rendez-vous point, on which + * the sender finds the receiver it wants to communicate with. As a + * MSG user, you will only rarely manipulate any of these objects + * directly, since most of the public interface (such as + * #MSG_task_send and friends) hide this object behind a string + * alias. That mean that you don't provide the mailbox on which you + * want to send your task, but only the name of this mailbox. */ +typedef struct s_smx_rvpoint *msg_mailbox_t; + +/* ******************************** Environment ************************************ */ +typedef struct As *msg_as_t; + +/* ******************************** Host ************************************ */ + +extern int MSG_HOST_LEVEL; + +/** @brief Host datatype. + @ingroup m_host_management + + A location (or host) is any possible place where + a process may run. Thus it is represented as a physical + resource with computing capabilities, some mailboxes + to enable running process to communicate with remote ones, and + some private data that can be only accessed by local + process. + */ +typedef xbt_dictelm_t msg_host_t; +typedef s_xbt_dictelm_t s_msg_host_t; + +typedef struct msg_host_priv { + int dp_enabled; + xbt_dict_t dp_objs; + double dp_updated_by_deleted_tasks; + int is_migrating; + + xbt_dict_t affinity_mask_db; + +#ifdef MSG_USE_DEPRECATED + msg_mailbox_t *mailboxes; /**< the channels */ +#endif +} s_msg_host_priv_t, *msg_host_priv_t; + +static inline msg_host_priv_t MSG_host_priv(msg_host_t host){ + return (msg_host_priv_t )xbt_lib_get_level(host, MSG_HOST_LEVEL); +} + + + +/* ******************************** Task ************************************ */ + +typedef struct simdata_task *simdata_task_t; + +typedef struct msg_task { + char *name; /**< @brief task name if any */ + simdata_task_t simdata; /**< @brief simulator data */ + void *data; /**< @brief user data */ + long long int counter; /* task unique identifier for instrumentation */ + char *category; /* task category for instrumentation */ +} s_msg_task_t; + +/** @brief Task datatype. + @ingroup m_task_management + + A task may then be defined by a computing + amount, a message size and some private + data. + */ +typedef struct msg_task *msg_task_t; + +/* ******************************** VM ************************************* */ +typedef msg_host_t msg_vm_t; +typedef msg_host_priv_t msg_vm_priv_t; + +static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){ + return (msg_vm_priv_t) xbt_lib_get_level(vm, MSG_HOST_LEVEL); +} + +/** ******************************** File ************************************ */ + +/** @brief File datatype. +* @ingroup msg_file_management +* +* You should consider this as an opaque object. +*/ +typedef xbt_dictelm_t msg_file_t; +typedef s_xbt_dictelm_t s_msg_file_t; + +extern int MSG_FILE_LEVEL; +typedef struct simdata_file *simdata_file_t; + +typedef struct msg_file_priv { + char *fullpath; + sg_size_t size; + char* mount_point; + char* storageId; + char* storage_type; + char* content_type; + void *data; + simdata_file_t simdata; +} s_msg_file_priv_t, *msg_file_priv_t; + +static inline msg_file_priv_t MSG_file_priv(msg_file_t file){ + return (msg_file_priv_t )xbt_lib_get_level(file, MSG_FILE_LEVEL); +} + +/* ******************************** Storage ************************************ */ +/* TODO: PV: to comment */ + +extern int MSG_STORAGE_LEVEL; + +/** @brief Storage datatype. + * @ingroup msg_storage_management + * + * You should consider this as an opaque object. + */ +typedef xbt_dictelm_t msg_storage_t; +typedef s_xbt_dictelm_t s_msg_storage_t; + +typedef struct msg_storage_priv { + const char *hostname; + void *data; +} s_msg_storage_priv_t, *msg_storage_priv_t; + +static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){ + return (msg_storage_priv_t )xbt_lib_get_level(storage, MSG_STORAGE_LEVEL); +} + +/*************** Begin GPU ***************/ +typedef struct simdata_gpu_task *simdata_gpu_task_t; + +typedef struct msg_gpu_task { + char *name; /**< @brief task name if any */ + simdata_gpu_task_t simdata; /**< @brief simulator data */ + long long int counter; /* task unique identifier for instrumentation */ + char *category; /* task category for instrumentation */ +} s_msg_gpu_task_t; + +/** @brief GPU task datatype. + @ingroup m_task_management + + A task may then be defined by a computing + amount, a dispatch latency and a collect latency. + \see m_task_management +*/ +typedef struct msg_gpu_task *msg_gpu_task_t; +/*************** End GPU ***************/ + +/** + * \brief @brief Communication action. + * \ingroup msg_task_usage + * + * Object representing an ongoing communication between processes. Such beast is usually obtained by using #MSG_task_isend, #MSG_task_irecv or friends. + */ +typedef struct msg_comm *msg_comm_t; + +/** \brief Default value for an uninitialized #msg_task_t. + \ingroup m_task_management +*/ +#define MSG_TASK_UNINITIALIZED NULL + +/* ****************************** Process *********************************** */ + +/** @brief Process datatype. + @ingroup m_process_management + + A process may be defined as a code, with some + private data, executing in a location. + + You should not access directly to the fields of the pointed + structure, but always use the provided API to interact with + processes. + */ +typedef struct s_smx_process *msg_process_t; + +#ifdef MSG_USE_DEPRECATED + +/* Compatibility typedefs */ +typedef int m_channel_t; +typedef msg_gpu_task_t m_gpu_task_t; +typedef msg_host_t m_host_t; +typedef msg_process_t m_process_t; +typedef msg_task_t m_task_t; +typedef s_msg_gpu_task_t s_m_gpu_task_t; +typedef s_msg_host_t s_m_host_t; +typedef s_msg_task_t s_m_task_t; +#endif + /** @brief Return code of most MSG functions @ingroup msg_simulation @{ */ diff --git a/src/bindings/java/jmsg.c b/src/bindings/java/jmsg.c index c2fa4d6cb9..b5a7abb076 100644 --- a/src/bindings/java/jmsg.c +++ b/src/bindings/java/jmsg.c @@ -6,7 +6,7 @@ /* 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 #include #include #include diff --git a/src/bindings/java/jmsg.h b/src/bindings/java/jmsg.h index da2b16f25e..b9046ab202 100644 --- a/src/bindings/java/jmsg.h +++ b/src/bindings/java/jmsg.h @@ -8,7 +8,7 @@ #ifndef MSG4JAVA_H #define MSG4JAVA_H -#include +#include #include extern int JAVA_HOST_LEVEL; diff --git a/src/bindings/java/jmsg_as.c b/src/bindings/java/jmsg_as.c index a3daec624b..f3ed319498 100644 --- a/src/bindings/java/jmsg_as.c +++ b/src/bindings/java/jmsg_as.c @@ -8,9 +8,12 @@ #include "xbt/str.h" #include "xbt/dict.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "jmsg_as.h" +#include "jmsg_host.h" #include "jxbt_utilities.h" +#include "jmsg.h" + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); diff --git a/src/bindings/java/jmsg_as.h b/src/bindings/java/jmsg_as.h index ad928b65cb..8e9ea422ec 100644 --- a/src/bindings/java/jmsg_as.h +++ b/src/bindings/java/jmsg_as.h @@ -9,19 +9,7 @@ #ifndef MSG_JAS_H #define MSG_JAS_H #include -#include "msg/msg.h" - -/* Functions related to the java host instances. */ - -/* Copyright (c) 2007-2013. 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 "msg/msg.h" -#include "jmsg.h" -#include "jmsg_host.h" +#include "simgrid/msg.h" jobject jas_new_instance(JNIEnv * env); jobject jas_ref(JNIEnv * env, jobject jas); diff --git a/src/bindings/java/jmsg_comm.c b/src/bindings/java/jmsg_comm.c index 85b70d673a..bf6a09b6fe 100644 --- a/src/bindings/java/jmsg_comm.c +++ b/src/bindings/java/jmsg_comm.c @@ -10,7 +10,7 @@ #include "jxbt_utilities.h" #include "jmsg.h" -#include +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); static jfieldID jcomm_field_Comm_bind; diff --git a/src/bindings/java/jmsg_comm.h b/src/bindings/java/jmsg_comm.h index 5cb7ba5d98..ec099e9311 100644 --- a/src/bindings/java/jmsg_comm.h +++ b/src/bindings/java/jmsg_comm.h @@ -9,7 +9,7 @@ #ifndef MSG_JCOMM_H #define MSG_JCOMM_H #include -#include +#include /** * This function binds the task associated with the communication to * the java communication object. diff --git a/src/bindings/java/jmsg_file.h b/src/bindings/java/jmsg_file.h index e2c0352e39..0fe72f636b 100644 --- a/src/bindings/java/jmsg_file.h +++ b/src/bindings/java/jmsg_file.h @@ -9,7 +9,7 @@ #ifndef MSG_JFILE_H #define MSG_JFILE_H #include -#include "msg/msg.h" +#include "simgrid/msg.h" jfieldID jfile_field_bind; diff --git a/src/bindings/java/jmsg_host.c b/src/bindings/java/jmsg_host.c index 0d4469c572..7c013eaedf 100644 --- a/src/bindings/java/jmsg_host.c +++ b/src/bindings/java/jmsg_host.c @@ -7,7 +7,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/str.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "jmsg.h" #include "jmsg_host.h" #include "jxbt_utilities.h" diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h index 609b9a95c8..f1ea5165f7 100644 --- a/src/bindings/java/jmsg_host.h +++ b/src/bindings/java/jmsg_host.h @@ -10,7 +10,7 @@ #define MSG_JHOST_H #include -#include "msg/msg.h" +#include "simgrid/msg.h" /** * This function returns a new java host instance. diff --git a/src/bindings/java/jmsg_process.h b/src/bindings/java/jmsg_process.h index 60d3aed9be..129fba2f5d 100644 --- a/src/bindings/java/jmsg_process.h +++ b/src/bindings/java/jmsg_process.h @@ -10,7 +10,7 @@ #define MSG_JPROCESS_H #include -#include +#include #include //Cached java fields diff --git a/src/bindings/java/jmsg_storage.c b/src/bindings/java/jmsg_storage.c index 150ae146c8..0fee6cdc32 100644 --- a/src/bindings/java/jmsg_storage.c +++ b/src/bindings/java/jmsg_storage.c @@ -7,7 +7,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/str.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "jmsg.h" #include "jmsg_storage.h" #include "jxbt_utilities.h" diff --git a/src/bindings/java/jmsg_storage.h b/src/bindings/java/jmsg_storage.h index eeda61e123..763dd8ff12 100644 --- a/src/bindings/java/jmsg_storage.h +++ b/src/bindings/java/jmsg_storage.h @@ -9,7 +9,7 @@ #ifndef MSG_JSTORAGE_H #define MSG_JSTORAGE_H #include -#include "msg/msg.h" +#include "simgrid/msg.h" /** * This function returns a new java storage instance. diff --git a/src/bindings/java/jmsg_synchro.h b/src/bindings/java/jmsg_synchro.h index a42e9b6dd3..d89ebcf318 100644 --- a/src/bindings/java/jmsg_synchro.h +++ b/src/bindings/java/jmsg_synchro.h @@ -10,7 +10,7 @@ #define MSG_JSYNCHRO_H #include -#include +#include #include JNIEXPORT void JNICALL diff --git a/src/bindings/java/jmsg_task.c b/src/bindings/java/jmsg_task.c index 07c37483b0..b74ea7c664 100644 --- a/src/bindings/java/jmsg_task.c +++ b/src/bindings/java/jmsg_task.c @@ -15,7 +15,7 @@ #include "jxbt_utilities.h" -#include +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); diff --git a/src/bindings/java/jmsg_task.h b/src/bindings/java/jmsg_task.h index 068dee06e8..c1c108edd5 100644 --- a/src/bindings/java/jmsg_task.h +++ b/src/bindings/java/jmsg_task.h @@ -10,7 +10,7 @@ #define MSG_JTASK_H #include -#include "msg/msg.h" +#include "simgrid/msg.h" /** * This function returns a global reference to the java task instance diff --git a/src/bindings/java/jmsg_vm.c b/src/bindings/java/jmsg_vm.c index a86efdacef..42c2561e56 100644 --- a/src/bindings/java/jmsg_vm.c +++ b/src/bindings/java/jmsg_vm.c @@ -11,7 +11,7 @@ #include "jmsg_host.h" #include "jmsg_process.h" #include "jxbt_utilities.h" -#include "msg/msg.h" +#include "simgrid/msg.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); static jfieldID jvm_field_bind; diff --git a/src/bindings/java/jmsg_vm.h b/src/bindings/java/jmsg_vm.h index ba07003d22..5b97777087 100644 --- a/src/bindings/java/jmsg_vm.h +++ b/src/bindings/java/jmsg_vm.h @@ -10,7 +10,7 @@ #define MSG_VM_H #include -#include "msg/msg.h" +#include "simgrid/msg.h" void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm); msg_vm_t jvm_get_native(JNIEnv *env, jobject jvm); diff --git a/src/bindings/lua/lua_private.h b/src/bindings/lua/lua_private.h index e551413b22..ab9cf56b05 100644 --- a/src/bindings/lua/lua_private.h +++ b/src/bindings/lua/lua_private.h @@ -7,7 +7,7 @@ /* SimGrid Lua bindings */ #include "simgrid_lua.h" -#include "msg/msg.h" +#include "simgrid/msg.h" void sglua_register_task_functions(lua_State* L); msg_task_t sglua_check_task(lua_State* L, int index); diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c index dc9d45a2ae..10af0b95f9 100644 --- a/src/bindings/lua/simgrid_lua.c +++ b/src/bindings/lua/simgrid_lua.c @@ -10,7 +10,7 @@ #include "lua_state_cloner.h" #include "lua_utils.h" #include "xbt.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "simgrid/simdag.h" #include "surf/surfxml_parse.h" #include diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 86b7e64837..997aca035a 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -27,7 +27,7 @@ #include "../xbt/mmalloc/mmprivate.h" #include "xbt/automaton.h" #include "xbt/hash.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "msg/datatypes.h" #include "xbt/strbuff.h" #include "xbt/parmap.h" diff --git a/src/msg/instr_msg_process.c b/src/msg/instr_msg_process.c index fa6895cbf6..c2307ca7c7 100644 --- a/src/msg/instr_msg_process.c +++ b/src/msg/instr_msg_process.c @@ -5,8 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "msg_private.h" - -#include "msg/datatypes.h" #include "simix/smx_process_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process"); diff --git a/src/msg/instr_msg_task.c b/src/msg/instr_msg_task.c index a6a84ab8ae..cc98733b82 100644 --- a/src/msg/instr_msg_task.c +++ b/src/msg/instr_msg_task.c @@ -6,7 +6,6 @@ #include "instr/instr_private.h" #include "msg_private.h" -#include "msg/datatypes.h" #include "mc/mc.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG"); diff --git a/src/msg/msg_mailbox.h b/src/msg/msg_mailbox.h index ce93121229..6a2bb06d6d 100644 --- a/src/msg/msg_mailbox.h +++ b/src/msg/msg_mailbox.h @@ -9,7 +9,7 @@ #include "xbt/fifo.h" #include "simgrid/simix.h" -#include "msg/datatypes.h" +#include "simgrid/msg.h" SG_BEGIN_DECL() diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 9850e62346..c806583d3f 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -7,7 +7,7 @@ #ifndef METASIMGRID_PRIVATE_H #define METASIMGRID_PRIVATE_H -#include "msg/msg.h" +#include "simgrid/msg.h" #include "simgrid/simix.h" #include "surf/surf.h" #include "xbt/fifo.h" diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index a803804496..5d0872616d 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -11,7 +11,7 @@ #include "xbt/sysdep.h" #include "surf/surf.h" #include "surf/surf_resource.h" -#include "msg/msg.h" +#include "simgrid/msg.h" //FIXME: why? XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd, "Logging specific to SimDag (workstation)"); diff --git a/teshsuite/mc/replay/random_bug.c b/teshsuite/mc/replay/random_bug.c index 80bcf410eb..fea8c27ac3 100644 --- a/teshsuite/mc/replay/random_bug.c +++ b/teshsuite/mc/replay/random_bug.c @@ -6,7 +6,7 @@ #include -#include +#include #include /** An (fake) application with a bug occuring for some random values diff --git a/teshsuite/msg/get_sender/get_sender.c b/teshsuite/msg/get_sender/get_sender.c index bc9deb5bb1..5774e91fb4 100644 --- a/teshsuite/msg/get_sender/get_sender.c +++ b/teshsuite/msg/get_sender/get_sender.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific to this example"); diff --git a/teshsuite/msg/host_on_off/host_on_off.c b/teshsuite/msg/host_on_off/host_on_off.c index fb812dbc79..530fdd0304 100644 --- a/teshsuite/msg/host_on_off/host_on_off.c +++ b/teshsuite/msg/host_on_off/host_on_off.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c index 8c136170a0..f940ec9744 100644 --- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c +++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/teshsuite/msg/pid/pid.c b/teshsuite/msg/pid/pid.c index 0fee70ac43..015017c19f 100644 --- a/teshsuite/msg/pid/pid.c +++ b/teshsuite/msg/pid/pid.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/sysdep.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, diff --git a/teshsuite/msg/process/process.c b/teshsuite/msg/process/process.c index e999b4bed0..f69e8ffa19 100644 --- a/teshsuite/msg/process/process.c +++ b/teshsuite/msg/process/process.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/teshsuite/msg/process_join/process_join.c b/teshsuite/msg/process_join/process_join.c index 8f6e9d8ca8..049ab166e4 100644 --- a/teshsuite/msg/process_join/process_join.c +++ b/teshsuite/msg/process_join/process_join.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/teshsuite/msg/storage/concurrent_rw.c b/teshsuite/msg/storage/concurrent_rw.c index 8d938bb6dd..592715a8da 100644 --- a/teshsuite/msg/storage/concurrent_rw.c +++ b/teshsuite/msg/storage/concurrent_rw.c @@ -2,7 +2,7 @@ * All rights reserved. */ -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include diff --git a/teshsuite/msg/storage/storage_basic.c b/teshsuite/msg/storage/storage_basic.c index 95fcaa1a4e..8252c9e838 100644 --- a/teshsuite/msg/storage/storage_basic.c +++ b/teshsuite/msg/storage/storage_basic.c @@ -4,7 +4,7 @@ /* 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 "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_CATEGORY(storage,"Messages specific for this simulation"); diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c index 20816633f1..04cecd006e 100644 --- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c +++ b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ diff --git a/teshsuite/msg/trace/test_trace_integration.c b/teshsuite/msg/trace/test_trace_integration.c index 96ddc4cc89..54b2f2f2b2 100644 --- a/teshsuite/msg/trace/test_trace_integration.c +++ b/teshsuite/msg/trace/test_trace_integration.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" diff --git a/teshsuite/simdag/platforms/basic_tracing.c b/teshsuite/simdag/platforms/basic_tracing.c index b0b9a695a4..92a77b321a 100644 --- a/teshsuite/simdag/platforms/basic_tracing.c +++ b/teshsuite/simdag/platforms/basic_tracing.c @@ -6,7 +6,7 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "surf/surf_private.h" int host(int argc, char *argv[]); diff --git a/tools/graphicator/graphicator.c b/tools/graphicator/graphicator.c index a76ca5d4e6..c73fbcc92a 100644 --- a/tools/graphicator/graphicator.c +++ b/tools/graphicator/graphicator.c @@ -8,7 +8,7 @@ #include #endif -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/graph.h" XBT_LOG_NEW_DEFAULT_CATEGORY(graphicator,