X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c57842fe897f53b46f0be3da87f7c996674be7d6..d2782615cdbeb1ad4c5e994a4c681739927e3aff:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 4ddc246d25..d327392983 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -7,19 +7,13 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "smx_private.h"
-#include "mc/mc.h"
+#include "mc/mc_interface.h"
 #include "xbt/ex.h"
 #include <math.h>         /* isfinite() */
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 
-/* generate strings from the enumeration values */
-static const char* simcall_names[] = {
-#include "simcalls_generated_string.c"
-[SIMCALL_NONE] = "NONE"
-};
-
-#include "simcalls_generated_body.c"
+#include "smx_popping_bodies.c"
 
 /**
  * \ingroup simix_host_management
@@ -197,7 +191,6 @@ int simcall_host_get_nb_pstates(smx_host_t host)
  *
  * \param host A SIMIX host
  * \param pstate_index The pstate to which the CPU power will be set
- * \return void
  */
 void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index)
 {
@@ -1023,12 +1016,12 @@ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_
 /**
  * \ingroup simix_comm_management
  */
-smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag,
+smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag,
                                 int (*match_fun)(void *, void *, smx_action_t), void *data)
 {
   xbt_assert(rdv, "No rendez-vous point defined for iprobe");
 
-  return simcall_BODY_comm_iprobe(rdv, src, tag, match_fun, data);
+  return simcall_BODY_comm_iprobe(rdv, type, src, tag, match_fun, data);
 }
 
 /**
@@ -1477,39 +1470,24 @@ xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
   return simcall_BODY_storage_get_content(storage);
 }
 
+
+
 #ifdef HAVE_MC
 
-void *simcall_mc_snapshot(void)
-{
+void *simcall_mc_snapshot(void) {
   return simcall_BODY_mc_snapshot();
 }
 
-int simcall_mc_compare_snapshots(void *s1, void *s2){
+int simcall_mc_compare_snapshots(void *s1, void *s2) {
   return simcall_BODY_mc_compare_snapshots(s1, s2);
 }
 
-int simcall_mc_random(int min, int max)
-{
+int simcall_mc_random(int min, int max) {
   return simcall_BODY_mc_random(min, max);
 }
 
-
 #endif /* HAVE_MC */
 
-/* ****************************************************************************************** */
-/* TUTORIAL: New API                                                                          */
-/* All functions for simcall                                                                  */
-/* ****************************************************************************************** */
-int simcall_new_api_fct(const char* param1, double param2){
-  smx_simcall_t simcall = SIMIX_simcall_mine();
-  simcall->call = SIMCALL_NEW_API_INIT;
-  simcall->new_api.param1 = param1;
-  simcall->new_api.param2 = param2;
-
-  SIMIX_simcall_push(simcall->issuer);
-  return simcall->new_api.result;
-}
-
 /* ************************************************************************** */
 
 /** @brief returns a printable string representing a simcall */