X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d67901dba3dfd8e75f708c329b8144287490077..097b28ed9ed8713f6ba27e112228747db424665a:/src/simix/smx_process.cpp

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index c20273ac17..87d4355103 100644
--- 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;
 }
 
 /**
@@ -73,7 +72,7 @@ void SIMIX_process_cleanup(smx_process_t process)
 
     /* make sure no one will finish the comm after this process is destroyed,
      * because src_proc or dst_proc would be an invalid pointer */
-    SIMIX_comm_cancel(comm);
+    comm->cancel();
 
     if (comm->src_proc == process) {
       XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
@@ -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");
+        comm->unref();
 
     }
     else if (comm->dst_proc == process){
@@ -92,11 +91,12 @@ void SIMIX_process_cleanup(smx_process_t process)
           comm, (int)comm->state, comm->src_proc, comm->dst_proc);
       comm->dst_proc = NULL;
 
-      if (comm->detached && comm->refcount == 1 && comm->src_proc != NULL) {
+      if (comm->detached && comm->src_proc != NULL) {
         /* the comm will be freed right now, remove it from the sender */
         xbt_fifo_remove(comm->src_proc->comms, comm);
       }
-      SIMIX_comm_destroy(comm);
+      
+      comm->unref();
     } else {
       xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);
     }
