#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
@{ */
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
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(void) simcall_vm_resume(sg_host_t vm);
-XBT_PUBLIC(void) simcall_vm_suspend(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,