#include <functional>
#include <string>
#include <unordered_map>
+#include <vector>
#endif
/* ******************************** Host ************************************ */
SG_END_DECL()
#ifdef __cplusplus
+XBT_PUBLIC void SIMIX_function_register(std::string name, void (*code)(std::vector<std::string>));
XBT_PUBLIC void SIMIX_function_register(std::string name, xbt_main_func_t code);
XBT_PUBLIC void SIMIX_launch_application(std::string file);
#endif
XBT_PUBLIC void simcall_sem_acquire(smx_sem_t sem);
XBT_PUBLIC int simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration);
-/***************************** Storage **********************************/
-XBT_PUBLIC smx_activity_t simcall_io_start(sg_size_t size, sg_storage_t storage);
-XBT_PUBLIC sg_size_t simcall_storage_read(surf_storage_t st, sg_size_t size);
-XBT_PUBLIC sg_size_t simcall_storage_write(surf_storage_t fd, sg_size_t size);
+/***************************** Io **************************************/
+XBT_PUBLIC e_smx_state_t simcall_io_wait(smx_activity_t io);
/************************** MC simcalls **********************************/
XBT_PUBLIC int simcall_mc_random(int min, int max);