X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9b94bc9be0c3ad5b5f816bf343152a3617a1bc2..9a74c123a93983346bc7e498c89c745c7076b571:/src/msg/m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 50bd95c025..ace1951188 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -27,7 +27,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
  * \brief Creates and runs a new #m_process_t.
  *
  * Does exactly the same as #MSG_process_create_with_arguments but without 
-   providing standard arguments (\a argc, \a argv).
+   providing standard arguments (\a argc, \a argv, \a start_time, \a kill_time).
  * \sa MSG_process_create_with_arguments
  */
 m_process_t MSG_process_create(const char *name,
@@ -49,9 +49,9 @@ static void MSG_process_cleanup(void *arg)
   xbt_fifo_remove(msg_global->process_list, arg);
   xbt_fifo_remove(msg_global->process_to_run, arg);
   xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
-  xbt_free(((m_process_t) arg)->name);
-  xbt_free(((m_process_t) arg)->simdata);
-  xbt_free(arg);
+  free(((m_process_t) arg)->name);
+  free(((m_process_t) arg)->simdata);
+  free(arg);
 }
 
 /** \ingroup m_process_management
@@ -136,6 +136,8 @@ void MSG_process_kill(m_process_t process)
   int i;
   simdata_process_t p_simdata = process->simdata;
   simdata_host_t h_simdata= p_simdata->host->simdata;
+  int _cursor;
+  m_process_t proc = NULL;
 
 /*   fprintf(stderr,"Killing %s(%d) on %s.\n",process->name, */
 /* 	  p_simdata->PID,p_simdata->host->name); */
@@ -148,19 +150,30 @@ void MSG_process_kill(m_process_t process)
   }
   if (i==msg_global->max_channel) {
     if(p_simdata->waiting_task) {
+      xbt_dynar_foreach(p_simdata->waiting_task->simdata->sleeping,_cursor,proc) {
+	if(proc==process) 
+	  xbt_dynar_remove_at(p_simdata->waiting_task->simdata->sleeping,_cursor,&proc);
+      }
       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
-	fprintf(stderr,"UNKNOWN STATUS. Please report this bug.\n");
+	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 */
-      fprintf(stderr,"UNKNOWN STATUS. Please report this bug.\n");
+      if(process==MSG_process_self()) {
+	return;
+      } else {
+	CRITICAL0("UNKNOWN STATUS. Please report this bug.");
+      }
     }
   }
 
+  xbt_fifo_remove(msg_global->process_to_run,process);
   xbt_fifo_remove(msg_global->process_list,process);
   xbt_context_free(process->simdata->context);
 }
@@ -318,7 +331,7 @@ int MSG_process_self_PPID(void)
  */
 m_process_t MSG_process_self(void)
 {
-  return msg_global->current_process;
+  return msg_global ? msg_global->current_process : NULL;
 }
 
 /** \ingroup m_process_management
@@ -428,7 +441,7 @@ int MSG_process_isSuspended(m_process_t process)
   return (process->simdata->suspended);
 }
 
-MSG_error_t __MSG_process_block(void)
+int __MSG_process_block(double max_duration)
 {
   m_process_t process = MSG_process_self();
 
@@ -440,6 +453,9 @@ MSG_error_t __MSG_process_block(void)
   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;
 
@@ -448,7 +464,7 @@ MSG_error_t __MSG_process_block(void)
   
   MSG_task_destroy(dummy);
 
-  return MSG_OK;
+  return 1;
 }
 
 MSG_error_t __MSG_process_unblock(m_process_t process)