XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
+namespace simgrid {
+ namespace simix {
+ Host::Host()
+ {
+ simgrid::simix::ActorImpl act;
+ process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup));
+ }
+ }
+}
+
/** @brief Internal function to create a SIMIX host. */
-void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_host as parameter
+void SIMIX_host_create(sg_host_t host)
{
- smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
-
- /* Host structure */
- simgrid::simix::ActorImpl proc;
- smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
-
- /* Update global variables */
- sg_host_simix_set(host, smx_host);
+ sg_host_simix_set(host, new simgrid::simix::Host());
}
/** @brief Start the host if it is off */
}
/** @brief Stop the host if it is on */
-void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
+void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
{
smx_host_priv_t host = sg_host_simix(h);
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
- smx_process_t process = nullptr;
+ smx_actor_t process = nullptr;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
XBT_DEBUG("Killing %s on %s by %s",
if (xbt_swag_size(host->process_list) != 0) {
char *msg = xbt_strdup("Shutting down host, but it's not empty:");
char *tmp;
- smx_process_t process = nullptr;
+ smx_actor_t process = nullptr;
xbt_swag_foreach(process, host->process_list) {
tmp = bprintf("%s\n\t%s", msg, process->name.c_str());
xbt_swag_free(host->process_list);
/* Clean host structure */
- free(host);
- return;
+ delete host;
}
sg_host_t SIMIX_host_self()
{
- smx_process_t process = SIMIX_process_self();
+ smx_actor_t process = SIMIX_process_self();
return (process == nullptr) ? nullptr : process->host;
}
return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound);
}
-smx_activity_t SIMIX_execution_start(smx_process_t issuer, const char *name, double flops_amount, double priority,
+smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, double flops_amount, double priority,
double bound){
/* alloc structures and initialize */