match new and delete

[simgrid.git] / src / simix / smx_host.cpp

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 723423b..8f80f02 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -17,17 +17,20 @@
 
 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 */
@@ -69,7 +72,7 @@ void SIMIX_host_on(sg_host_t h)
 }
 
 /** @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);
 
@@ -81,7 +84,7 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
 
     /* 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",
@@ -109,7 +112,7 @@ void SIMIX_host_destroy(void *h)
   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());
@@ -124,13 +127,12 @@ void SIMIX_host_destroy(void *h)
   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;
 }
 
@@ -203,12 +205,12 @@ void SIMIX_host_autorestart(sg_host_t host)
 }
 
 smx_activity_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount,
-                                              double priority, double bound, unsigned long affinity_mask) {
-  return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound,affinity_mask);
+                                              double priority, double bound) {
+  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,
-                                    double bound, unsigned long affinity_mask){
+smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, double flops_amount, double priority,
+                                    double bound){
 
   /* alloc structures and initialize */
   simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, issuer->host);
@@ -222,13 +224,6 @@ smx_activity_t SIMIX_execution_start(smx_process_t issuer, const char *name, dou
 
     if (bound > 0)
       static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)->setBound(bound);
-
-    if (affinity_mask != 0) {
-      /* just a double check to confirm that this host is the host where this task is running. */
-      xbt_assert(exec->host == issuer->host);
-      static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)
-        ->setAffinity(issuer->host->pimpl_cpu, affinity_mask);
-    }
   }
 
   XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name.c_str());
@@ -288,16 +283,6 @@ void SIMIX_execution_set_bound(smx_activity_t synchro, double bound)
     static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)->setBound(bound);
 }
 
-void SIMIX_execution_set_affinity(smx_activity_t synchro, sg_host_t host, unsigned long mask)
-{
-  simgrid::kernel::activity::Exec *exec = static_cast<simgrid::kernel::activity::Exec *>(synchro);
-  if(exec->surf_exec) {
-    /* just a double check to confirm that this host is the host where this task is running. */
-    xbt_assert(exec->host == host);
-    static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)->setAffinity(host->pimpl_cpu, mask);
-  }
-}
-
 void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro)
 {
   simgrid::kernel::activity::Exec *exec = static_cast<simgrid::kernel::activity::Exec *>(synchro);