X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e13d26773d3aa31c3d0eb24816470bcf8ccc26c0..0feb1e5eca7b9473754b98405e36346804825f70:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 59cc0fb446..4d861d5464 100644 --- 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 @@ -257,20 +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_migrate(sg_host_t vm, sg_host_t dst_pm); -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, @@ -405,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);