Cleaner patch for issue 15.

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

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index 3f74714..600de45 100644 (file)
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -4,6 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "src/surf/surf_interface.hpp"
 #include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
@@ -12,6 +13,7 @@
 #include "src/mc/mc_replay.h"
 #include "src/mc/mc_client.h"
 #include "src/simix/smx_private.hpp"
+#include "src/msg/msg_private.h"
 
 #ifdef HAVE_SMPI
 #include "src/smpi/private.h"
@@ -57,7 +59,7 @@ void SIMIX_process_cleanup(smx_process_t process)
 
   /* Unregister from the kill timer if any */
   if (process->kill_timer != NULL)
-         SIMIX_timer_remove(process->kill_timer);
+      SIMIX_timer_remove(process->kill_timer);
 
   xbt_os_mutex_acquire(simix_global->mutex);
 
@@ -165,10 +167,8 @@ void SIMIX_create_maestro_process()
 void SIMIX_process_stop(smx_process_t arg) {
   /* execute the on_exit functions */
   SIMIX_process_on_exit_runall(arg);
-  /* Add the process to the list of process to restart, only if
-   * the host is down
-   */
-  if (arg->auto_restart && !sg_host_get_state(arg->host)) {
+  /* Add the process to the list of process to restart, only if the host is down */
+  if (arg->auto_restart && arg->host->is_off()) {
     SIMIX_host_add_auto_restart_process(arg->host,arg->name,arg->code, arg->data,
                                         sg_host_get_name(arg->host),
                                         SIMIX_timer_get_date(arg->kill_timer),
@@ -247,7 +247,7 @@ smx_process_t SIMIX_process_create(
 
   XBT_DEBUG("Start process %s on host '%s'", name, hostname);
 
-  if (!sg_host_get_state(host)) {
+  if (host->is_off()) {
     int i;
     XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
           hostname);
@@ -321,6 +321,9 @@ smx_process_t SIMIX_process_create(
           sg_host_get_name(process->host), kill_time);
       process->kill_timer = SIMIX_timer_set(kill_time, kill_process, process);
     }
+
+    /* Tracing the process creation */
+    TRACE_msg_process_create(process->name, process->pid, process->host);
   }
   return process;
 }
@@ -723,7 +726,7 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process,
 
 static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synchro_t sync){
   if (sync->sleep.surf_sleep) {
-    surf_action_cancel(sync->sleep.surf_sleep);
+    sync->sleep.surf_sleep->cancel();
 
     smx_simcall_t simcall;
     while ((simcall = (smx_simcall_t) xbt_fifo_shift(sync->simcalls))) {
@@ -737,7 +740,7 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synch
         SIMIX_simcall_answer(simcall);
       }
     }
-    surf_action_unref(sync->sleep.surf_sleep);
+    sync->sleep.surf_sleep->unref();
     sync->sleep.surf_sleep = NULL;
   }
   xbt_mallocator_release(simix_global->synchro_mallocator, sync);
@@ -770,7 +773,7 @@ smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration)
   sg_host_t host = process->host;
 
   /* check if the host is active */
-  if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) {
+  if (host->is_off()) {
     THROWF(host_error, 0, "Host %s failed, you cannot call this function",
            sg_host_get_name(host));
   }
@@ -783,7 +786,7 @@ smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration)
   synchro->sleep.host = host;
   synchro->sleep.surf_sleep = surf_host_sleep(host, duration);
 
-  surf_action_set_data(synchro->sleep.surf_sleep, synchro);
+  synchro->sleep.surf_sleep->setData(synchro);
   XBT_DEBUG("Create sleep synchronization %p", synchro);
 
   return synchro;
@@ -797,7 +800,7 @@ void SIMIX_post_process_sleep(smx_synchro_t synchro)
 
   while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) {
 
-    switch(surf_action_get_state(synchro->sleep.surf_sleep)){
+    switch (synchro->sleep.surf_sleep->getState()){
       case SURF_ACTION_FAILED:
         simcall->issuer->context->iwannadie = 1;
         //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
@@ -812,7 +815,7 @@ void SIMIX_post_process_sleep(smx_synchro_t synchro)
         THROW_IMPOSSIBLE;
         break;
     }
-    if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
+    if (simcall->issuer->host->is_off()) {
       simcall->issuer->context->iwannadie = 1;
     }
     simcall_process_sleep__set__result(simcall, state);
@@ -835,7 +838,7 @@ void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
   xbt_assert(synchro->type == SIMIX_SYNC_SLEEP || synchro->type == SIMIX_SYNC_JOIN);
 
   if (synchro->sleep.surf_sleep) {
-    surf_action_unref(synchro->sleep.surf_sleep);
+    synchro->sleep.surf_sleep->unref();
     synchro->sleep.surf_sleep = NULL;
   }
   if (synchro->type == SIMIX_SYNC_SLEEP)
@@ -845,14 +848,14 @@ void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
 void SIMIX_process_sleep_suspend(smx_synchro_t synchro)
 {
   xbt_assert(synchro->type == SIMIX_SYNC_SLEEP);
-  surf_action_suspend(synchro->sleep.surf_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);
   xbt_assert(synchro->type == SIMIX_SYNC_SLEEP);
-  surf_action_resume(synchro->sleep.surf_sleep);
+  synchro->sleep.surf_sleep->resume();
 }
 
 /**