@@ -125,7 +125,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 +198,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();
 }
 
 /**
@@ -504,20 +503,20 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
     simgrid::simix::Io *io = dynamic_cast<simgrid::simix::Io*>(process->waiting_synchro);
 
     if (exec != nullptr) {
-      SIMIX_execution_destroy(process->waiting_synchro);
+      exec->unref();
 
     } else if (comm != nullptr) {
       xbt_fifo_remove(process->comms, process->waiting_synchro);
-      SIMIX_comm_cancel(process->waiting_synchro);
+      comm->cancel();
       xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall);
-      SIMIX_comm_destroy(process->waiting_synchro);
+      comm->unref();
 
     } else if (sleep != nullptr) {
       SIMIX_process_sleep_destroy(process->waiting_synchro);
 
     } else if (raw != nullptr) {
       SIMIX_synchro_stop_waiting(process, &process->simcall);
-      SIMIX_synchro_destroy(process->waiting_synchro);
+      delete process->waiting_synchro;
 
     } else if (io != nullptr) {
       SIMIX_io_destroy(process->waiting_synchro);
@@ -561,8 +560,8 @@ void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con
 
     simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
     if (comm != nullptr) {
-      xbt_fifo_remove(process->comms, process->waiting_synchro);
-      SIMIX_comm_cancel(process->waiting_synchro);
+      xbt_fifo_remove(process->comms, comm);
+      comm->cancel();
     }
 
     simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
@@ -629,23 +628,20 @@ void SIMIX_process_change_host(smx_process_t process,
 
 void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process)
 {
-  smx_synchro_t sync_suspend =
-      SIMIX_process_suspend(process, simcall->issuer);
+  smx_synchro_t sync_suspend = SIMIX_process_suspend(process, simcall->issuer);
 
   if (process != simcall->issuer) {
     SIMIX_simcall_answer(simcall);
   } else {
     xbt_fifo_push(sync_suspend->simcalls, simcall);
     process->waiting_synchro = sync_suspend;
-    SIMIX_execution_suspend(process->waiting_synchro);
+    process->waiting_synchro->suspend();
   }
   /* If we are suspending ourselves, then just do not finish the simcall now */
 }
 
 smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
 {
-  xbt_assert((process != NULL), "Invalid parameters");
-
   if (process->suspended) {
     XBT_DEBUG("Process '%s' is already suspended", process->name);
     return NULL;
@@ -653,32 +649,14 @@ smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
 
   process->suspended = 1;
 
-  /* If we are suspending another process, and it is waiting on a sync, suspend its synchronization. */
+  /* If we are suspending another process that is waiting on a sync, suspend its synchronization. */
   if (process != issuer) {
 
-    if (process->waiting_synchro) {
+    if (process->waiting_synchro)
+      process->waiting_synchro->suspend();
+    /* If the other process is not waiting, its suspension is delayed to when the process is rescheduled. */
 
-      simgrid::simix::Exec *exec = dynamic_cast<simgrid::simix::Exec*>(process->waiting_synchro);
-      if (exec != nullptr) {
-        SIMIX_execution_suspend(process->waiting_synchro);
-      }
-
-      simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
-      if (comm != nullptr) {
-        SIMIX_comm_suspend(process->waiting_synchro);
-      }
-
-      simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
-      if (sleep != nullptr) {
-        SIMIX_process_sleep_suspend(process->waiting_synchro);
-      }
-
-      /* The suspension of raw synchros is delayed to when the process is rescheduled. */
-      return NULL;
-    } else {
-      /* If the other process is not waiting, its suspension is delayed to when the process is rescheduled. */
-      return NULL;
-    }
+    return NULL;
   } else {
     /* FIXME: computation size is zero. Is it okay that bound is zero ? */
     return SIMIX_execution_start(process, "suspend", 0.0, 1.0, 0.0, 0);
@@ -706,24 +684,7 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
   if (process != issuer) {
 
     if (process->waiting_synchro) {
-    simgrid::simix::Exec *exec = dynamic_cast<simgrid::simix::Exec*>(process->waiting_synchro);
-    if (exec != nullptr) {
-      SIMIX_execution_resume(process->waiting_synchro);
-    }
-
-    simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
-    if (comm != nullptr) {
-      SIMIX_comm_resume(process->waiting_synchro);
-    }
-
-    simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
-    if (sleep != nullptr) {
-      SIMIX_process_sleep_resume(process->waiting_synchro);
-    }
-
-    /* I cannot resume raw synchros now. This is delayed to when the process is rescheduled at
-     * the end of the synchro. */
-
+      process->waiting_synchro->resume();
     }
   } else XBT_WARN("Strange. Process %p is trying to resume himself.", issuer);
 
@@ -898,46 +859,6 @@ smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration)
   return synchro;
 }
 
-void SIMIX_post_process_sleep(smx_synchro_t synchro)
-{
-  smx_simcall_t simcall;
-  e_smx_state_t state;
-  simgrid::simix::Sleep *sleep = static_cast<simgrid::simix::Sleep*>(synchro);
-
-  while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) {
-
-    switch (sleep->surf_sleep->getState()){
-      case simgrid::surf::Action::State::failed:
-        simcall->issuer->context->iwannadie = 1;
-        //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
-        state = SIMIX_SRC_HOST_FAILURE;
-        break;
-
-      case simgrid::surf::Action::State::done:
-        state = SIMIX_DONE;
-        break;
-
-      default:
-        THROW_IMPOSSIBLE;
-        break;
-    }
-    if (simcall->issuer->host->isOff()) {
-      simcall->issuer->context->iwannadie = 1;
-    }
-    simcall_process_sleep__set__result(simcall, state);
-    simcall->issuer->waiting_synchro = NULL;
-    if (simcall->issuer->suspended) {
-      XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
-      simcall->issuer->suspended = 0;
-      simcall_HANDLER_process_suspend(simcall, simcall->issuer);
-    } else {
-      SIMIX_simcall_answer(simcall);
-    }
-  }
-
-  SIMIX_process_sleep_destroy(synchro);
-}
-
 void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
 {
   XBT_DEBUG("Destroy synchro %p", synchro);
@@ -949,20 +870,6 @@ void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
   }
 }
 
-void SIMIX_process_sleep_suspend(smx_synchro_t synchro)
-{
-  simgrid::simix::Sleep *sleep = static_cast<simgrid::simix::Sleep*>(synchro);
-  sleep->surf_sleep->suspend();
-}
-
-void SIMIX_process_sleep_resume(smx_synchro_t synchro)
-{
-  XBT_DEBUG("Synchro state is %d on process_sleep_resume.", synchro->state);
-  simgrid::simix::Sleep *sleep = static_cast<simgrid::simix::Sleep*>(synchro);
-
-  sleep->surf_sleep->resume();
-}
-
 /**
  * \brief Calling this function makes the process to yield.
  *
@@ -976,7 +883,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);