easily please sonar

[simgrid.git] / include / simgrid / simix.h

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 4964376..4567233 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -7,14 +7,10 @@
 #ifndef _SIMIX_SIMIX_H
 #define _SIMIX_SIMIX_H
 
-#include "xbt/misc.h"
-#include "xbt/fifo.h"
-#include "xbt/dict.h"
-#include "xbt/function_types.h"
-#include "xbt/parmap.h"
-#include "xbt/swag.h"
 #include "simgrid/datatypes.h"
 #include "simgrid/host.h"
+#include "xbt/ex.h"
+#include "xbt/parmap.h"
 
 #ifdef __cplusplus
 
@@ -36,14 +32,14 @@ namespace simix {
     @{ */
   class ActorImpl;
   class Mutex;
-  class Mailbox;
+  class MailboxImpl;
 }
 }
 
 typedef simgrid::kernel::context::Context *smx_context_t;
 typedef simgrid::simix::ActorImpl *smx_actor_t;
 typedef simgrid::simix::Mutex   *smx_mutex_t;
-typedef simgrid::simix::Mailbox *smx_mailbox_t;
+typedef simgrid::simix::MailboxImpl* smx_mailbox_t;
 
 #else
 
@@ -257,19 +253,6 @@ XBT_PUBLIC(void) simcall_execution_set_priority(smx_activity_t execution, double
 XBT_PUBLIC(void) simcall_execution_set_bound(smx_activity_t execution, double bound);
 XBT_PUBLIC(e_smx_state_t) simcall_execution_wait(smx_activity_t execution);
 
-/******************************* VM simcalls ********************************/
-// Create the vm_workstation at the SURF level
-XBT_PUBLIC(sg_host_t) simcall_vm_create(const char *name, sg_host_t host);
-XBT_PUBLIC(void) simcall_vm_start(sg_host_t vm);
-XBT_PUBLIC(void *) simcall_vm_get_pm(sg_host_t vm);
-XBT_PUBLIC(void) simcall_vm_set_bound(sg_host_t vm, double bound);
-XBT_PUBLIC(void) simcall_vm_resume(sg_host_t vm);
-XBT_PUBLIC(void) simcall_vm_save(sg_host_t vm);
-XBT_PUBLIC(void) simcall_vm_restore(sg_host_t vm);
-XBT_PUBLIC(void) simcall_vm_suspend(sg_host_t vm);
-XBT_PUBLIC(void) simcall_vm_destroy(sg_host_t vm);
-XBT_PUBLIC(void) simcall_vm_shutdown(sg_host_t vm);
-
 /**************************** Process simcalls ********************************/
 /* Constructor and Destructor */
 XBT_PUBLIC(smx_actor_t) simcall_process_create(const char *name,
@@ -404,10 +387,6 @@ XBT_PUBLIC(xbt_dict_t) simcall_storage_get_content(smx_storage_t storage);
 XBT_PUBLIC(const char*) SIMIX_storage_get_name(smx_storage_t storage);
 XBT_PUBLIC(sg_size_t) SIMIX_storage_get_size(smx_storage_t storage);
 XBT_PUBLIC(const char*) SIMIX_storage_get_host(smx_storage_t storage);
-/************************** AS router   **********************************/
-XBT_PUBLIC(xbt_dict_t) SIMIX_asr_get_properties(const char *name);
-/************************** AS router simcalls ***************************/
-XBT_PUBLIC(xbt_dict_t) simcall_asr_get_properties(const char *name);
 
 /************************** MC simcalls   **********************************/
 XBT_PUBLIC(int) simcall_mc_random(int min, int max);