Rename SIMIX files

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 828af03..834d497 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -78,13 +78,13 @@ set(EXTRA_DIST
        src/gras/Transport/transport_interface.h
        src/amok/Bandwidth/bandwidth_private.h
        src/amok/amok_modinter.h
-       src/simix/private.h
-       src/simix/process_private.h
-       src/simix/host_private.h
-       src/simix/network_private.h
-       src/simix/smurf_private.h
-       src/simix/synchro_private.h
-       src/simix/io_private.h
+       src/simix/smx_private.h
+       src/simix/smx_process_private.h
+       src/simix/smx_host_private.h
+       src/simix/smx_network_private.h
+       src/simix/smx_smurf_private.h
+       src/simix/smx_synchro_private.h
+       src/simix/smx_io_private.h
        
        src/smpi/private.h
        src/smpi/smpi_mpi_dt_private.h

diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c
index d404ecc..0af9f97 100644 (file)
--- a/src/gras/Msg/sg_msg.c
+++ b/src/gras/Msg/sg_msg.c
@@ -20,7 +20,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_msg);
 
 typedef void *gras_trp_bufdata_;
 #include "simix/datatypes.h"
-#include "simix/private.h"
 
 /* Yeah, the following is awfull, breaking the encapsulation of at least 3 modules
  * at the same time, but I'm tracking this bug since too long now, I want it dead. now.

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 9faef0e..6da9bff 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -10,7 +10,7 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
-#include "src/simix/private.h"
+#include "smx_private.h"
 #include "simix/context.h"
 #include "gras_config.h"
 

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index 95b1c8b..47dcaae 100644 (file)
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -10,7 +10,7 @@
 #include "xbt/function_types.h"
 #include "simix/simix.h"
 #include "simix/context.h"
-#include "simix/private.h"
+#include "smx_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
 

diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c
index c053cff..7fb23eb 100644 (file)
--- a/src/simix/smx_context_raw.c
+++ b/src/simix/smx_context_raw.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 "simix/private.h"
+#include "smx_private.h"
 #include "xbt/parmap.h"
 
 #ifdef HAVE_VALGRIND_VALGRIND_H

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index 9cedc55..99d5786 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -9,7 +9,7 @@
 #include <stdarg.h>
 
 #include "xbt/parmap.h"
-#include "simix/private.h"
+#include "smx_private.h"
 #include "gras_config.h"
 #include "context_sysv_config.h"        /* loads context system definitions */
 

diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c
index c20fc0a..d703ead 100644 (file)
--- a/src/simix/smx_context_thread.c
+++ b/src/simix/smx_context_thread.c
@@ -7,7 +7,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/function_types.h"
-#include "private.h"
+#include "smx_private.h"
 #include "portable.h"           /* loads context system definitions */
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index f3536d7..6d41663 100644 (file)
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_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 "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 4b64816..0470527 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_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 "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/xbt_os_time.h"

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 9474cb3..3be67bf 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.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 "private.h"
+#include "smx_private.h"
 #include "xbt/heap.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index db4429b..15d9e16 100644 (file)
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.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 "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"

diff --git a/src/simix/host_private.h b/src/simix/smx_host_private.h
similarity index 98%
rename from src/simix/host_private.h
rename to src/simix/smx_host_private.h
index 84a315c..206d26f 100644 (file)
--- a/src/simix/host_private.h
+++ b/src/simix/smx_host_private.h
@@ -8,7 +8,7 @@
 #define _SIMIX_HOST_PRIVATE_H
 
 #include "simix/datatypes.h"
