get rid of surf_init

diff --git a/doc/doxygen/module-surf.doc b/doc/doxygen/module-surf.doc
index 4cc3c6c..5bf12a2 100644 (file)
--- a/doc/doxygen/module-surf.doc
+++ b/doc/doxygen/module-surf.doc
@@ -48,7 +48,7 @@
     #surf_host_model_init_current_default() (which will give you a
     CLM03 model), or similar (see @ref SURF_models).
 
-    To initialize SURF, call #surf_init(). Then
+    To initialize SURF, call 
     #surf_host_model_init_current_default() or #surf_host_model_init_ptask_L07() 
     to create the platform.
 

diff --git a/src/include/surf/surf.hpp b/src/include/surf/surf.hpp
index a47d40c..802e69e 100644 (file)
--- a/src/include/surf/surf.hpp
+++ b/src/include/surf/surf.hpp
@@ -10,18 +10,6 @@
 
 /*** SURF Globals **************************/
 
-/** @ingroup SURF_simulation
- *  @brief Initialize SURF
- *  @param argc argument number
- *  @param argv arguments
- *
- *  This function has to be called to initialize the common structures. Then you will have to create the environment by
- *  calling  e.g. surf_host_model_init_CM02()
- *
- *  @see surf_host_model_init_CM02(), surf_host_model_init_compound()
- */
-XBT_PUBLIC void surf_init(int* argc, char** argv); /* initialize common structures */
-
 /** @ingroup SURF_simulation
  *  @brief Finish simulation initialization
  *

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index f38a4ab..9e5142e 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -19,6 +19,7 @@
 #include "src/smpi/include/smpi_actor.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
+#include "xbt/xbt_modinter.h"     /* whether initialization was already done */
 
 #include <boost/algorithm/string/predicate.hpp>
 #ifndef _WIN32
@@ -169,7 +170,11 @@ void EngineImpl::initialize(int* argc, char** argv)
   simgrid::mc::AppSide::initialize();
 #endif
 
-  surf_init(argc, argv); /* Initialize SURF structures */
+  if (xbt_initialized == 0) {
+    xbt_init(argc, argv);
+
+    sg_config_init(argc, argv);
+  }
 
   instance_->context_mod_init();
 

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 595cdf4..24722fa 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -188,13 +188,3 @@ const surf_model_description_t* find_model_description(const std::vector<surf_mo
   }
   xbt_die("Model '%s' is invalid! Valid models are: %s.", name.c_str(), name_list.c_str());
 }
-
-void surf_init(int* argc, char** argv)
-{
-  if (xbt_initialized > 0)
-    return;
-
-  xbt_init(argc, argv);
-
-  sg_config_init(argc, argv);
-}