X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..21f0f6fd187df4434024cdeab2bec5bf31528347:/src/msg/msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index f0df69f01e..bab2b103bc 100644
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -16,6 +16,7 @@
 #include "xbt/replay.h"
 #include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
 #include "src/surf/callbacks.h"
+#include "src/surf/platform.hpp"
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
@@ -57,9 +58,6 @@ void MSG_init_nocheck(int *argc, char **argv) {
 
     SIMIX_global_init(argc, argv);
 
-#ifdef MSG_USE_DEPRECATED
-    msg_global->max_channel = 0;
-#endif
     msg_global->sent_msg = 0;
     msg_global->task_copy_callback = NULL;
     msg_global->process_data_cleanup = NULL;
@@ -67,8 +65,10 @@ void MSG_init_nocheck(int *argc, char **argv) {
     SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
 
-    sg_platf_postparse_add_cb(MSG_post_create_environment);
-    surf_on_host_created(MSG_host_create_);
+    simgrid::surf::on_postparse.connect(MSG_post_create_environment);
+    simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
+      MSG_host_create_(&host);
+    });
   }
 
   if(MC_is_active()){
@@ -82,42 +82,6 @@ void MSG_init_nocheck(int *argc, char **argv) {
   if(sg_cfg_get_boolean("clean_atexit")) atexit(MSG_exit);
 }
 
-#ifdef MSG_USE_DEPRECATED
-
-/* This deprecated function has to be called to fix the number of channel in the
-   simulation before creating any host. Indeed, each channel is
-   represented by a different mailbox on each #m_host_t. This
-   function can then be called only once. This function takes only one
-   parameter.
- * \param number the number of channel in the simulation. It has to be >0
- */
-msg_error_t MSG_set_channel_number(int number)
-{
-  XBT_WARN("DEPRECATED! Please use aliases instead");
-  xbt_assert((msg_global)
-              && (msg_global->max_channel == 0),
-              "Channel number already set!");
-
-  msg_global->max_channel = number;
-
-  return MSG_OK;
-}
-
-/* This deprecated function has to be called once the number of channel is fixed. I can't
-   figure out a reason why anyone would like to call this function but nevermind.
- * \return the number of channel in the simulation.
- */
-int MSG_get_channel_number(void)
-{
-  XBT_WARN("DEPRECATED! Please use aliases instead");
-  xbt_assert((msg_global)
-              && (msg_global->max_channel != 0),
-              "Channel number not set yet!");
-
-  return msg_global->max_channel;
-}
-#endif
-
 /** \ingroup msg_simulation
  * \brief Launch the MSG simulation
  */
@@ -190,9 +154,3 @@ unsigned long int MSG_get_sent_msg()
 {
   return msg_global->sent_msg;
 }
-
-#ifdef MSG_USE_DEPRECATED
-msg_error_t MSG_clean(void) {
-  return MSG_OK;
-}
-#endif