kill smx_private.hpp We already have a smx_private.h

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

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index ed6a6d0..450d081 100644 (file)
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -12,7 +12,6 @@
 #include "mc/mc.h"
 #include "src/mc/mc_replay.h"
 #include "src/mc/Client.hpp"
-#include "src/simix/smx_private.hpp"
 #include "src/msg/msg_private.h"
 
 #include "src/simix/SynchroSleep.hpp"
@@ -38,7 +37,7 @@ smx_process_t SIMIX_process_self(void)
 {
   smx_context_t self_context = SIMIX_context_self();
 
-  return self_context ? SIMIX_context_get_process(self_context) : NULL;
+  return self_context ? self_context->process() : NULL;
 }
 
 /**
@@ -81,10 +80,10 @@ void SIMIX_process_cleanup(smx_process_t process)
       comm->src_proc = NULL;
 
       /* I'm not supposed to destroy a detached comm from the sender side, */
-      if (!comm->detached)
-        SIMIX_comm_destroy(comm);
+      if (comm->detached)
+        XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender");
       else
-        XBT_DEBUG("Don't destroy it since it's a detached comm");
+        SIMIX_comm_destroy(comm);
 
     }
     else if (comm->dst_proc == process){
@@ -125,7 +124,7 @@ void SIMIX_process_empty_trash(void)
   while ((process = (smx_process_t) xbt_swag_extract(simix_global->process_to_destroy))) {
     XBT_DEBUG("Getting rid of %p",process);
 
-    SIMIX_context_free(process->context);
+    delete process->context;
 
     /* Free the exception allocated at creation time */
     free(process->running_ctx);
@@ -198,8 +197,7 @@ void SIMIX_process_stop(smx_process_t arg) {
                                         arg->auto_restart);
   }
   XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_get_name(arg->host));
-  /* stop the context */
-  SIMIX_context_stop(arg->context);
+  arg->context->stop();
 }
 
 /**
@@ -912,16 +910,6 @@ void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
   }
 }
 
-void SIMIX_process_sleep_suspend(smx_synchro_t synchro)
-{
-  synchro->suspend(); //FIXME: USELESS
-}
-
-void SIMIX_process_sleep_resume(smx_synchro_t synchro)
-{
-  synchro->resume();  //FIXME: USELESS
-}
-
 /**
  * \brief Calling this function makes the process to yield.
  *
@@ -935,7 +923,7 @@ void SIMIX_process_yield(smx_process_t self)
   XBT_DEBUG("Yield process '%s'", self->name);
 
   /* Go into sleep and return control to maestro */
-  SIMIX_context_suspend(self->context);
+  self->context->suspend();
 
   /* Ok, maestro returned control to us */
   XBT_DEBUG("Control returned to me: '%s'", self->name);