-#include "smurf_private.h"
+#include "smx_smurf_private.h"
 
 /** @brief Host datatype */
 typedef struct s_smx_host {

diff --git a/src/simix/smx_io.c b/src/simix/smx_io.c
index 1d16e71..a5a5c65 100644 (file)
--- a/src/simix/smx_io.c
+++ b/src/simix/smx_io.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 "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"

diff --git a/src/simix/io_private.h b/src/simix/smx_io_private.h
similarity index 95%
rename from src/simix/io_private.h
rename to src/simix/smx_io_private.h
index 84556a6..a998ce1 100644 (file)
--- a/src/simix/io_private.h
+++ b/src/simix/smx_io_private.h
@@ -8,7 +8,7 @@
 #define _SIMIX_IO_PRIVATE_H
 
 #include "simix/datatypes.h"
-#include "smurf_private.h"
+#include "smx_smurf_private.h"
 
 void SIMIX_pre_file_read(smx_req_t req);
 smx_action_t SIMIX_file_read(smx_process_t process, char* name);

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 3e8e1aa..341da2a 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.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 "private.h"
+#include "smx_private.h"
 #include "xbt/log.h"
 #include "mc/mc.h"
 #include "xbt/dict.h"

diff --git a/src/simix/network_private.h b/src/simix/smx_network_private.h
similarity index 99%
rename from src/simix/network_private.h
rename to src/simix/smx_network_private.h
index bf82a50..11b4cbb 100644 (file)
--- a/src/simix/network_private.h
+++ b/src/simix/smx_network_private.h
@@ -8,7 +8,7 @@
 #define _SIMIX_NETWORK_PRIVATE_H
 
 #include "simix/datatypes.h"
-#include "smurf_private.h"
+#include "smx_smurf_private.h"
 
 /** @brief Rendez-vous point datatype */
 typedef struct s_smx_rvpoint {

diff --git a/src/simix/private.h b/src/simix/smx_private.h
similarity index 97%
rename from src/simix/private.h
rename to src/simix/smx_private.h
index 2897aeb..e15730f 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/smx_private.h
@@ -17,12 +17,12 @@
 #include "xbt/function_types.h"
 #include "xbt/ex_interface.h"
 #include "instr/instr_private.h"
-#include "process_private.h"
-#include "host_private.h"
-#include "io_private.h"
-#include "network_private.h"
-#include "smurf_private.h"
-#include "synchro_private.h"
+#include "smx_process_private.h"
+#include "smx_host_private.h"
+#include "smx_io_private.h"
+#include "smx_network_private.h"
+#include "smx_smurf_private.h"
+#include "smx_synchro_private.h"
 #include "simix/context.h"
 
 /* Define only for SimGrid benchmarking purposes */

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 86422fd..af808cc 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_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 "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"

diff --git a/src/simix/process_private.h b/src/simix/smx_process_private.h
similarity index 99%
rename from src/simix/process_private.h
rename to src/simix/smx_process_private.h
index 7d2dd13..4d208e8 100644 (file)
--- a/src/simix/process_private.h
+++ b/src/simix/smx_process_private.h
@@ -8,7 +8,7 @@
 #define _SIMIX_PROCESS_PRIVATE_H
 
 #include "simix/datatypes.h"
-#include "smurf_private.h"
+#include "smx_smurf_private.h"
 
 /** @brief Process datatype */
 typedef struct s_smx_process {

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index 6f243b5..ba1f614 100644 (file)
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -1,4 +1,4 @@
-#include "private.h"
+#include "smx_private.h"
 #include "xbt/fifo.h"
 #include "xbt/xbt_os_thread.h"
 

diff --git a/src/simix/smurf_private.h b/src/simix/smx_smurf_private.h
similarity index 100%
rename from src/simix/smurf_private.h
rename to src/simix/smx_smurf_private.h

diff --git a/src/simix/smx_synchro.c b/src/simix/smx_synchro.c
index f5ccd07..3b931cd 100644 (file)
--- a/src/simix/smx_synchro.c
+++ b/src/simix/smx_synchro.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 "private.h"
+#include "smx_private.h"
 #include "xbt/log.h"
 
 

diff --git a/src/simix/synchro_private.h b/src/simix/smx_synchro_private.h
similarity index 100%
rename from src/simix/synchro_private.h
rename to src/simix/smx_synchro_private.h

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index abc1d02..f84bd36 100644 (file)
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -15,7 +15,7 @@
 #endif
 #include <math.h>         /* isfinite() */
 
-#include "private.h"
+#include "smx_private.h"
 #include "mc/mc.h"
 
 

diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c
index df45b81..cddfce7 100644 (file)
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -15,7 +15,7 @@
 
 #include "simix/simix.h"        /* used implementation */
 #include "simix/datatypes.h"
-#include "../simix/private.h" /* FIXME */
+#include "../simix/smx_private.h" /* FIXME */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
                                 "Synchronization mechanism");