X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3595431d9a94c0b3833f488667f286529449b5ef..7d9c844f205d622335b2e0895c9f37483fa1fd89:/src/msg/m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 2131afab83..4d6c45bb13 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -5,9 +5,9 @@
 /* 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"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
 				"Logging specific to MSG (process)");
 
@@ -50,7 +50,9 @@ static void MSG_process_cleanup(void *arg)
   xbt_fifo_remove(msg_global->process_to_run, arg);
   xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
   free(((m_process_t) arg)->name);
+  ((m_process_t) arg)->name = NULL;
   free(((m_process_t) arg)->simdata);
+  ((m_process_t) arg)->simdata = NULL;
   free(arg);
 }
 
@@ -69,7 +71,7 @@ static void MSG_process_cleanup(void *arg)
    name contains the word get), in \ref m_task_management (to create
    or destroy some #m_task_t for example) and in \ref
    msg_gos_functions (to handle file transfers and task processing).
- * \param data a pointer to any data may want to attach to the new
+ * \param data a pointer to any data one may want to attach to the new
    object.  It is for user-level information and can be NULL. It can
    be retrieved with the function \ref MSG_process_get_data.
  * \param host the location where the new agent is executed.
@@ -157,10 +159,12 @@ void MSG_process_kill(m_process_t process)
       if(p_simdata->waiting_task->simdata->compute)
 	surf_workstation_resource->common_public->
 	  action_free(p_simdata->waiting_task->simdata->compute);
-      else if (p_simdata->waiting_task->simdata->comm)
+      else if (p_simdata->waiting_task->simdata->comm) {
 	surf_workstation_resource->common_public->
 	  action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED);
-      else
+	surf_workstation_resource->common_public->
+	  action_free(p_simdata->waiting_task->simdata->comm);
+      } else 
 	CRITICAL0("UNKNOWN STATUS. Please report this bug.");
     } else { /* Must be trying to put a task somewhere */
       if(process==MSG_process_self()) {
@@ -342,7 +346,6 @@ MSG_error_t MSG_process_suspend(m_process_t process)
 {
   simdata_process_t simdata = NULL;
   simdata_task_t simdata_task = NULL;
-  int i;
 
   xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
 
@@ -392,13 +395,15 @@ MSG_error_t MSG_process_resume(m_process_t process)
 {
   simdata_process_t simdata = NULL;
   simdata_task_t simdata_task = NULL;
-  int i;
 
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
   CHECK_HOST();
 
-  simdata = process->simdata;
+  if(process == MSG_process_self()) {
+    MSG_RETURN(MSG_OK);
+  }
 
+  simdata = process->simdata;
 
   if(simdata->blocked) {
     PAJE_PROCESS_POP_STATE(process);
@@ -432,25 +437,35 @@ MSG_error_t MSG_process_resume(m_process_t process)
  * This checks whether a process is suspended or not by inspecting the
  * task on which it was waiting for the completion.
  */
-int MSG_process_isSuspended(m_process_t process)
+int MSG_process_is_suspended(m_process_t process)
 {
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
 
   return (process->simdata->suspended);
 }
 
-MSG_error_t __MSG_process_block(void)
+static char blocked_name[512];
+
+int __MSG_process_block(double max_duration)
 {
   m_process_t process = MSG_process_self();
 
   m_task_t dummy = MSG_TASK_UNINITIALIZED;
-  dummy = MSG_task_create("blocked", 0.0, 0, NULL);
+  snprintf(blocked_name,512,"blocked (%s:%s)",process->name,
+	  process->simdata->host->name);
+
+  XBT_IN1(": max_duration=%g",max_duration);
+
+  dummy = MSG_task_create(blocked_name, 0.0, 0, NULL);
   
   PAJE_PROCESS_PUSH_STATE(process,"B");
 
   process->simdata->blocked=1;
   __MSG_task_execute(process,dummy);
   surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
+  if(max_duration>=0)
+    surf_workstation_resource->common_public->set_max_duration(dummy->simdata->compute, 
+							       max_duration);
   __MSG_wait_for_computation(process,dummy);
   process->simdata->blocked=0;
 
@@ -459,21 +474,24 @@ MSG_error_t __MSG_process_block(void)
   
   MSG_task_destroy(dummy);
 
-  return MSG_OK;
+  XBT_OUT;
+  return 1;
 }
 
 MSG_error_t __MSG_process_unblock(m_process_t process)
 {
   simdata_process_t simdata = NULL;
   simdata_task_t simdata_task = NULL;
-  int i;
 
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
   CHECK_HOST();
 
+  XBT_IN2(": %s unblocking %s", MSG_process_self()->name,process->name);
+
   simdata = process->simdata;
   if(!(simdata->waiting_task)) {
     xbt_assert0(0,"Process not waiting for anything else. Weird !");
+    XBT_OUT;
     return MSG_WARNING;
   }
   simdata_task = simdata->waiting_task->simdata;
@@ -484,6 +502,8 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
 
   PAJE_PROCESS_POP_STATE(process);
 
+  XBT_OUT;
+
   MSG_RETURN(MSG_OK);
 }