From: Christophe Thiéry Date: Thu, 10 Nov 2011 13:06:13 +0000 (+0100) Subject: Clean MSG source file names X-Git-Tag: exp_20120216~346 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d2d9f8b0f434e881d124d81f655fc9ebb6f31199?hp=8c6c3df11271d62be278361a12113ee9a4849b95 Clean MSG source file names --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 122b703f0d..d685f2ebea 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -64,8 +64,8 @@ set(EXTRA_DIST src/include/mc/datatypes.h src/include/mc/mc.h src/include/simix/context.h - src/msg/private.h - src/msg/mailbox.h + src/msg/msg_private.h + src/msg/msg_mailbox.h src/simdag/private.h src/simdag/dax.dtd src/simdag/dax_dtd.h @@ -254,13 +254,13 @@ set(SIMIX_SRC set(MSG_SRC src/msg/msg_config.c - src/msg/task.c - src/msg/host.c - src/msg/m_process.c - src/msg/gos.c - src/msg/global.c - src/msg/environment.c - src/msg/deployment.c + src/msg/msg_task.c + src/msg/msg_host.c + src/msg/msg_process.c + src/msg/msg_gos.c + src/msg/msg_global.c + src/msg/msg_environment.c + src/msg/msg_deployment.c src/msg/msg_mailbox.c src/msg/msg_actions.c ) diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.c index 5fbdd7aea7..97d3c4c05e 100644 --- a/src/msg/msg_actions.c +++ b/src/msg/msg_actions.c @@ -6,7 +6,7 @@ #include "simgrid_config.h" //For getline, keep that include first -#include "msg/private.h" +#include "msg_private.h" #include "xbt/str.h" #include "xbt/dynar.h" #include "xbt/replay_trace_reader.h" diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c index 999e6cfb39..733d2bf359 100644 --- a/src/msg/msg_config.c +++ b/src/msg/msg_config.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/private.h" +#include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "simix/simix.h" diff --git a/src/msg/deployment.c b/src/msg/msg_deployment.c similarity index 99% rename from src/msg/deployment.c rename to src/msg/msg_deployment.c index fadf887a22..e2252af5d2 100644 --- a/src/msg/deployment.c +++ b/src/msg/msg_deployment.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/private.h" +#include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg/environment.c b/src/msg/msg_environment.c similarity index 99% rename from src/msg/environment.c rename to src/msg/msg_environment.c index fac131f01b..93f479f88d 100644 --- a/src/msg/environment.c +++ b/src/msg/msg_environment.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/private.h" +#include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/dict.h" diff --git a/src/msg/global.c b/src/msg/msg_global.c similarity index 99% rename from src/msg/global.c rename to src/msg/msg_global.c index 0652b7eb85..a6356c9ed1 100644 --- a/src/msg/global.c +++ b/src/msg/msg_global.c @@ -4,13 +4,13 @@ /* 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/private.h" +#include "msg_private.h" +#include "msg_mailbox.h" #include "mc/mc.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/virtu.h" #include "xbt/ex.h" /* ex_backtrace_display */ -#include "mailbox.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)"); diff --git a/src/msg/gos.c b/src/msg/msg_gos.c similarity index 99% rename from src/msg/gos.c rename to src/msg/msg_gos.c index 0d8fa5ff20..a1494c03cf 100644 --- a/src/msg/gos.c +++ b/src/msg/msg_gos.c @@ -4,11 +4,11 @@ /* 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 "private.h" -#include "xbt/sysdep.h" +#include "msg_private.h" +#include "msg_mailbox.h" #include "mc/mc.h" #include "xbt/log.h" -#include "mailbox.h" +#include "xbt/sysdep.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, diff --git a/src/msg/host.c b/src/msg/msg_host.c similarity index 99% rename from src/msg/host.c rename to src/msg/msg_host.c index d1425a2cba..a3af07a10b 100644 --- a/src/msg/host.c +++ b/src/msg/msg_host.c @@ -4,10 +4,10 @@ /* 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/private.h" +#include "msg/msg_private.h" +#include "msg/msg_mailbox.h" #include "xbt/sysdep.h" #include "xbt/log.h" -#include "mailbox.h" /** \defgroup m_host_management Management functions of Hosts * \brief This section describes the host structure of MSG diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c index c45fd91eab..41e6f140ec 100644 --- a/src/msg/msg_mailbox.c +++ b/src/msg/msg_mailbox.c @@ -6,8 +6,8 @@ /* 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 "mailbox.h" -#include "msg/private.h" +#include "msg_mailbox.h" +#include "msg_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)"); diff --git a/src/msg/mailbox.h b/src/msg/msg_mailbox.h similarity index 100% rename from src/msg/mailbox.h rename to src/msg/msg_mailbox.h diff --git a/src/msg/private.h b/src/msg/msg_private.h similarity index 100% rename from src/msg/private.h rename to src/msg/msg_private.h diff --git a/src/msg/m_process.c b/src/msg/msg_process.c similarity index 99% rename from src/msg/m_process.c rename to src/msg/msg_process.c index a7b18f880e..93e7acac10 100644 --- a/src/msg/m_process.c +++ b/src/msg/msg_process.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/private.h" +#include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg/task.c b/src/msg/msg_task.c similarity index 99% rename from src/msg/task.c rename to src/msg/msg_task.c index 68fd8a320a..0aabc18413 100644 --- a/src/msg/task.c +++ b/src/msg/msg_task.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/private.h" +#include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index ed3c7560fa..f02b306b05 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -8,7 +8,6 @@ #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/dict.h" -#include "msg/mailbox.h" #include "mc/mc.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,